Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(390)

Unified Diff: pkg/analysis_server/lib/src/context_manager.dart

Issue 1439723002: Exclude 'doc' folders. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Exclude only top-level 'doc' folders. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | pkg/analysis_server/test/context_manager_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/lib/src/context_manager.dart
diff --git a/pkg/analysis_server/lib/src/context_manager.dart b/pkg/analysis_server/lib/src/context_manager.dart
index 7c167f942cfcada298fbb2b04d4beb993a9de241..272dafa90008dde32e97c6d4f9bd1a07b0519f40 100644
--- a/pkg/analysis_server/lib/src/context_manager.dart
+++ b/pkg/analysis_server/lib/src/context_manager.dart
@@ -312,6 +312,11 @@ abstract class ContextManagerCallbacks {
*/
class ContextManagerImpl implements ContextManager {
/**
+ * The name of the `doc` directory.
+ */
+ static const String DOC_DIR_NAME = 'doc';
+
+ /**
* The name of the `lib` directory.
*/
static const String LIB_DIR_NAME = 'lib';
@@ -687,7 +692,9 @@ class ContextManagerImpl implements ContextManager {
* Recursively adds all Dart and HTML files to the [changeSet].
*/
void _addSourceFiles(ChangeSet changeSet, Folder folder, ContextInfo info) {
- if (info.excludesResource(folder) || folder.shortName.startsWith('.')) {
+ if (info.excludesResource(folder) ||
+ folder.shortName.startsWith('.') ||
+ _isInTopLevelDocDir(info.folder.path, folder.path)) {
return;
}
List<Resource> children = null;
@@ -1045,7 +1052,10 @@ class ContextManagerImpl implements ContextManager {
_recomputeFolderDisposition(info);
}
// maybe excluded globally
- if (_isExcluded(path) || _isContainedInDotFolder(info.folder.path, path)) {
+ if (_isExcluded(path) ||
+ _isContainedInDotFolder(info.folder.path, path) ||
+ _isInPackagesDir(info.folder.path, path) ||
+ _isInTopLevelDocDir(info.folder.path, path)) {
return;
}
// maybe excluded from the context, so other context will handle it
@@ -1058,10 +1068,6 @@ class ContextManagerImpl implements ContextManager {
// handle the change
switch (event.type) {
case ChangeType.ADD:
- if (_isInPackagesDir(path, info.folder)) {
- return;
- }
-
Resource resource = resourceProvider.getResource(path);
String directoryPath = pathContext.dirname(path);
@@ -1197,15 +1203,25 @@ class ContextManagerImpl implements ContextManager {
}
/**
- * Determine if the path from [folder] to [path] contains a 'packages'
- * directory.
+ * Determine whether the given [path], when interpreted relative to the
+ * context root [root], contains a 'packages' folder.
*/
- bool _isInPackagesDir(String path, Folder folder) {
- String relativePath = pathContext.relative(path, from: folder.path);
+ bool _isInPackagesDir(String root, String path) {
+ String relativePath = pathContext.relative(path, from: root);
List<String> pathParts = pathContext.split(relativePath);
return pathParts.contains(PACKAGES_NAME);
}
+ /**
+ * Determine whether the given [path] is in the direct 'doc' folder of the
+ * context root [root].
+ */
+ bool _isInTopLevelDocDir(String root, String path) {
+ String relativePath = pathContext.relative(path, from: root);
+ return relativePath == DOC_DIR_NAME ||
+ relativePath.startsWith(DOC_DIR_NAME + pathContext.separator);
+ }
+
bool _isPackagespec(String path) =>
pathContext.basename(path) == PACKAGE_SPEC_NAME;
« no previous file with comments | « no previous file | pkg/analysis_server/test/context_manager_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698