From 59a9c2d6f086716b4afbf99b3c00df3bf234ecc6 Mon Sep 17 00:00:00 2001 From: Kirill Safonov Date: Tue, 12 Feb 2013 02:29:38 +0400 Subject: [PATCH] Refactor JavaScript library scopes: 1. use the same scope for completion and resolve (based on enabled libraries) 2. library classes (minified) roots are ignored if it has source roots 3. no hacks against IDEA platform roots and scopes + roots converter --- .../core-api/src/com/intellij/psi/search/GlobalSearchScope.java | 2 +- .../openapi/vfs/impl/VirtualFilePointerContainerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java b/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java index a64fe860486d..35026e9d64eb 100644 --- a/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java +++ b/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java @@ -596,7 +596,7 @@ public abstract class GlobalSearchScope extends SearchScope implements ProjectAw } } - private static class FilesScope extends GlobalSearchScope { + public static class FilesScope extends GlobalSearchScope { private final Collection myFiles; public FilesScope(final Project project, final Collection files) { diff --git a/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java b/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java index 6173a7403c1e..107f3f581267 100644 --- a/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java +++ b/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java @@ -49,7 +49,7 @@ public class VirtualFilePointerContainerImpl extends TraceableDisposable impleme private final VirtualFilePointerListener myListener; private volatile Trinity myCachedThings; private volatile long myTimeStampOfCachedThings = -1; - @NonNls private static final String URL_ATTR = "url"; + @NonNls public static final String URL_ATTR = "url"; private boolean myDisposed; private static final boolean TRACE_CREATION = LOG.isDebugEnabled() || ApplicationManager.getApplication().isUnitTestMode();