Index: pkg/analysis_server/lib/src/analysis_server.dart |
diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart |
index 9bac7d9253509ca22bd489133f2f3e209545d55a..d4cd96d91ae49e1c04a247a7c8199b5a717e9af1 100644 |
--- a/pkg/analysis_server/lib/src/analysis_server.dart |
+++ b/pkg/analysis_server/lib/src/analysis_server.dart |
@@ -67,7 +67,7 @@ class AnalysisServer { |
* The version of the analysis server. The value should be replaced |
* automatically during the build. |
*/ |
- static final String VERSION = '1.0.0'; |
+ static final String VERSION = '1.1.0'; |
/** |
* The number of milliseconds to perform operations before inserting |
@@ -354,10 +354,14 @@ class AnalysisServer { |
AnalysisContext getAnalysisContext(String path) { |
// try to find a containing context |
for (Folder folder in folderMap.keys) { |
- if (folder.contains(path)) { |
+ if (folder.path == path || folder.contains(path)) { |
return folderMap[folder]; |
} |
} |
+ Resource resource = resourceProvider.getResource(path); |
+ if (resource is Folder) { |
+ return null; |
+ } |
// check if there is a context that analyzed this source |
return getAnalysisContextForSource(getSource(path)); |
} |