From 58b226feb9c83e4e714261cd1178e91590015b56 Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Thu, 7 Jun 2012 14:05:53 +0200 Subject: [PATCH 01/61] fix macro table when directory path has slash at the end --- .../components/impl/BasePathMacroManager.java | 51 +++++++++++-------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/platform/projectModel-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java index 0ef62c27ae24..357f74af2846 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java @@ -50,9 +50,13 @@ public class BasePathMacroManager extends PathMacroManager { addFileHierarchyReplacements(result, f.getParent(), macro + "/.."); final String path = FileUtil.toSystemIndependentName(f.getCanonicalPath()); - String s = macro; - if (StringUtil.endsWithChar(path, '/')) s += "/"; - result.put(s, path); + if (StringUtil.endsWithChar(path, '/')) { + result.put(macro + "/", path); + result.put(macro, path.substring(0, path.length()-1)); + } + else { + result.put(macro, path); + } } protected static void addFileHierarchyReplacements(ReplacePathToMacroMap result, String macroName, @Nullable String path, @Nullable String stopAt) { @@ -64,17 +68,14 @@ public class BasePathMacroManager extends PathMacroManager { while (dir != null && dir.getParent() != null) { path = FileUtil.toSystemIndependentName(dir.getCanonicalPath()); - String s = macro; - if (StringUtil.endsWithChar(path, '/')) s += "/"; - - putIfAbsent(result, "file:" + path, "file:" + s, check); - putIfAbsent(result, "file:/" + path, "file:/" + s, check); - putIfAbsent(result, "file://" + path, "file://" + s, check); - putIfAbsent(result, "jar:" + path, "jar:" + s, check); - putIfAbsent(result, "jar:/" + path, "jar:/" + s, check); - putIfAbsent(result, "jar://" + path, "jar://" + s, check); + putIfAbsent(result, "file:" + path, "file:" + macro, check); + putIfAbsent(result, "file:/" + path, "file:/" + macro, check); + putIfAbsent(result, "file://" + path, "file://" + macro, check); + putIfAbsent(result, "jar:" + path, "jar:" + macro, check); + putIfAbsent(result, "jar:/" + path, "jar:/" + macro, check); + putIfAbsent(result, "jar://" + path, "jar://" + macro, check); if (!path.equalsIgnoreCase("e:/") && !path.equalsIgnoreCase("r:/") && !path.equalsIgnoreCase("p:/")) { - putIfAbsent(result, path, s, check); + putIfAbsent(result, path, macro, check); } if (dir.getPath().equals(stopAt)) { @@ -87,6 +88,22 @@ public class BasePathMacroManager extends PathMacroManager { } } + private static void putIfAbsent(final ReplacePathToMacroMap result, + @NonNls final String pathWithPrefix, + @NonNls final String substitutionWithPrefix, + final boolean check) { + if (check && result.get(pathWithPrefix) != null) + return; + + if (StringUtil.endsWithChar(pathWithPrefix, '/')) { + result.put(pathWithPrefix, substitutionWithPrefix + "/"); + result.put(pathWithPrefix.substring(0, pathWithPrefix.length()-1), substitutionWithPrefix); + } + else { + result.put(pathWithPrefix, substitutionWithPrefix); + } + } + protected ExpandMacroToPathMap getExpandMacroMap() { ExpandMacroToPathMap result = new ExpandMacroToPathMap(); for (Map.Entry entry : PathMacrosImpl.getGlobalSystemMacros().entrySet()) { @@ -137,14 +154,6 @@ public class BasePathMacroManager extends PathMacroManager { return myPathMacros; } - protected static void putIfAbsent(final ReplacePathToMacroMap result, - @NonNls final String pathWithPrefix, - @NonNls final String substitutionWithPrefix, - final boolean check) { - if (check && result.get(pathWithPrefix) != null) return; - result.put(pathWithPrefix, substitutionWithPrefix); - } - private class MyTrackingPathMacroSubstitutor implements TrackingPathMacroSubstitutor { private final Map> myMacroToComponentNames = new FactoryMap>() { @Override From 36cb841cbb0713085c8d435b4a8aec56de553ccb Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Fri, 8 Jun 2012 12:59:59 +0200 Subject: [PATCH 02/61] load DirectoryStorageData based on VirtualFile --- .../impl/stores/DirectoryBasedStorage.java | 5 +++-- .../components/impl/stores/FileBasedStorage.java | 9 ++++++--- .../components/impl/stores/StorageUtil.java | 14 +++++++------- .../src/com/intellij/core/CoreProjectLoader.java | 4 +--- .../impl/stores/DirectoryStorageData.java | 13 +++++++------ .../src/com/intellij/openapi/util/JDOMUtil.java | 12 ++++++++++++ 6 files changed, 36 insertions(+), 21 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java index 0fc2147f8a1a..7fd8d51578ae 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java @@ -116,7 +116,7 @@ public class DirectoryBasedStorage implements StateStorage, Disposable { private DirectoryStorageData loadState() throws StateStorageException { DirectoryStorageData storageData = new DirectoryStorageData(); - storageData.loadFrom(myDir, myPathMacroSubstitutor); + storageData.loadFrom(LocalFileSystem.getInstance().findFileByIoFile(myDir), myPathMacroSubstitutor); return storageData; } @@ -289,7 +289,8 @@ public class DirectoryBasedStorage implements StateStorage, Disposable { myPathMacroSubstitutor.collapsePaths(element); } - if (!StorageUtil.contentEquals(element, file)) { + VirtualFile virtualFile = LocalFileSystem.getInstance().findFileByIoFile(file); + if (virtualFile == null || !StorageUtil.contentEquals(element, virtualFile)) { filesToSave.add(file); } } diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/FileBasedStorage.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/FileBasedStorage.java index 099dc37c6434..ce6cf2cae7f6 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/FileBasedStorage.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/FileBasedStorage.java @@ -154,8 +154,10 @@ public class FileBasedStorage extends XmlElementStorage { @Override protected boolean physicalContentNeedsSave() { - if (!myFile.exists()) return !myStorageData.isEmpty(); - return !StorageUtil.contentEquals(getDocumentToSave(), myFile); + VirtualFile file = getVirtualFile(); + if (file == null || !file.exists()) + return !myStorageData.isEmpty(); + return !StorageUtil.contentEquals(getDocumentToSave(), file); } @Override @@ -321,7 +323,8 @@ public class FileBasedStorage extends XmlElementStorage { } protected boolean physicalContentNeedsSave(final Document doc) { - return !myFile.exists() || !StorageUtil.contentEquals(doc, myFile); + VirtualFile file = getVirtualFile(); + return file == null || !file.exists() || !StorageUtil.contentEquals(doc, file); } @Nullable diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java index 1d5f917b1990..9eed25697766 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java @@ -100,7 +100,7 @@ public class StorageUtil { try { final Ref refIOException = Ref.create(null); - final Pair pair = loadFile(file); + final Pair pair = loadFile(LocalFileSystem.getInstance().findFileByIoFile(file)); final byte[] text = JDOMUtil.writeParent(element, pair.second).getBytes(CharsetToolkit.UTF8); if (file.exists()) { if (new String(text).equals(pair.first)) return null; @@ -184,17 +184,17 @@ public class StorageUtil { /** * @return pair.first - file contents (null if file does not exist), pair.second - file line separators */ - public static Pair loadFile(@NotNull final IFile file) throws IOException { - if (!file.exists()) return Pair.create(null, SystemProperties.getLineSeparator()); + public static Pair loadFile(@Nullable final VirtualFile file) throws IOException { + if (file == null || !file.exists()) return Pair.create(null, SystemProperties.getLineSeparator()); - String fileText = new String(file.loadBytes(), CharsetToolkit.UTF8); + String fileText = new String(file.contentsToByteArray(), CharsetToolkit.UTF8); final int ndx = fileText.indexOf('\n'); return Pair.create(fileText, ndx == -1 ? SystemProperties.getLineSeparator() - : ndx - 1 >=0 ? fileText.charAt(ndx - 1) == '\r' ? "\r\n" : "\n" : "\n"); + : ndx - 1 >= 0 ? fileText.charAt(ndx - 1) == '\r' ? "\r\n" : "\n" : "\n"); } - public static boolean contentEquals(@NotNull final Document document, @NotNull final IFile file) { + public static boolean contentEquals(@NotNull final Document document, @NotNull final VirtualFile file) { try { final Pair pair = loadFile(file); return pair.first != null && pair.first.equals(printDocumentToString(document, pair.second)); @@ -205,7 +205,7 @@ public class StorageUtil { } } - public static boolean contentEquals(@NotNull final Element element, @NotNull final IFile file) { + public static boolean contentEquals(@NotNull final Element element, @NotNull final VirtualFile file) { try { final Pair pair = loadFile(file); return pair.first != null && pair.first.equals(printElement(element, pair.second)); diff --git a/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java b/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java index 3e0319b3522a..dc6465e44bf2 100644 --- a/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java +++ b/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java @@ -29,7 +29,6 @@ import com.intellij.openapi.roots.impl.libraries.ProjectLibraryTable; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.util.io.fs.FileSystem; import org.jdom.Document; import org.jdom.Element; import org.jdom.JDOMException; @@ -77,8 +76,7 @@ public class CoreProjectLoader { VirtualFile libraries = dotIdea.findChild("libraries"); if (libraries != null) { DirectoryStorageData data = new DirectoryStorageData(); - data.loadFrom(FileSystem.FILE_SYSTEM.createFile(libraries.getPath()), - PathMacroManager.getInstance(project).createTrackingSubstitutor()); + data.loadFrom(libraries, PathMacroManager.getInstance(project).createTrackingSubstitutor()); final Element libraryTable = data.getMergedState("libraryTable", Element.class, new ProjectLibraryTable.LibraryStateSplitter(), null); ((LibraryTableBase) ProjectLibraryTable.getInstance(project)).loadState(libraryTable); } diff --git a/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/DirectoryStorageData.java b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/DirectoryStorageData.java index 3f3dec981d85..5ad062e547d4 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/DirectoryStorageData.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/DirectoryStorageData.java @@ -21,7 +21,9 @@ import com.intellij.openapi.components.TrackingPathMacroSubstitutor; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.PairConsumer; +import com.intellij.util.io.fs.FileSystem; import com.intellij.util.io.fs.IFile; import gnu.trove.THashMap; import org.jdom.Document; @@ -45,20 +47,19 @@ public class DirectoryStorageData { return myStates.keySet(); } - public void loadFrom(IFile dir, TrackingPathMacroSubstitutor pathMacroSubstitutor) { - if (!dir.exists()) { + public void loadFrom(final @Nullable VirtualFile dir, TrackingPathMacroSubstitutor pathMacroSubstitutor) { + if (dir == null || !dir.exists()) { return; } - final IFile[] files = dir.listFiles(); - for (IFile file : files) { + for (VirtualFile file : dir.getChildren()) { if (!StringUtil.endsWithIgnoreCase(file.getName(), ".xml")) { //do not load system files like .DS_Store on Mac continue; } try { - final Document document = JDOMUtil.loadDocument(file); + final Document document = JDOMUtil.loadDocument(file.contentsToByteArray()); final Element element = document.getRootElement(); assert element.getName().equals(StorageData.COMPONENT); @@ -72,7 +73,7 @@ public class DirectoryStorageData { pathMacroSubstitutor.addUnknownMacros(componentName, unknownMacros); } - put(componentName, file, element, true); + put(componentName, FileSystem.FILE_SYSTEM.createFile(file.getCanonicalPath()), element, true); } catch (IOException e) { LOG.info("Unable to load state", e); diff --git a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java index 4c2f350679c1..8ee4efaebb1f 100644 --- a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java +++ b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java @@ -312,6 +312,18 @@ public class JDOMUtil { return getSaxBuilder().build(new CharArrayReader(chars, 0, length)); } + @NotNull + public static Document loadDocument(byte[] bytes) throws IOException, JDOMException { + final ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes); + try { + return loadDocument(inputStream); + } + finally { + inputStream.close(); + } + + } + private static SAXBuilder getSaxBuilder() { SoftReference reference = ourSaxBuilder.get(); SAXBuilder saxBuilder = reference != null ? reference.get() : null; From 68a9812a881174caa62a2d2808d7160d3f2faa1b Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Wed, 13 Jun 2012 11:05:01 +0200 Subject: [PATCH 03/61] Split PsiSearchHelper and PsiTodoSearchHelper --- .../intellij/psi/search/UpdateCacheTest.java | 18 +-- .../intellij/psi/search/PsiSearchHelper.java | 2 +- .../psi/search/PsiTodoSearchHelper.java | 11 ++ .../daemon/impl/GeneralHighlightingPass.java | 4 +- .../src/com/intellij/ide/todo/TodoFilter.java | 4 +- .../intellij/ide/todo/TodoTreeBuilder.java | 6 +- .../intellij/ide/todo/TodoTreeStructure.java | 5 +- .../vcs/checkin/TodoCheckinHandlerWorker.java | 6 +- .../psi/impl/search/PsiSearchHelperImpl.java | 83 +---------- .../impl/search/PsiTodoSearchHelperImpl.java | 131 ++++++++++++++++++ .../vcs/changes/TodoForBaseRevision.java | 4 +- .../vcs/changes/TodoForExistingFile.java | 6 +- .../openapi/vcs/changes/TodoForRanges.java | 4 +- .../src/META-INF/LangExtensions.xml | 3 + .../src/com/siyeh/ig/maturity/TodoUtil.java | 4 +- 15 files changed, 179 insertions(+), 112 deletions(-) create mode 100644 platform/lang-impl/src/com/intellij/psi/impl/search/PsiTodoSearchHelperImpl.java diff --git a/java/java-tests/testSrc/com/intellij/psi/search/UpdateCacheTest.java b/java/java-tests/testSrc/com/intellij/psi/search/UpdateCacheTest.java index e39f43603064..8e89110d977c 100644 --- a/java/java-tests/testSrc/com/intellij/psi/search/UpdateCacheTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/search/UpdateCacheTest.java @@ -233,7 +233,7 @@ public class UpdateCacheTest extends PsiTestCase{ } public void testAddExcludeRoot() throws Exception{ - PsiSearchHelper.SERVICE.getInstance(myProject).findFilesWithTodoItems(); // to initialize caches + PsiTodoSearchHelper.SERVICE.getInstance(myProject).findFilesWithTodoItems(); // to initialize caches ProjectRootManagerEx rootManager = (ProjectRootManagerEx)ProjectRootManager.getInstance(myProject); final VirtualFile root = rootManager.getContentRoots()[0]; @@ -292,7 +292,7 @@ public class UpdateCacheTest extends PsiTestCase{ }); - PsiSearchHelper.SERVICE.getInstance(myProject).findFilesWithTodoItems(); // to initialize caches + PsiTodoSearchHelper.SERVICE.getInstance(myProject).findFilesWithTodoItems(); // to initialize caches new WriteCommandAction.Simple(getProject()) { @Override @@ -304,7 +304,7 @@ public class UpdateCacheTest extends PsiTestCase{ PsiDocumentManager.getInstance(myProject).commitAllDocuments(); - PsiSearchHelper.SERVICE.getInstance(myProject).findFilesWithTodoItems(); // to update caches + PsiTodoSearchHelper.SERVICE.getInstance(myProject).findFilesWithTodoItems(); // to update caches ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { @@ -352,7 +352,7 @@ public class UpdateCacheTest extends PsiTestCase{ PsiDocumentManager.getInstance(myProject).commitAllDocuments(); - PsiSearchHelper.SERVICE.getInstance(myProject).findFilesWithTodoItems(); // to initialize caches + PsiTodoSearchHelper.SERVICE.getInstance(myProject).findFilesWithTodoItems(); // to initialize caches ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { @@ -379,7 +379,7 @@ public class UpdateCacheTest extends PsiTestCase{ final ModuleRootManager rootManager = ModuleRootManager.getInstance(myModule); final VirtualFile root = rootManager.getContentRoots()[0]; - PsiSearchHelper.SERVICE.getInstance(myProject).findFilesWithTodoItems(); // to initialize caches + PsiTodoSearchHelper.SERVICE.getInstance(myProject).findFilesWithTodoItems(); // to initialize caches new WriteCommandAction.Simple(getProject()) { @Override @@ -391,7 +391,7 @@ public class UpdateCacheTest extends PsiTestCase{ PsiDocumentManager.getInstance(myProject).commitAllDocuments(); - PsiSearchHelper.SERVICE.getInstance(myProject).findFilesWithTodoItems(); // to update caches + PsiTodoSearchHelper.SERVICE.getInstance(myProject).findFilesWithTodoItems(); // to update caches ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { @@ -466,7 +466,7 @@ public class UpdateCacheTest extends PsiTestCase{ ProjectRootManagerEx rootManager = (ProjectRootManagerEx)ProjectRootManager.getInstance(myProject); final VirtualFile root = rootManager.getContentRoots()[0]; - PsiSearchHelper.SERVICE.getInstance(myProject).findFilesWithTodoItems(); // to initialize caches + PsiTodoSearchHelper.SERVICE.getInstance(myProject).findFilesWithTodoItems(); // to initialize caches new WriteCommandAction.Simple(getProject()) { @Override @@ -478,7 +478,7 @@ public class UpdateCacheTest extends PsiTestCase{ PsiDocumentManager.getInstance(myProject).commitAllDocuments(); - PsiSearchHelper.SERVICE.getInstance(myProject).findFilesWithTodoItems(); // to update caches + PsiTodoSearchHelper.SERVICE.getInstance(myProject).findFilesWithTodoItems(); // to update caches ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { @@ -530,7 +530,7 @@ public class UpdateCacheTest extends PsiTestCase{ } private void checkTodos(@NonNls String[] expectedFiles){ - PsiSearchHelper helper = PsiSearchHelper.SERVICE.getInstance(myProject); + PsiTodoSearchHelper helper = PsiTodoSearchHelper.SERVICE.getInstance(myProject); PsiFile[] files = helper.findFilesWithTodoItems(); diff --git a/platform/lang-api/src/com/intellij/psi/search/PsiSearchHelper.java b/platform/lang-api/src/com/intellij/psi/search/PsiSearchHelper.java index 15ff4815a4b8..c5b9f538df76 100644 --- a/platform/lang-api/src/com/intellij/psi/search/PsiSearchHelper.java +++ b/platform/lang-api/src/com/intellij/psi/search/PsiSearchHelper.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable; * * Use {@link com.intellij.psi.search.PsiSearchHelper.SERVICE#getInstance}() to get a search helper instance. */ -public interface PsiSearchHelper extends PsiTodoSearchHelper { +public interface PsiSearchHelper { class SERVICE { private SERVICE() { } diff --git a/platform/lang-api/src/com/intellij/psi/search/PsiTodoSearchHelper.java b/platform/lang-api/src/com/intellij/psi/search/PsiTodoSearchHelper.java index fbfd06d5196d..c0d16c6ef762 100644 --- a/platform/lang-api/src/com/intellij/psi/search/PsiTodoSearchHelper.java +++ b/platform/lang-api/src/com/intellij/psi/search/PsiTodoSearchHelper.java @@ -15,6 +15,8 @@ */ package com.intellij.psi.search; +import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; @@ -24,6 +26,15 @@ import org.jetbrains.annotations.NotNull; * Time: 10:08 AM */ public interface PsiTodoSearchHelper { + class SERVICE { + private SERVICE() { + } + + public static PsiTodoSearchHelper getInstance(Project project) { + return ServiceManager.getService(project, PsiTodoSearchHelper.class); + } + } + /** * Returns the list of all files in the project which have to do items. * diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java index 2d991fff0e72..6d67b1976d28 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java @@ -61,7 +61,7 @@ import com.intellij.problems.WolfTheProblemSolver; import com.intellij.psi.*; import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; import com.intellij.psi.impl.source.tree.injected.Place; -import com.intellij.psi.search.PsiSearchHelper; +import com.intellij.psi.search.PsiTodoSearchHelper; import com.intellij.psi.search.TodoItem; import com.intellij.psi.tree.IElementType; import com.intellij.util.Processor; @@ -778,7 +778,7 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP @NotNull ProperTextRange priorityRange, @NotNull Collection result, @NotNull Collection outsideResult) { - PsiSearchHelper helper = PsiSearchHelper.SERVICE.getInstance(file.getProject()); + PsiTodoSearchHelper helper = PsiTodoSearchHelper.SERVICE.getInstance(file.getProject()); TodoItem[] todoItems = helper.findTodoItems(file, startOffset, endOffset); if (todoItems.length == 0) return; diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoFilter.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoFilter.java index b8e596004f23..e34acf5b0d8a 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/TodoFilter.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoFilter.java @@ -18,7 +18,7 @@ package com.intellij.ide.todo; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.PsiFile; -import com.intellij.psi.search.PsiSearchHelper; +import com.intellij.psi.search.PsiTodoSearchHelper; import com.intellij.psi.search.TodoPattern; import org.jdom.Element; import org.jetbrains.annotations.NonNls; @@ -52,7 +52,7 @@ public class TodoFilter implements Cloneable{ * @return true if and only if specified psiFile has * TodoItems accepted by the filter. */ - public boolean accept(PsiSearchHelper searchHelper,PsiFile psiFile){ + public boolean accept(PsiTodoSearchHelper searchHelper,PsiFile psiFile){ for(Iterator i=iterator();i.hasNext();){ TodoPattern todoPattern= i.next(); if(searchHelper.getTodoItemsCount(psiFile,todoPattern)>0){ diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java index fa524d04a5bc..893d69a8d795 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java @@ -42,7 +42,7 @@ import com.intellij.openapi.vcs.FileStatusListener; import com.intellij.openapi.vcs.FileStatusManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; -import com.intellij.psi.search.PsiSearchHelper; +import com.intellij.psi.search.PsiTodoSearchHelper; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.usageView.UsageTreeColorsScheme; import com.intellij.util.containers.HashMap; @@ -77,7 +77,7 @@ public abstract class TodoTreeBuilder extends AbstractTreeBuilder { protected final HashMap myFile2Highlighter; - protected final PsiSearchHelper mySearchHelper; + protected final PsiTodoSearchHelper mySearchHelper; /** * If this flag is false then the updateTree() method does nothing. But when * the flag becomes true and myDirtyFileSet isn't empty the update is invoked. @@ -99,7 +99,7 @@ public abstract class TodoTreeBuilder extends AbstractTreeBuilder { myFile2Highlighter = new HashMap(); PsiManager psiManager = PsiManager.getInstance(myProject); - mySearchHelper = PsiSearchHelper.SERVICE.getInstance(myProject); + mySearchHelper = PsiTodoSearchHelper.SERVICE.getInstance(myProject); psiManager.addPsiTreeChangeListener(new MyPsiTreeChangeListener()); myFileStatusListener = new MyFileStatusListener(); diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeStructure.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeStructure.java index 03a550b848a3..67687fc6da10 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeStructure.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeStructure.java @@ -23,7 +23,6 @@ import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; -import com.intellij.psi.search.PsiSearchHelper; import com.intellij.psi.search.PsiTodoSearchHelper; import com.intellij.psi.search.TodoPattern; @@ -44,7 +43,7 @@ public abstract class TodoTreeStructure extends AbstractTreeStructureBase implem private boolean myAreModulesShown; - protected final PsiSearchHelper mySearchHelper; + protected final PsiTodoSearchHelper mySearchHelper; /** * Current TodoFilter. If no filter is set then this field is null. */ @@ -54,7 +53,7 @@ public abstract class TodoTreeStructure extends AbstractTreeStructureBase implem super(project); myArePackagesShown=true; mySummaryElement=new ToDoSummary(); - mySearchHelper= PsiSearchHelper.SERVICE.getInstance(project); + mySearchHelper= PsiTodoSearchHelper.SERVICE.getInstance(project); } final void setTreeBuilder(TodoTreeBuilder builder){ diff --git a/platform/lang-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandlerWorker.java b/platform/lang-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandlerWorker.java index 142dc882e729..e16baef9e2dd 100644 --- a/platform/lang-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandlerWorker.java +++ b/platform/lang-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandlerWorker.java @@ -43,7 +43,7 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.impl.search.LightIndexPatternSearch; import com.intellij.psi.impl.search.TodoItemsCreator; import com.intellij.psi.search.IndexPatternOccurrence; -import com.intellij.psi.search.PsiSearchHelper; +import com.intellij.psi.search.PsiTodoSearchHelper; import com.intellij.psi.search.TodoItem; import com.intellij.psi.search.searches.IndexPatternSearch; import com.intellij.util.PairConsumer; @@ -65,7 +65,7 @@ public class TodoCheckinHandlerWorker { private final TodoFilter myTodoFilter; private final boolean myIncludePattern; private final PsiManager myPsiManager; - private final PsiSearchHelper mySearchHelper; + private final PsiTodoSearchHelper mySearchHelper; private final List myAddedOrEditedTodos; private final List myInChangedTodos; @@ -81,7 +81,7 @@ public class TodoCheckinHandlerWorker { myTodoFilter = todoFilter; myIncludePattern = includePattern; myPsiManager = PsiManager.getInstance(project); - mySearchHelper = PsiSearchHelper.SERVICE.getInstance(project); + mySearchHelper = PsiTodoSearchHelper.SERVICE.getInstance(project); myAddedOrEditedTodos = new ArrayList(); myInChangedTodos = new ArrayList(); mySkipped = new SmartList>(); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java index c8245d5fe416..fb13ffed6657 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java @@ -18,7 +18,6 @@ package com.intellij.psi.impl.search; import com.intellij.codeInsight.CommentUtil; import com.intellij.concurrency.JobUtil; -import com.intellij.ide.todo.TodoIndexPatternProvider; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.application.ReadActionProcessor; @@ -28,7 +27,10 @@ import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.roots.FileIndexFacade; -import com.intellij.openapi.util.*; +import com.intellij.openapi.util.Computable; +import com.intellij.openapi.util.Condition; +import com.intellij.openapi.util.NullableComputable; +import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; @@ -38,7 +40,6 @@ import com.intellij.psi.impl.cache.impl.IndexCacheManagerImpl; import com.intellij.psi.impl.cache.impl.id.IdIndex; import com.intellij.psi.impl.cache.impl.id.IdIndexEntry; import com.intellij.psi.search.*; -import com.intellij.psi.search.searches.IndexPatternSearch; import com.intellij.psi.util.PsiUtilBase; import com.intellij.util.CommonProcessors; import com.intellij.util.Processor; @@ -60,7 +61,6 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.search.PsiSearchHelperImpl"); private final PsiManagerEx myManager; - private static final TodoItem[] EMPTY_TODO_ITEMS = new TodoItem[0]; @Override @NotNull @@ -80,81 +80,6 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { myManager = manager; } - @Override - @NotNull - public PsiFile[] findFilesWithTodoItems() { - return CacheManager.SERVICE.getInstance(myManager.getProject()).getFilesWithTodoItems(); - } - - @Override - @NotNull - public TodoItem[] findTodoItems(@NotNull PsiFile file) { - return findTodoItems(file, 0, file.getTextLength()); - } - - @Override - @NotNull - public TodoItem[] findTodoItems(@NotNull PsiFile file, int startOffset, int endOffset) { - final Collection occurrences = IndexPatternSearch.search(file, TodoIndexPatternProvider.getInstance()).findAll(); - if (occurrences.isEmpty()) { - return EMPTY_TODO_ITEMS; - } - - return processTodoOccurences(startOffset, endOffset, occurrences); - } - - private TodoItem[] processTodoOccurences(int startOffset, int endOffset, Collection occurrences) { - List items = new ArrayList(occurrences.size()); - TextRange textRange = new TextRange(startOffset, endOffset); - final TodoItemsCreator todoItemsCreator = new TodoItemsCreator(); - for(IndexPatternOccurrence occurrence: occurrences) { - TextRange occurrenceRange = occurrence.getTextRange(); - if (textRange.contains(occurrenceRange)) { - items.add(todoItemsCreator.createTodo(occurrence)); - } - } - - return items.toArray(new TodoItem[items.size()]); - } - - @NotNull - @Override - public TodoItem[] findTodoItemsLight(@NotNull PsiFile file) { - return findTodoItemsLight(file, 0, file.getTextLength()); - } - - @NotNull - @Override - public TodoItem[] findTodoItemsLight(@NotNull PsiFile file, int startOffset, int endOffset) { - final Collection occurrences = - LightIndexPatternSearch.SEARCH.createQuery(new IndexPatternSearch.SearchParameters(file, TodoIndexPatternProvider.getInstance())).findAll(); - - if (occurrences.isEmpty()) { - return EMPTY_TODO_ITEMS; - } - - return processTodoOccurences(startOffset, endOffset, occurrences); - } - - @Override - public int getTodoItemsCount(@NotNull PsiFile file) { - int count = CacheManager.SERVICE.getInstance(myManager.getProject()).getTodoCount(file.getVirtualFile(), TodoIndexPatternProvider.getInstance()); - if (count != -1) return count; - return findTodoItems(file).length; - } - - @Override - public int getTodoItemsCount(@NotNull PsiFile file, @NotNull TodoPattern pattern) { - int count = CacheManager.SERVICE.getInstance(myManager.getProject()).getTodoCount(file.getVirtualFile(), pattern.getIndexPattern()); - if (count != -1) return count; - TodoItem[] items = findTodoItems(file); - count = 0; - for (TodoItem item : items) { - if (item.getPattern().equals(pattern)) count++; - } - return count; - } - @Override @NotNull public PsiElement[] findCommentsContainingIdentifier(@NotNull String identifier, @NotNull SearchScope searchScope) { diff --git a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiTodoSearchHelperImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/search/PsiTodoSearchHelperImpl.java new file mode 100644 index 000000000000..3530e6493d6f --- /dev/null +++ b/platform/lang-impl/src/com/intellij/psi/impl/search/PsiTodoSearchHelperImpl.java @@ -0,0 +1,131 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.intellij.psi.impl.search; + +import com.intellij.ide.todo.TodoIndexPatternProvider; +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.util.TextRange; +import com.intellij.openapi.util.text.StringUtil; +import com.intellij.psi.PsiFile; +import com.intellij.psi.impl.PsiManagerEx; +import com.intellij.psi.impl.cache.CacheManager; +import com.intellij.psi.impl.cache.impl.id.IdIndexEntry; +import com.intellij.psi.search.IndexPatternOccurrence; +import com.intellij.psi.search.PsiTodoSearchHelper; +import com.intellij.psi.search.TodoItem; +import com.intellij.psi.search.TodoPattern; +import com.intellij.psi.search.searches.IndexPatternSearch; +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +public class PsiTodoSearchHelperImpl implements PsiTodoSearchHelper { + private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.search.PsiTodoSearchHelperImpl"); + + private final PsiManagerEx myManager; + private static final TodoItem[] EMPTY_TODO_ITEMS = new TodoItem[0]; + + public PsiTodoSearchHelperImpl(PsiManagerEx manager) { + myManager = manager; + } + + @Override + @NotNull + public PsiFile[] findFilesWithTodoItems() { + return CacheManager.SERVICE.getInstance(myManager.getProject()).getFilesWithTodoItems(); + } + + @Override + @NotNull + public TodoItem[] findTodoItems(@NotNull PsiFile file) { + return findTodoItems(file, 0, file.getTextLength()); + } + + @Override + @NotNull + public TodoItem[] findTodoItems(@NotNull PsiFile file, int startOffset, int endOffset) { + final Collection occurrences = IndexPatternSearch.search(file, TodoIndexPatternProvider.getInstance()).findAll(); + if (occurrences.isEmpty()) { + return EMPTY_TODO_ITEMS; + } + + return processTodoOccurences(startOffset, endOffset, occurrences); + } + + private TodoItem[] processTodoOccurences(int startOffset, int endOffset, Collection occurrences) { + List items = new ArrayList(occurrences.size()); + TextRange textRange = new TextRange(startOffset, endOffset); + final TodoItemsCreator todoItemsCreator = new TodoItemsCreator(); + for(IndexPatternOccurrence occurrence: occurrences) { + TextRange occurrenceRange = occurrence.getTextRange(); + if (textRange.contains(occurrenceRange)) { + items.add(todoItemsCreator.createTodo(occurrence)); + } + } + + return items.toArray(new TodoItem[items.size()]); + } + + @NotNull + @Override + public TodoItem[] findTodoItemsLight(@NotNull PsiFile file) { + return findTodoItemsLight(file, 0, file.getTextLength()); + } + + @NotNull + @Override + public TodoItem[] findTodoItemsLight(@NotNull PsiFile file, int startOffset, int endOffset) { + final Collection occurrences = + LightIndexPatternSearch.SEARCH.createQuery(new IndexPatternSearch.SearchParameters(file, TodoIndexPatternProvider.getInstance())).findAll(); + + if (occurrences.isEmpty()) { + return EMPTY_TODO_ITEMS; + } + + return processTodoOccurences(startOffset, endOffset, occurrences); + } + + @Override + public int getTodoItemsCount(@NotNull PsiFile file) { + int count = CacheManager.SERVICE.getInstance(myManager.getProject()).getTodoCount(file.getVirtualFile(), TodoIndexPatternProvider.getInstance()); + if (count != -1) return count; + return findTodoItems(file).length; + } + + @Override + public int getTodoItemsCount(@NotNull PsiFile file, @NotNull TodoPattern pattern) { + int count = CacheManager.SERVICE.getInstance(myManager.getProject()).getTodoCount(file.getVirtualFile(), pattern.getIndexPattern()); + if (count != -1) return count; + TodoItem[] items = findTodoItems(file); + count = 0; + for (TodoItem item : items) { + if (item.getPattern().equals(pattern)) count++; + } + return count; + } + + private static ArrayList getWordEntries(String name, boolean caseSensitively) { + List words = StringUtil.getWordsInStringLongestFirst(name); + final ArrayList keys = new ArrayList(); + for (String word : words) { + keys.add(new IdIndexEntry(word, caseSensitively)); + } + return keys; + } +} diff --git a/platform/platform-impl/src/com/intellij/openapi/vcs/changes/TodoForBaseRevision.java b/platform/platform-impl/src/com/intellij/openapi/vcs/changes/TodoForBaseRevision.java index 63ddf87e0c60..7e16b694280c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vcs/changes/TodoForBaseRevision.java +++ b/platform/platform-impl/src/com/intellij/openapi/vcs/changes/TodoForBaseRevision.java @@ -19,7 +19,7 @@ import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Getter; import com.intellij.openapi.util.TextRange; -import com.intellij.psi.search.PsiSearchHelper; +import com.intellij.psi.search.PsiTodoSearchHelper; import com.intellij.psi.search.TodoItem; import com.intellij.util.Consumer; @@ -51,7 +51,7 @@ public class TodoForBaseRevision extends TodoForRanges { protected TodoItem[] getTodoItems() { final TodoItem[] items = (TodoItem[])myGetter.get(); if (items != null) return items; - final TodoItem[] todoItems = getTodoForText(PsiSearchHelper.SERVICE.getInstance(myProject)); + final TodoItem[] todoItems = getTodoForText(PsiTodoSearchHelper.SERVICE.getInstance(myProject)); if (todoItems != null) { mySaver.consume(todoItems); } diff --git a/platform/platform-impl/src/com/intellij/openapi/vcs/changes/TodoForExistingFile.java b/platform/platform-impl/src/com/intellij/openapi/vcs/changes/TodoForExistingFile.java index 5a0f02dae3bc..ae89b44687df 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vcs/changes/TodoForExistingFile.java +++ b/platform/platform-impl/src/com/intellij/openapi/vcs/changes/TodoForExistingFile.java @@ -16,16 +16,14 @@ package com.intellij.openapi.vcs.changes; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; -import com.intellij.psi.PsiFileFactory; import com.intellij.psi.PsiManager; -import com.intellij.psi.search.PsiSearchHelper; +import com.intellij.psi.search.PsiTodoSearchHelper; import com.intellij.psi.search.TodoItem; import java.util.List; @@ -53,7 +51,7 @@ public class TodoForExistingFile extends TodoForRanges { return ApplicationManager.getApplication().runReadAction(new Computable() { @Override public TodoItem[] compute() { - final PsiSearchHelper helper = PsiSearchHelper.SERVICE.getInstance(myProject); + final PsiTodoSearchHelper helper = PsiTodoSearchHelper.SERVICE.getInstance(myProject); PsiFile psiFile = myFile == null ? null : PsiManager.getInstance(myProject).findFile(myFile); if (psiFile != null) { diff --git a/platform/platform-impl/src/com/intellij/openapi/vcs/changes/TodoForRanges.java b/platform/platform-impl/src/com/intellij/openapi/vcs/changes/TodoForRanges.java index a6e65a39fa68..dac706fef5dd 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vcs/changes/TodoForRanges.java +++ b/platform/platform-impl/src/com/intellij/openapi/vcs/changes/TodoForRanges.java @@ -26,7 +26,7 @@ import com.intellij.openapi.util.TextRange; import com.intellij.openapi.vcs.checkin.StepIntersection; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFileFactory; -import com.intellij.psi.search.PsiSearchHelper; +import com.intellij.psi.search.PsiTodoSearchHelper; import com.intellij.psi.search.TodoItem; import com.intellij.util.containers.Convertor; @@ -104,7 +104,7 @@ public abstract class TodoForRanges { protected abstract TodoItem[] getTodoItems(); - protected TodoItem[] getTodoForText(PsiSearchHelper helper) { + protected TodoItem[] getTodoForText(PsiTodoSearchHelper helper) { final PsiFile psiFile = ApplicationManager.getApplication().runReadAction(new Computable() { @Override public PsiFile compute() { diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml index 34444adf12f5..caa74bd9e508 100644 --- a/platform/platform-resources/src/META-INF/LangExtensions.xml +++ b/platform/platform-resources/src/META-INF/LangExtensions.xml @@ -73,6 +73,9 @@ + + diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/TodoUtil.java b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/TodoUtil.java index 527047d63270..a75f9185bf3e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/TodoUtil.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/TodoUtil.java @@ -18,7 +18,7 @@ package com.siyeh.ig.maturity; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiComment; import com.intellij.psi.PsiFile; -import com.intellij.psi.search.PsiSearchHelper; +import com.intellij.psi.search.PsiTodoSearchHelper; import com.intellij.psi.search.TodoItem; public class TodoUtil { @@ -28,7 +28,7 @@ public class TodoUtil { public static boolean isTodoComment(PsiComment comment) { final PsiFile file = comment.getContainingFile(); - final PsiSearchHelper searchHelper = PsiSearchHelper.SERVICE.getInstance(comment.getProject()); + final PsiTodoSearchHelper searchHelper = PsiTodoSearchHelper.SERVICE.getInstance(comment.getProject()); final TodoItem[] todoItems = searchHelper.findTodoItems(file); for (final TodoItem todoItem : todoItems) { final TextRange commentTextRange = comment.getTextRange(); From 8c0ba20a7f7eddb29ff557ab90efc1d5d83240cb Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Wed, 13 Jun 2012 12:02:28 +0200 Subject: [PATCH 04/61] Split CacheManager and TodoCacheManager. Also, split implementations --- .../psi/impl/cache/impl/IdCacheTest.java | 76 ++++++----- .../intellij/psi/impl/cache/CacheManager.java | 21 +-- .../psi/impl/cache/TodoCacheManager.java | 52 ++++++++ .../cache/impl/IndexCacheManagerImpl.java | 80 +---------- .../cache/impl/IndexTodoCacheManagerImpl.java | 126 ++++++++++++++++++ .../impl/search/IndexPatternSearchImpl.java | 6 +- .../psi/impl/search/IndexPatternSearcher.java | 4 +- .../impl/search/PsiTodoSearchHelperImpl.java | 8 +- .../src/META-INF/LangExtensions.xml | 2 + 9 files changed, 234 insertions(+), 141 deletions(-) create mode 100644 platform/lang-impl/src/com/intellij/psi/impl/cache/TodoCacheManager.java create mode 100644 platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IndexTodoCacheManagerImpl.java diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/IdCacheTest.java b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/IdCacheTest.java index bb43aac5a141..df764a72bb7b 100644 --- a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/IdCacheTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/IdCacheTest.java @@ -12,6 +12,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.psi.impl.cache.CacheManager; +import com.intellij.psi.impl.cache.TodoCacheManager; import com.intellij.psi.impl.cache.impl.id.IdIndex; import com.intellij.psi.impl.cache.impl.todo.TodoIndex; import com.intellij.psi.search.GlobalSearchScope; @@ -49,7 +50,7 @@ public class IdCacheTest extends CodeInsightTestCase{ } public void testBuildCache() throws Exception { - checkCache(CacheManager.SERVICE.getInstance(myProject)); + checkCache(CacheManager.SERVICE.getInstance(myProject), TodoCacheManager.SERVICE.getInstance(myProject)); } public void testLoadCacheNoTodo() throws Exception { @@ -62,7 +63,7 @@ public class IdCacheTest extends CodeInsightTestCase{ public void testUpdateCache1() throws Exception { myRootDir.createChildData(null, "4.java"); Thread.sleep(1000); - checkCache(CacheManager.SERVICE.getInstance(myProject)); + checkCache(CacheManager.SERVICE.getInstance(myProject), TodoCacheManager.SERVICE.getInstance(myProject)); } public void testUpdateCache2() throws Exception { @@ -73,6 +74,7 @@ public class IdCacheTest extends CodeInsightTestCase{ FileDocumentManager.getInstance().saveAllDocuments(); final CacheManager cache = CacheManager.SERVICE.getInstance(myProject); + final TodoCacheManager todocache = TodoCacheManager.SERVICE.getInstance(myProject); final GlobalSearchScope scope = GlobalSearchScope.projectScope(myProject); checkResult(new String[] {"1.java"}, convert(cache.getFilesWithWord("xxx", UsageSearchContext.ANY, scope, false))); checkResult(new String[]{}, convert(cache.getFilesWithWord("a", UsageSearchContext.ANY, scope, false))); @@ -81,10 +83,10 @@ public class IdCacheTest extends CodeInsightTestCase{ checkResult(new String[]{"2.java", "3.java"}, convert(cache.getFilesWithWord("d", UsageSearchContext.ANY,scope, false))); checkResult(new String[]{"3.java"}, convert(cache.getFilesWithWord("e", UsageSearchContext.ANY,scope, false))); - checkResult(new String[]{"3.java"}, convert(cache.getFilesWithTodoItems())); - assertEquals(0, cache.getTodoCount(myRootDir.findChild("1.java"), TodoIndexPatternProvider.getInstance())); - assertEquals(0, cache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance())); - assertEquals(2, cache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance())); + checkResult(new String[]{"3.java"}, convert(todocache.getFilesWithTodoItems())); + assertEquals(0, todocache.getTodoCount(myRootDir.findChild("1.java"), TodoIndexPatternProvider.getInstance())); + assertEquals(0, todocache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance())); + assertEquals(2, todocache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance())); } public void testUpdateCache3() throws Exception { @@ -92,6 +94,7 @@ public class IdCacheTest extends CodeInsightTestCase{ child.delete(null); final CacheManager cache2 = CacheManager.SERVICE.getInstance(myProject); + final TodoCacheManager todocache2 = TodoCacheManager.SERVICE.getInstance(myProject); final GlobalSearchScope scope = GlobalSearchScope.projectScope(myProject); checkResult(ArrayUtil.EMPTY_STRING_ARRAY, convert(cache2.getFilesWithWord("xxx", UsageSearchContext.ANY, scope, false))); checkResult(ArrayUtil.EMPTY_STRING_ARRAY, convert(cache2.getFilesWithWord("a", UsageSearchContext.ANY, scope, false))); @@ -100,9 +103,9 @@ public class IdCacheTest extends CodeInsightTestCase{ checkResult(new String[]{"2.java", "3.java"}, convert(cache2.getFilesWithWord("d", UsageSearchContext.ANY, scope, false))); checkResult(new String[]{"3.java"}, convert(cache2.getFilesWithWord("e", UsageSearchContext.ANY, scope, false))); - checkResult(new String[]{"3.java"}, convert(cache2.getFilesWithTodoItems())); - assertEquals(0, cache2.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance())); - assertEquals(2, cache2.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance())); + checkResult(new String[]{"3.java"}, convert(todocache2.getFilesWithTodoItems())); + assertEquals(0, todocache2.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance())); + assertEquals(2, todocache2.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance())); } public void testUpdateCacheNoTodo() throws Exception { @@ -118,11 +121,11 @@ public class IdCacheTest extends CodeInsightTestCase{ TodoConfiguration.getInstance().setTodoPatterns(new TodoPattern[]{pattern}); try{ - final CacheManager cache = CacheManager.SERVICE.getInstance(myProject); - checkResult(new String[]{"2.java"}, convert(cache.getFilesWithTodoItems())); - assertEquals(0, cache.getTodoCount(myRootDir.findChild("1.java"), TodoIndexPatternProvider.getInstance())); - assertEquals(1, cache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance())); - assertEquals(0, cache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance())); + final TodoCacheManager todocache = TodoCacheManager.SERVICE.getInstance(myProject); + checkResult(new String[]{"2.java"}, convert(todocache.getFilesWithTodoItems())); + assertEquals(0, todocache.getTodoCount(myRootDir.findChild("1.java"), TodoIndexPatternProvider.getInstance())); + assertEquals(1, todocache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance())); + assertEquals(0, todocache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance())); } finally{ TodoConfiguration.getInstance().setTodoPatterns(oldPatterns); @@ -131,11 +134,12 @@ public class IdCacheTest extends CodeInsightTestCase{ public void testFileModification() throws Exception { final CacheManager cache = CacheManager.SERVICE.getInstance(myProject); - checkCache(cache); + final TodoCacheManager todocache = TodoCacheManager.SERVICE.getInstance(myProject); + checkCache(cache, todocache); VirtualFile child = myRootDir.findChild("1.java"); - checkCache(cache); + checkCache(cache, todocache); VfsUtil.saveText(child, "xxx"); PsiDocumentManager.getInstance(myProject).commitAllDocuments(); @@ -148,15 +152,16 @@ public class IdCacheTest extends CodeInsightTestCase{ checkResult(new String[]{"2.java", "3.java"}, convert(cache.getFilesWithWord("d", UsageSearchContext.ANY, scope, false))); checkResult(new String[]{"3.java"}, convert(cache.getFilesWithWord("e", UsageSearchContext.ANY, scope, false))); - checkResult(new String[]{"3.java"}, convert(cache.getFilesWithTodoItems())); - assertEquals(0, cache.getTodoCount(myRootDir.findChild("1.java"), TodoIndexPatternProvider.getInstance())); - assertEquals(0, cache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance())); - assertEquals(2, cache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance())); + checkResult(new String[]{"3.java"}, convert(todocache.getFilesWithTodoItems())); + assertEquals(0, todocache.getTodoCount(myRootDir.findChild("1.java"), TodoIndexPatternProvider.getInstance())); + assertEquals(0, todocache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance())); + assertEquals(2, todocache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance())); } public void testFileDeletion() throws Exception { final CacheManager cache = CacheManager.SERVICE.getInstance(myProject); - checkCache(cache); + final TodoCacheManager todocache = TodoCacheManager.SERVICE.getInstance(myProject); + checkCache(cache, todocache); VirtualFile child = myRootDir.findChild("1.java"); child.delete(null); @@ -169,14 +174,15 @@ public class IdCacheTest extends CodeInsightTestCase{ checkResult(new String[]{"2.java", "3.java"}, convert(cache.getFilesWithWord("d", UsageSearchContext.ANY, scope, false))); checkResult(new String[]{"3.java"}, convert(cache.getFilesWithWord("e", UsageSearchContext.ANY, scope, false))); - checkResult(new String[]{"3.java"}, convert(cache.getFilesWithTodoItems())); - assertEquals(0, cache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance())); - assertEquals(2, cache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance())); + checkResult(new String[]{"3.java"}, convert(todocache.getFilesWithTodoItems())); + assertEquals(0, todocache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance())); + assertEquals(2, todocache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance())); } public void testFileCreation() throws Exception { final CacheManager cache = CacheManager.SERVICE.getInstance(myProject); - checkCache(cache); + final TodoCacheManager todocache = TodoCacheManager.SERVICE.getInstance(myProject); + checkCache(cache, todocache); VirtualFile child = myRootDir.createChildData(null, "4.java"); VfsUtil.saveText(child, "xxx //todo"); @@ -190,11 +196,11 @@ public class IdCacheTest extends CodeInsightTestCase{ checkResult(new String[]{"2.java", "3.java"}, convert(cache.getFilesWithWord("d", UsageSearchContext.ANY, scope, false))); checkResult(new String[]{"3.java"}, convert(cache.getFilesWithWord("e", UsageSearchContext.ANY, scope, false))); - checkResult(new String[]{"1.java", "3.java", "4.java"}, convert(cache.getFilesWithTodoItems())); - assertEquals(1, cache.getTodoCount(myRootDir.findChild("1.java"), TodoIndexPatternProvider.getInstance())); - assertEquals(0, cache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance())); - assertEquals(2, cache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance())); - assertEquals(1, cache.getTodoCount(myRootDir.findChild("4.java"), TodoIndexPatternProvider.getInstance())); + checkResult(new String[]{"1.java", "3.java", "4.java"}, convert(todocache.getFilesWithTodoItems())); + assertEquals(1, todocache.getTodoCount(myRootDir.findChild("1.java"), TodoIndexPatternProvider.getInstance())); + assertEquals(0, todocache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance())); + assertEquals(2, todocache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance())); + assertEquals(1, todocache.getTodoCount(myRootDir.findChild("4.java"), TodoIndexPatternProvider.getInstance())); } public void testCrash() throws Exception { @@ -203,7 +209,7 @@ public class IdCacheTest extends CodeInsightTestCase{ System.gc(); } - private void checkCache(CacheManager cache) { + private void checkCache(CacheManager cache, TodoCacheManager todocache) { final GlobalSearchScope scope = GlobalSearchScope.projectScope(myProject); checkResult(ArrayUtil.EMPTY_STRING_ARRAY, convert(cache.getFilesWithWord("xxx", UsageSearchContext.ANY, scope, false))); checkResult(new String[]{"1.java"}, convert(cache.getFilesWithWord("a", UsageSearchContext.ANY, scope, false))); @@ -212,10 +218,10 @@ public class IdCacheTest extends CodeInsightTestCase{ checkResult(new String[]{"2.java", "3.java"}, convert(cache.getFilesWithWord("d", UsageSearchContext.ANY, scope, false))); checkResult(new String[]{"3.java"}, convert(cache.getFilesWithWord("e", UsageSearchContext.ANY, scope, false))); - checkResult(new String[]{"1.java", "3.java"}, convert(cache.getFilesWithTodoItems())); - assertEquals(1, cache.getTodoCount(myRootDir.findChild("1.java"), TodoIndexPatternProvider.getInstance())); - assertEquals(0, cache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance())); - assertEquals(2, cache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance())); + checkResult(new String[]{"1.java", "3.java"}, convert(todocache.getFilesWithTodoItems())); + assertEquals(1, todocache.getTodoCount(myRootDir.findChild("1.java"), TodoIndexPatternProvider.getInstance())); + assertEquals(0, todocache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance())); + assertEquals(2, todocache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance())); } private static VirtualFile[] convert(PsiFile[] psiFiles) { diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/CacheManager.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/CacheManager.java index 5773600672f6..54a3bf5ce979 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/cache/CacheManager.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/CacheManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,11 +18,8 @@ package com.intellij.psi.impl.cache; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.search.IndexPattern; -import com.intellij.psi.search.IndexPatternProvider; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; @@ -37,22 +34,6 @@ public interface CacheManager { } @NotNull PsiFile[] getFilesWithWord(@NotNull String word, short occurenceMask, @NotNull GlobalSearchScope scope, final boolean caseSensitively); - boolean processFilesWithWord(@NotNull Processor processor,@NotNull String word, short occurenceMask, @NotNull GlobalSearchScope scope, final boolean caseSensitively); - - /** - * @return all VirtualFile's that contain todo-items under project roots - */ - @NotNull PsiFile[] getFilesWithTodoItems(); - - /** - * @return -1 if it's not known - */ - int getTodoCount(@NotNull VirtualFile file, final IndexPatternProvider patternProvider); - - /** - * @return -1 if it's not known - */ - int getTodoCount(@NotNull VirtualFile file, IndexPattern pattern); } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/TodoCacheManager.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/TodoCacheManager.java new file mode 100644 index 000000000000..cd84cc568e5e --- /dev/null +++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/TodoCacheManager.java @@ -0,0 +1,52 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.psi.impl.cache; + +import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.psi.PsiFile; +import com.intellij.psi.search.IndexPattern; +import com.intellij.psi.search.IndexPatternProvider; +import org.jetbrains.annotations.NotNull; + +public interface TodoCacheManager { + class SERVICE { + private SERVICE() { + } + + public static TodoCacheManager getInstance(Project project) { + return ServiceManager.getService(project, TodoCacheManager.class); + } + } + + + /** + * @return all VirtualFile's that contain todo-items under project roots + */ + @NotNull + PsiFile[] getFilesWithTodoItems(); + + /** + * @return -1 if it's not known + */ + int getTodoCount(@NotNull VirtualFile file, IndexPatternProvider patternProvider); + + /** + * @return -1 if it's not known + */ + int getTodoCount(@NotNull VirtualFile file, IndexPattern pattern); +} diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IndexCacheManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IndexCacheManagerImpl.java index 689b68b7725d..3c29d11d47d0 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IndexCacheManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IndexCacheManagerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ package com.intellij.psi.impl.cache.impl; -import com.intellij.injected.editor.VirtualFileWindow; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadActionProcessor; import com.intellij.openapi.diagnostic.Logger; @@ -25,8 +24,6 @@ import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.FileIndexFacade; -import com.intellij.openapi.roots.ProjectFileIndex; -import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.util.Computable; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; @@ -34,18 +31,14 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.impl.cache.CacheManager; import com.intellij.psi.impl.cache.impl.id.IdIndex; import com.intellij.psi.impl.cache.impl.id.IdIndexEntry; -import com.intellij.psi.impl.cache.impl.todo.TodoIndex; -import com.intellij.psi.impl.cache.impl.todo.TodoIndexEntry; import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.search.IndexPattern; -import com.intellij.psi.search.IndexPatternProvider; -import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.CommonProcessors; import com.intellij.util.Processor; import com.intellij.util.indexing.FileBasedIndex; import org.jetbrains.annotations.NotNull; -import java.util.*; +import java.util.ArrayList; +import java.util.List; /** * @author Eugene Zhuravlev @@ -142,71 +135,4 @@ public class IndexCacheManagerImpl implements CacheManager{ } return true; } - - @Override - @NotNull - public PsiFile[] getFilesWithTodoItems() { - if (myProject.isDefault()) { - return PsiFile.EMPTY_ARRAY; - } - final FileBasedIndex fileBasedIndex = FileBasedIndex.getInstance(); - final Set allFiles = new HashSet(); - final ProjectFileIndex projectFileIndex = ProjectRootManager.getInstance(myProject).getFileIndex(); - for (IndexPattern indexPattern : IndexPatternUtil.getIndexPatterns()) { - final Collection files = fileBasedIndex.getContainingFiles( - TodoIndex.NAME, - new TodoIndexEntry(indexPattern.getPatternString(), indexPattern.isCaseSensitive()), GlobalSearchScope.allScope(myProject)); - ApplicationManager.getApplication().runReadAction(new Runnable() { - @Override - public void run() { - for (VirtualFile file : files) { - if (projectFileIndex.isInContent(file)) { - final PsiFile psiFile = myPsiManager.findFile(file); - if (psiFile != null) { - allFiles.add(psiFile); - } - } - } - } - }); - } - return allFiles.isEmpty() ? PsiFile.EMPTY_ARRAY : PsiUtilCore.toPsiFileArray(allFiles); - } - - @Override - public int getTodoCount(@NotNull final VirtualFile file, final IndexPatternProvider patternProvider) { - if (myProject.isDefault()) { - return 0; - } - if (file instanceof VirtualFileWindow) return -1; - final FileBasedIndex fileBasedIndex = FileBasedIndex.getInstance(); - int count = 0; - for (IndexPattern indexPattern : patternProvider.getIndexPatterns()) { - count += fetchCount(fileBasedIndex, file, indexPattern); - } - return count; - } - - @Override - public int getTodoCount(@NotNull final VirtualFile file, final IndexPattern pattern) { - if (myProject.isDefault()) { - return 0; - } - if (file instanceof VirtualFileWindow) return -1; - return fetchCount(FileBasedIndex.getInstance(), file, pattern); - } - - private int fetchCount(final FileBasedIndex fileBasedIndex, final VirtualFile file, final IndexPattern indexPattern) { - final int[] count = {0}; - fileBasedIndex.processValues( - TodoIndex.NAME, new TodoIndexEntry(indexPattern.getPatternString(), indexPattern.isCaseSensitive()), file, - new FileBasedIndex.ValueProcessor() { - @Override - public boolean process(final VirtualFile file, final Integer value) { - count[0] += value.intValue(); - return true; - } - }, GlobalSearchScope.fileScope(myProject, file)); - return count[0]; - } } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IndexTodoCacheManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IndexTodoCacheManagerImpl.java new file mode 100644 index 000000000000..0b1e5a10273e --- /dev/null +++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IndexTodoCacheManagerImpl.java @@ -0,0 +1,126 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.intellij.psi.impl.cache.impl; + +import com.intellij.injected.editor.VirtualFileWindow; +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.roots.FileIndexFacade; +import com.intellij.openapi.roots.ProjectFileIndex; +import com.intellij.openapi.roots.ProjectRootManager; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.psi.PsiFile; +import com.intellij.psi.PsiManager; +import com.intellij.psi.impl.cache.TodoCacheManager; +import com.intellij.psi.impl.cache.impl.todo.TodoIndex; +import com.intellij.psi.impl.cache.impl.todo.TodoIndexEntry; +import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.psi.search.IndexPattern; +import com.intellij.psi.search.IndexPatternProvider; +import com.intellij.psi.util.PsiUtilCore; +import com.intellij.util.indexing.FileBasedIndex; +import org.jetbrains.annotations.NotNull; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + +/** + * @author Eugene Zhuravlev + * Date: Jan 16, 2008 + */ +public class IndexTodoCacheManagerImpl implements TodoCacheManager { + private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.cache.impl.IndexTodoCacheManagerImpl"); + private final Project myProject; + private final PsiManager myPsiManager; + + public IndexTodoCacheManagerImpl(PsiManager psiManager) { + myPsiManager = psiManager; + myProject = psiManager.getProject(); + } + + public static boolean shouldBeFound(GlobalSearchScope scope, VirtualFile virtualFile, FileIndexFacade index) { + return (scope.isSearchOutsideRootModel() || index.isInContent(virtualFile) || index.isInLibrarySource(virtualFile)) && !virtualFile.getFileType().isBinary(); + } + + @NotNull + public PsiFile[] getFilesWithTodoItems() { + if (myProject.isDefault()) { + return PsiFile.EMPTY_ARRAY; + } + final FileBasedIndex fileBasedIndex = FileBasedIndex.getInstance(); + final Set allFiles = new HashSet(); + final ProjectFileIndex projectFileIndex = ProjectRootManager.getInstance(myProject).getFileIndex(); + for (IndexPattern indexPattern : IndexPatternUtil.getIndexPatterns()) { + final Collection files = fileBasedIndex.getContainingFiles( + TodoIndex.NAME, + new TodoIndexEntry(indexPattern.getPatternString(), indexPattern.isCaseSensitive()), GlobalSearchScope.allScope(myProject)); + ApplicationManager.getApplication().runReadAction(new Runnable() { + @Override + public void run() { + for (VirtualFile file : files) { + if (projectFileIndex.isInContent(file)) { + final PsiFile psiFile = myPsiManager.findFile(file); + if (psiFile != null) { + allFiles.add(psiFile); + } + } + } + } + }); + } + return allFiles.isEmpty() ? PsiFile.EMPTY_ARRAY : PsiUtilCore.toPsiFileArray(allFiles); + } + + @Override + public int getTodoCount(@NotNull final VirtualFile file, final IndexPatternProvider patternProvider) { + if (myProject.isDefault()) { + return 0; + } + if (file instanceof VirtualFileWindow) return -1; + final FileBasedIndex fileBasedIndex = FileBasedIndex.getInstance(); + int count = 0; + for (IndexPattern indexPattern : patternProvider.getIndexPatterns()) { + count += fetchCount(fileBasedIndex, file, indexPattern); + } + return count; + } + + @Override + public int getTodoCount(@NotNull final VirtualFile file, final IndexPattern pattern) { + if (myProject.isDefault()) { + return 0; + } + if (file instanceof VirtualFileWindow) return -1; + return fetchCount(FileBasedIndex.getInstance(), file, pattern); + } + + private int fetchCount(final FileBasedIndex fileBasedIndex, final VirtualFile file, final IndexPattern indexPattern) { + final int[] count = {0}; + fileBasedIndex.processValues( + TodoIndex.NAME, new TodoIndexEntry(indexPattern.getPatternString(), indexPattern.isCaseSensitive()), file, + new FileBasedIndex.ValueProcessor() { + @Override + public boolean process(final VirtualFile file, final Integer value) { + count[0] += value.intValue(); + return true; + } + }, GlobalSearchScope.fileScope(myProject, file)); + return count[0]; + } +} diff --git a/platform/lang-impl/src/com/intellij/psi/impl/search/IndexPatternSearchImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/search/IndexPatternSearchImpl.java index 2104ff613b81..8cb9413279a1 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/search/IndexPatternSearchImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/search/IndexPatternSearchImpl.java @@ -17,7 +17,7 @@ package com.intellij.psi.impl.search; import com.intellij.psi.PsiFile; -import com.intellij.psi.impl.cache.CacheManager; +import com.intellij.psi.impl.cache.TodoCacheManager; import com.intellij.psi.search.IndexPattern; import com.intellij.psi.search.IndexPatternProvider; import com.intellij.psi.search.searches.IndexPatternSearch; @@ -32,14 +32,14 @@ class IndexPatternSearchImpl extends IndexPatternSearch { @Override protected int getOccurrencesCountImpl(PsiFile file, IndexPatternProvider provider) { - int count = CacheManager.SERVICE.getInstance(file.getProject()).getTodoCount(file.getVirtualFile(), provider); + int count = TodoCacheManager.SERVICE.getInstance(file.getProject()).getTodoCount(file.getVirtualFile(), provider); if (count != -1) return count; return search(file, provider).findAll().size(); } @Override protected int getOccurrencesCountImpl(PsiFile file, IndexPattern pattern) { - int count = CacheManager.SERVICE.getInstance(file.getProject()).getTodoCount(file.getVirtualFile(), pattern); + int count = TodoCacheManager.SERVICE.getInstance(file.getProject()).getTodoCount(file.getVirtualFile(), pattern); if (count != -1) return count; return search(file, pattern).findAll().size(); } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/search/IndexPatternSearcher.java b/platform/lang-impl/src/com/intellij/psi/impl/search/IndexPatternSearcher.java index 4f1c94e33001..2945ddf4d65c 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/search/IndexPatternSearcher.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/search/IndexPatternSearcher.java @@ -29,7 +29,7 @@ import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; -import com.intellij.psi.impl.cache.CacheManager; +import com.intellij.psi.impl.cache.TodoCacheManager; import com.intellij.psi.search.IndexPattern; import com.intellij.psi.search.IndexPatternOccurrence; import com.intellij.psi.search.IndexPatternProvider; @@ -60,7 +60,7 @@ public class IndexPatternSearcher implements QueryExecutor + Date: Wed, 13 Jun 2012 12:05:56 +0200 Subject: [PATCH 05/61] Move shouldBeFound method to FileIndexFacade --- .../src/com/intellij/openapi/roots/FileIndexFacade.java | 5 +++++ .../psi/impl/cache/impl/IndexCacheManagerImpl.java | 6 +----- .../intellij/psi/impl/search/PsiSearchHelperImpl.java | 9 ++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/platform/core-api/src/com/intellij/openapi/roots/FileIndexFacade.java b/platform/core-api/src/com/intellij/openapi/roots/FileIndexFacade.java index d9f052f8b0de..35dc94d204a0 100644 --- a/platform/core-api/src/com/intellij/openapi/roots/FileIndexFacade.java +++ b/platform/core-api/src/com/intellij/openapi/roots/FileIndexFacade.java @@ -19,6 +19,7 @@ import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.Nullable; /** @@ -54,4 +55,8 @@ public abstract class FileIndexFacade { * @return true if it's a valid ancestor, false otherwise. */ public abstract boolean isValidAncestor(final VirtualFile baseDir, final VirtualFile child); + + public boolean shouldBeFound(GlobalSearchScope scope, VirtualFile virtualFile) { + return (scope.isSearchOutsideRootModel() || isInContent(virtualFile) || isInLibrarySource(virtualFile)) && !virtualFile.getFileType().isBinary(); + } } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IndexCacheManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IndexCacheManagerImpl.java index 3c29d11d47d0..6aa855188fb0 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IndexCacheManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IndexCacheManagerImpl.java @@ -65,10 +65,6 @@ public class IndexCacheManagerImpl implements CacheManager{ return processor.getResults().isEmpty() ? PsiFile.EMPTY_ARRAY : processor.toArray(PsiFile.EMPTY_ARRAY); } - public static boolean shouldBeFound(GlobalSearchScope scope, VirtualFile virtualFile, FileIndexFacade index) { - return (scope.isSearchOutsideRootModel() || index.isInContent(virtualFile) || index.isInLibrarySource(virtualFile)) && !virtualFile.getFileType().isBinary(); - } - // IMPORTANT!!! // Since implementation of virtualFileProcessor.process() may call indices directly or indirectly, // we cannot call it inside FileBasedIndex.processValues() method except in collecting form @@ -90,7 +86,7 @@ public class IndexCacheManagerImpl implements CacheManager{ public boolean process(final VirtualFile file, final Integer value) { ProgressManager.checkCanceled(); final int mask = value.intValue(); - if ((mask & occurrenceMask) != 0 && shouldBeFound(scope, file, index)) { + if ((mask & occurrenceMask) != 0 && index.shouldBeFound(scope, file)) { if (!fileProcessor.process(file)) return false; } return true; diff --git a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java index fb13ffed6657..4b85dc369654 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java @@ -36,7 +36,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.psi.impl.PsiManagerEx; import com.intellij.psi.impl.cache.CacheManager; -import com.intellij.psi.impl.cache.impl.IndexCacheManagerImpl; import com.intellij.psi.impl.cache.impl.id.IdIndex; import com.intellij.psi.impl.cache.impl.id.IdIndexEntry; import com.intellij.psi.search.*; @@ -307,7 +306,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { return ContainerUtil.process(collectProcessor.getResults(), new ReadActionProcessor() { @Override public boolean processInReadAction(VirtualFile virtualFile) { - return !IndexCacheManagerImpl.shouldBeFound(scope, virtualFile, index) || processor.process(virtualFile); + return !index.shouldBeFound(scope, virtualFile) || processor.process(virtualFile); } }); } @@ -624,7 +623,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { FileBasedIndex.getInstance().processValues(IdIndex.NAME, entry, file, new FileBasedIndex.ValueProcessor() { @Override public boolean process(VirtualFile file, Integer value) { - if (IndexCacheManagerImpl.shouldBeFound(commonScope, file, index)) { + if (index.shouldBeFound(commonScope, file)) { int mask = value.intValue(); for (RequestWithProcessor single : data) { final PsiSearchRequest request = single.request; @@ -679,7 +678,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { public boolean process(VirtualFile file, Integer value) { if (progress != null) progress.checkCanceled(); - if (IndexCacheManagerImpl.shouldBeFound(commonScope, file, index)) { + if (index.shouldBeFound(commonScope, file)) { int mask = value.intValue(); for (RequestWithProcessor single : data) { final PsiSearchRequest request = single.request; @@ -757,7 +756,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { @Override public boolean process(VirtualFile file) { if (file == fileToIgnoreOccurencesInVirtualFile) return true; - if (!IndexCacheManagerImpl.shouldBeFound(scope, file, index)) return true; + if (!index.shouldBeFound(scope, file)) return true; final int value = count.incrementAndGet(); return value < 10; } From fe0402d380ab3075649abb6cad9462902a9fd271 Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Wed, 13 Jun 2012 12:11:58 +0200 Subject: [PATCH 06/61] Move CacheManager to "indexing" module Move todo-related stuff back to lang-impl - they'r far too not ready to be moved --- .../src/com/intellij/psi/impl/cache/CacheManager.java | 0 .../intellij/psi/impl/cache/impl/IndexCacheManagerImpl.java | 6 +++--- .../com/intellij/psi/impl/cache/impl/BaseFilterLexer.java | 2 +- .../intellij/psi/impl/cache/impl/id/IdTableBuilding.java | 0 .../intellij/psi/impl/cache/impl/todo/TodoIndexEntry.java | 0 .../com/intellij/psi/impl/cache/impl/todo/TodoIndexers.java | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename platform/{lang-impl => indexing-impl}/src/com/intellij/psi/impl/cache/CacheManager.java (100%) rename platform/{lang-impl => indexing-impl}/src/com/intellij/psi/impl/cache/impl/IndexCacheManagerImpl.java (97%) rename platform/{indexing-impl => lang-impl}/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java (100%) rename platform/{indexing-impl => lang-impl}/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexEntry.java (100%) rename platform/{indexing-impl => lang-impl}/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexers.java (100%) diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/CacheManager.java b/platform/indexing-impl/src/com/intellij/psi/impl/cache/CacheManager.java similarity index 100% rename from platform/lang-impl/src/com/intellij/psi/impl/cache/CacheManager.java rename to platform/indexing-impl/src/com/intellij/psi/impl/cache/CacheManager.java diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IndexCacheManagerImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/IndexCacheManagerImpl.java similarity index 97% rename from platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IndexCacheManagerImpl.java rename to platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/IndexCacheManagerImpl.java index 6aa855188fb0..1a44cf491b54 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IndexCacheManagerImpl.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/IndexCacheManagerImpl.java @@ -20,7 +20,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadActionProcessor; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProcessCanceledException; -import com.intellij.openapi.progress.ProgressManager; +import com.intellij.openapi.progress.ProgressIndicatorProvider; import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.FileIndexFacade; @@ -84,7 +84,7 @@ public class IndexCacheManagerImpl implements CacheManager{ final FileIndexFacade index = FileIndexFacade.getInstance(myProject); @Override public boolean process(final VirtualFile file, final Integer value) { - ProgressManager.checkCanceled(); + ProgressIndicatorProvider.checkCanceled(); final int mask = value.intValue(); if ((mask & occurrenceMask) != 0 && index.shouldBeFound(scope, file)) { if (!fileProcessor.process(file)) return false; @@ -124,7 +124,7 @@ public class IndexCacheManagerImpl implements CacheManager{ // If we do, deadlocks are possible (IDEADEV-42137). So first we obtain files with the word specified, // and then process them not holding indices' read lock. for (VirtualFile vFile : vFiles) { - ProgressManager.checkCanceled(); + ProgressIndicatorProvider.checkCanceled(); if (!virtualFileProcessor.process(vFile)) { return false; } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexer.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexer.java index cdd9acdd156a..d297a9a0c4c5 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexer.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java similarity index 100% rename from platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java rename to platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexEntry.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexEntry.java similarity index 100% rename from platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexEntry.java rename to platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexEntry.java diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexers.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexers.java similarity index 100% rename from platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexers.java rename to platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexers.java From 7d4d6b4e0efc2185dacef70825cede94aab56aeb Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Wed, 13 Jun 2012 12:22:23 +0200 Subject: [PATCH 07/61] Move PsiSearchHelper to "indexing". TODO: move implementation --- .../PsiNonJavaFileReferenceProcessor.java | 2 +- .../intellij/psi/search/PsiSearchHelper.java | 0 .../intellij/psi/search/PsiSearchRequest.java | 15 ++++++++++++ .../psi/search/QuerySearchRequest.java | 15 ++++++++++++ .../psi/search/RequestResultProcessor.java | 15 ++++++++++++ .../psi/search/SearchRequestCollector.java | 15 ++++++++++++ .../intellij/psi/search/SearchSession.java | 24 +++++++++++++++++++ .../SingleTargetRequestResultProcessor.java | 15 ++++++++++++ .../psi/search/TextOccurenceProcessor.java | 2 +- .../intellij/psi/search/SearchSession.java | 9 ------- .../inline/InlineOptionsDialog.java | 2 -- 11 files changed, 101 insertions(+), 13 deletions(-) rename platform/{lang-api => core-api}/src/com/intellij/psi/search/PsiNonJavaFileReferenceProcessor.java (94%) rename platform/{lang-api => indexing-api}/src/com/intellij/psi/search/PsiSearchHelper.java (100%) rename platform/{lang-api => indexing-api}/src/com/intellij/psi/search/PsiSearchRequest.java (76%) rename platform/{lang-api => indexing-api}/src/com/intellij/psi/search/QuerySearchRequest.java (68%) rename platform/{lang-api => indexing-api}/src/com/intellij/psi/search/RequestResultProcessor.java (60%) rename platform/{lang-api => indexing-api}/src/com/intellij/psi/search/SearchRequestCollector.java (84%) create mode 100644 platform/indexing-api/src/com/intellij/psi/search/SearchSession.java rename platform/{lang-api => indexing-api}/src/com/intellij/psi/search/SingleTargetRequestResultProcessor.java (69%) rename platform/{lang-api => indexing-api}/src/com/intellij/psi/search/TextOccurenceProcessor.java (95%) delete mode 100644 platform/lang-api/src/com/intellij/psi/search/SearchSession.java diff --git a/platform/lang-api/src/com/intellij/psi/search/PsiNonJavaFileReferenceProcessor.java b/platform/core-api/src/com/intellij/psi/search/PsiNonJavaFileReferenceProcessor.java similarity index 94% rename from platform/lang-api/src/com/intellij/psi/search/PsiNonJavaFileReferenceProcessor.java rename to platform/core-api/src/com/intellij/psi/search/PsiNonJavaFileReferenceProcessor.java index 1eeb5e709ae8..406e95b74f8c 100644 --- a/platform/lang-api/src/com/intellij/psi/search/PsiNonJavaFileReferenceProcessor.java +++ b/platform/core-api/src/com/intellij/psi/search/PsiNonJavaFileReferenceProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/lang-api/src/com/intellij/psi/search/PsiSearchHelper.java b/platform/indexing-api/src/com/intellij/psi/search/PsiSearchHelper.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/search/PsiSearchHelper.java rename to platform/indexing-api/src/com/intellij/psi/search/PsiSearchHelper.java diff --git a/platform/lang-api/src/com/intellij/psi/search/PsiSearchRequest.java b/platform/indexing-api/src/com/intellij/psi/search/PsiSearchRequest.java similarity index 76% rename from platform/lang-api/src/com/intellij/psi/search/PsiSearchRequest.java rename to platform/indexing-api/src/com/intellij/psi/search/PsiSearchRequest.java index 4a0d56fe312b..cda5223ece04 100644 --- a/platform/lang-api/src/com/intellij/psi/search/PsiSearchRequest.java +++ b/platform/indexing-api/src/com/intellij/psi/search/PsiSearchRequest.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.psi.search; import org.jetbrains.annotations.NotNull; diff --git a/platform/lang-api/src/com/intellij/psi/search/QuerySearchRequest.java b/platform/indexing-api/src/com/intellij/psi/search/QuerySearchRequest.java similarity index 68% rename from platform/lang-api/src/com/intellij/psi/search/QuerySearchRequest.java rename to platform/indexing-api/src/com/intellij/psi/search/QuerySearchRequest.java index 158ee91dc151..cd0da9bad58e 100644 --- a/platform/lang-api/src/com/intellij/psi/search/QuerySearchRequest.java +++ b/platform/indexing-api/src/com/intellij/psi/search/QuerySearchRequest.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.psi.search; import com.intellij.openapi.application.ReadActionProcessor; diff --git a/platform/lang-api/src/com/intellij/psi/search/RequestResultProcessor.java b/platform/indexing-api/src/com/intellij/psi/search/RequestResultProcessor.java similarity index 60% rename from platform/lang-api/src/com/intellij/psi/search/RequestResultProcessor.java rename to platform/indexing-api/src/com/intellij/psi/search/RequestResultProcessor.java index e2a1d95c6a06..edc1b64d6e68 100644 --- a/platform/lang-api/src/com/intellij/psi/search/RequestResultProcessor.java +++ b/platform/indexing-api/src/com/intellij/psi/search/RequestResultProcessor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.psi.search; import com.intellij.psi.PsiElement; diff --git a/platform/lang-api/src/com/intellij/psi/search/SearchRequestCollector.java b/platform/indexing-api/src/com/intellij/psi/search/SearchRequestCollector.java similarity index 84% rename from platform/lang-api/src/com/intellij/psi/search/SearchRequestCollector.java rename to platform/indexing-api/src/com/intellij/psi/search/SearchRequestCollector.java index 4a1f82d7903d..88881db85e1f 100644 --- a/platform/lang-api/src/com/intellij/psi/search/SearchRequestCollector.java +++ b/platform/indexing-api/src/com/intellij/psi/search/SearchRequestCollector.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.psi.search; import com.intellij.psi.PsiElement; diff --git a/platform/indexing-api/src/com/intellij/psi/search/SearchSession.java b/platform/indexing-api/src/com/intellij/psi/search/SearchSession.java new file mode 100644 index 000000000000..0acfd9ba978c --- /dev/null +++ b/platform/indexing-api/src/com/intellij/psi/search/SearchSession.java @@ -0,0 +1,24 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.psi.search; + +import com.intellij.openapi.util.UserDataHolderBase; + +/** + * @author peter + */ +public class SearchSession extends UserDataHolderBase { +} diff --git a/platform/lang-api/src/com/intellij/psi/search/SingleTargetRequestResultProcessor.java b/platform/indexing-api/src/com/intellij/psi/search/SingleTargetRequestResultProcessor.java similarity index 69% rename from platform/lang-api/src/com/intellij/psi/search/SingleTargetRequestResultProcessor.java rename to platform/indexing-api/src/com/intellij/psi/search/SingleTargetRequestResultProcessor.java index edd55f417dfe..2f860e1e3527 100644 --- a/platform/lang-api/src/com/intellij/psi/search/SingleTargetRequestResultProcessor.java +++ b/platform/indexing-api/src/com/intellij/psi/search/SingleTargetRequestResultProcessor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.psi.search; import com.intellij.psi.PsiElement; diff --git a/platform/lang-api/src/com/intellij/psi/search/TextOccurenceProcessor.java b/platform/indexing-api/src/com/intellij/psi/search/TextOccurenceProcessor.java similarity index 95% rename from platform/lang-api/src/com/intellij/psi/search/TextOccurenceProcessor.java rename to platform/indexing-api/src/com/intellij/psi/search/TextOccurenceProcessor.java index 283b9d8d5133..bd533a186bc7 100644 --- a/platform/lang-api/src/com/intellij/psi/search/TextOccurenceProcessor.java +++ b/platform/indexing-api/src/com/intellij/psi/search/TextOccurenceProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/lang-api/src/com/intellij/psi/search/SearchSession.java b/platform/lang-api/src/com/intellij/psi/search/SearchSession.java deleted file mode 100644 index 6962de194566..000000000000 --- a/platform/lang-api/src/com/intellij/psi/search/SearchSession.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.intellij.psi.search; - -import com.intellij.openapi.util.UserDataHolderBase; - -/** - * @author peter - */ -public class SearchSession extends UserDataHolderBase { -} diff --git a/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsDialog.java b/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsDialog.java index 6b0819711bd9..a3743bc49602 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsDialog.java @@ -22,13 +22,11 @@ import com.intellij.psi.PsiNameIdentifierOwner; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.PsiSearchHelper; import com.intellij.psi.search.searches.ReferencesSearch; -import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.util.RadioUpDownListener; import javax.swing.*; import javax.swing.border.EmptyBorder; -import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; From 73e89b44d2075a9e8b5d082dfa500fc75badf930 Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Wed, 13 Jun 2012 14:34:17 +0200 Subject: [PATCH 08/61] "indexing" module housekeeping --- .../impl/cache/impl/id/IdTableBuilding.java | 50 ------------------- .../impl/id/PlatformIdTableBuilding.java | 42 +++++++++++++++- .../psi/impl/cache/impl/todo/TodoIndex.java | 3 +- .../psi/impl/search/PsiSearchHelperImpl.java | 4 +- 4 files changed, 44 insertions(+), 55 deletions(-) rename platform/{lang-impl => indexing-impl}/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java (80%) diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java similarity index 80% rename from platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java rename to platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java index e8cc0d0ba880..78861024d61b 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java @@ -25,26 +25,17 @@ import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.LanguageFileType; import com.intellij.openapi.fileTypes.impl.CustomSyntaxTableFileType; import com.intellij.psi.CustomHighlighterTokenType; -import com.intellij.psi.impl.cache.impl.IndexPatternUtil; -import com.intellij.psi.impl.cache.impl.OccurrenceConsumer; -import com.intellij.psi.impl.cache.impl.todo.TodoIndexEntry; -import com.intellij.psi.impl.cache.impl.todo.TodoIndexers; -import com.intellij.psi.search.IndexPattern; import com.intellij.psi.search.UsageSearchContext; import com.intellij.psi.tree.TokenSet; import com.intellij.util.Processor; -import com.intellij.util.indexing.DataIndexer; import com.intellij.util.indexing.FileContent; import com.intellij.util.indexing.IdDataConsumer; import com.intellij.util.text.CharArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class IdTableBuilding { private IdTableBuilding() { @@ -74,41 +65,6 @@ public class IdTableBuilding { } } - public static class PlainTextTodoIndexer implements DataIndexer { - @Override - @NotNull - public Map map(final FileContent inputData) { - final CharSequence chars = inputData.getContentAsText(); - - - final IndexPattern[] indexPatterns = IndexPatternUtil.getIndexPatterns(); - if (indexPatterns.length > 0) { - final OccurrenceConsumer occurrenceConsumer = new OccurrenceConsumer(null, true); - for (IndexPattern indexPattern : indexPatterns) { - Pattern pattern = indexPattern.getPattern(); - if (pattern != null) { - Matcher matcher = pattern.matcher(chars); - while (matcher.find()) { - if (matcher.start() != matcher.end()) { - occurrenceConsumer.incTodoOccurrence(indexPattern); - } - } - } - } - Map map = new HashMap(); - for (IndexPattern indexPattern : indexPatterns) { - final int count = occurrenceConsumer.getOccurrenceCount(indexPattern); - if (count > 0) { - map.put(new TodoIndexEntry(indexPattern.getPatternString(), indexPattern.isCaseSensitive()), count); - } - } - return map; - } - return Collections.emptyMap(); - } - - } - private static final HashMap ourIdIndexers = new HashMap(); @Deprecated @@ -120,11 +76,6 @@ public class IdTableBuilding { return ourIdIndexers.containsKey(fileType) || IdIndexers.INSTANCE.forFileType(fileType) != null; } - public static boolean isTodoIndexerRegistered(FileType fileType) { - return ourIdIndexers.containsKey(fileType) || TodoIndexers.INSTANCE.forFileType(fileType) != null; - } - - @Nullable public static FileTypeIdIndexer getFileTypeIndexer(FileType fileType) { @@ -249,5 +200,4 @@ public class IdTableBuilding { processor.run(chars, charArray, index1, index); } } - } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java index 2faaf0a649e4..733a5949fbf1 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java @@ -50,6 +50,8 @@ import org.jetbrains.annotations.Nullable; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Author: dmitrylomov @@ -114,6 +116,9 @@ public abstract class PlatformIdTableBuilding { ourTodoIndexers.put(fileType, indexer); } + public static boolean isTodoIndexerRegistered(FileType fileType) { + return ourTodoIndexers.containsKey(fileType) || TodoIndexers.INSTANCE.forFileType(fileType) != null; + } private static class CompositeTodoIndexer implements DataIndexer { @@ -201,9 +206,44 @@ public abstract class PlatformIdTableBuilding { } } + public static class PlainTextTodoIndexer implements DataIndexer { + @Override + @NotNull + public Map map(final FileContent inputData) { + final CharSequence chars = inputData.getContentAsText(); + + + final IndexPattern[] indexPatterns = IndexPatternUtil.getIndexPatterns(); + if (indexPatterns.length > 0) { + final OccurrenceConsumer occurrenceConsumer = new OccurrenceConsumer(null, true); + for (IndexPattern indexPattern : indexPatterns) { + Pattern pattern = indexPattern.getPattern(); + if (pattern != null) { + Matcher matcher = pattern.matcher(chars); + while (matcher.find()) { + if (matcher.start() != matcher.end()) { + occurrenceConsumer.incTodoOccurrence(indexPattern); + } + } + } + } + Map map = new HashMap(); + for (IndexPattern indexPattern : indexPatterns) { + final int count = occurrenceConsumer.getOccurrenceCount(indexPattern); + if (count > 0) { + map.put(new TodoIndexEntry(indexPattern.getPatternString(), indexPattern.isCaseSensitive()), count); + } + } + return map; + } + return Collections.emptyMap(); + } + + } + static { IdTableBuilding.registerIdIndexer(FileTypes.PLAIN_TEXT, new IdTableBuilding.PlainTextIndexer()); - registerTodoIndexer(FileTypes.PLAIN_TEXT, new IdTableBuilding.PlainTextTodoIndexer()); + registerTodoIndexer(FileTypes.PLAIN_TEXT, new PlainTextTodoIndexer()); IdTableBuilding.registerIdIndexer(StdFileTypes.IDEA_MODULE, null); IdTableBuilding.registerIdIndexer(StdFileTypes.IDEA_WORKSPACE, null); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java index 1998ac33fc83..dc8b30258269 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java @@ -25,7 +25,6 @@ import com.intellij.openapi.fileTypes.impl.CustomSyntaxTableFileType; import com.intellij.openapi.project.ProjectCoreUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.impl.cache.impl.id.IdTableBuilding; import com.intellij.psi.impl.cache.impl.id.PlatformIdTableBuilding; import com.intellij.psi.search.IndexPatternProvider; import com.intellij.psi.tree.TokenSet; @@ -130,7 +129,7 @@ public class TodoIndex extends FileBasedIndexExtension return commentTokens != null; } - return IdTableBuilding.isTodoIndexerRegistered(fileType) || + return PlatformIdTableBuilding.isTodoIndexerRegistered(fileType) || fileType instanceof CustomSyntaxTableFileType; } }; diff --git a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java index 4b85dc369654..7b2454f1bf2b 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java @@ -39,7 +39,7 @@ import com.intellij.psi.impl.cache.CacheManager; import com.intellij.psi.impl.cache.impl.id.IdIndex; import com.intellij.psi.impl.cache.impl.id.IdIndexEntry; import com.intellij.psi.search.*; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.CommonProcessors; import com.intellij.util.Processor; import com.intellij.util.SmartList; @@ -93,7 +93,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { } }); synchronized (results) { - return PsiUtilBase.toPsiElementArray(results); + return PsiUtilCore.toPsiElementArray(results); } } From f77d9c9ec73788fcc7462979e273ff6feb06f760 Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Wed, 13 Jun 2012 15:04:41 +0200 Subject: [PATCH 09/61] JobUtil -> JobLauncher component --- .../testData/unscramble/deadlock.txt | 8 +- .../src/com/intellij/concurrency/Job.java | 0 .../com/intellij/concurrency/JobLauncher.java | 54 +++++++ .../daemon/impl/GeneralHighlightingPass.java | 137 ++++++++++-------- .../daemon/impl/LocalInspectionsPass.java | 85 ++++++----- .../daemon/impl/PassExecutorService.java | 4 +- .../BraceHighlightingHandler.java | 6 +- .../ex/GlobalInspectionContextImpl.java | 28 ++-- .../ContributorsBasedGotoByModel.java | 106 +++++++------- .../psi/impl/search/PsiSearchHelperImpl.java | 15 +- .../injected/InjectedLanguageManagerImpl.java | 6 +- .../src/com/intellij/ui/DeferredIconImpl.java | 7 +- .../{JobUtil.java => JobLauncherImpl.java} | 18 +-- .../src/META-INF/LangExtensions.xml | 3 + .../com/intellij/openapi/vfs/VfsUtilTest.java | 27 ++-- .../vfs/impl/VirtualFilePointerTest.java | 4 +- .../DuplicatePropertyInspection.java | 4 +- 17 files changed, 303 insertions(+), 209 deletions(-) rename platform/{platform-api => core-api}/src/com/intellij/concurrency/Job.java (100%) create mode 100644 platform/core-api/src/com/intellij/concurrency/JobLauncher.java rename platform/platform-impl/src/com/intellij/concurrency/{JobUtil.java => JobLauncherImpl.java} (91%) diff --git a/java/java-tests/testData/unscramble/deadlock.txt b/java/java-tests/testData/unscramble/deadlock.txt index 80e27e17ab26..98e83fc95b40 100644 --- a/java/java-tests/testData/unscramble/deadlock.txt +++ b/java/java-tests/testData/unscramble/deadlock.txt @@ -68,8 +68,8 @@ Full thread dump Java HotSpot(TM) 64-Bit Server VM (17.1-b03-307 mixed mode): at com.intellij.openapi.progress.impl.ProgressManagerImpl.executeProcessUnderProgress(ProgressManagerImpl.java:206) at com.intellij.codeInsight.daemon.impl.PassExecutorService$ScheduledPass.doRun(PassExecutorService.java:340) at com.intellij.codeInsight.daemon.impl.PassExecutorService$ScheduledPass.run(PassExecutorService.java:316) - at com.intellij.concurrency.JobUtil$3.call(JobUtil.java:134) - at com.intellij.concurrency.JobUtil$3.call(JobUtil.java:131) + at com.intellij.concurrency.JobLauncher$3.call(JobUtil.java:134) + at com.intellij.concurrency.JobLauncher$3.call(JobUtil.java:131) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at com.intellij.concurrency.PrioritizedFutureTask.access$101(PrioritizedFutureTask.java:31) @@ -724,8 +724,8 @@ Java stack information for the threads listed above: at com.intellij.openapi.progress.impl.ProgressManagerImpl.executeProcessUnderProgress(ProgressManagerImpl.java:206) at com.intellij.codeInsight.daemon.impl.PassExecutorService$ScheduledPass.doRun(PassExecutorService.java:340) at com.intellij.codeInsight.daemon.impl.PassExecutorService$ScheduledPass.run(PassExecutorService.java:316) - at com.intellij.concurrency.JobUtil$3.call(JobUtil.java:134) - at com.intellij.concurrency.JobUtil$3.call(JobUtil.java:131) + at com.intellij.concurrency.JobLauncher$3.call(JobUtil.java:134) + at com.intellij.concurrency.JobLauncher$3.call(JobUtil.java:131) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at com.intellij.concurrency.PrioritizedFutureTask.access$101(PrioritizedFutureTask.java:31) diff --git a/platform/platform-api/src/com/intellij/concurrency/Job.java b/platform/core-api/src/com/intellij/concurrency/Job.java similarity index 100% rename from platform/platform-api/src/com/intellij/concurrency/Job.java rename to platform/core-api/src/com/intellij/concurrency/Job.java diff --git a/platform/core-api/src/com/intellij/concurrency/JobLauncher.java b/platform/core-api/src/com/intellij/concurrency/JobLauncher.java new file mode 100644 index 000000000000..844fd8cbe69d --- /dev/null +++ b/platform/core-api/src/com/intellij/concurrency/JobLauncher.java @@ -0,0 +1,54 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.concurrency; + +import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.progress.ProcessCanceledException; +import com.intellij.openapi.progress.ProgressIndicator; +import com.intellij.util.Consumer; +import com.intellij.util.Processor; +import org.jetbrains.annotations.NotNull; + +import java.util.List; +import java.util.concurrent.Future; + +public abstract class JobLauncher { + public static JobLauncher getInstance() { + return ServiceManager.getService(JobLauncher.class); + } + + /** + * Schedules concurrent execution of #thingProcessor over each element of #things and waits for completion + * With checkCanceled in each thread delegated to our current progress + * + * @param things to process concurrently + * @param progress + * @param failFastOnAcquireReadAction if true, returns false when failed to acquire read action + * @param thingProcessor to be invoked concurrently on each element from the collection + * @return false if tasks have been canceled + * or at least one processor returned false + * or threw exception + * or we were unable to start read action in at least one thread + * @throws ProcessCanceledException if at least one task has thrown ProcessCanceledException + */ + public abstract boolean invokeConcurrentlyUnderProgress(@NotNull List things, + ProgressIndicator progress, + boolean failFastOnAcquireReadAction, + @NotNull final Processor thingProcessor) throws ProcessCanceledException; + + public abstract Job submitToJobThread(int priority, @NotNull final Runnable action); + public abstract Job submitToJobThread(int priority, @NotNull final Runnable action, Consumer onDoneCallback); +} diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java index 6d67b1976d28..45b641db1d89 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java @@ -24,7 +24,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.HighlightInfoHolder; import com.intellij.codeInsight.daemon.impl.analysis.HighlightLevelUtil; import com.intellij.codeInsight.problems.ProblemImpl; import com.intellij.codeInsight.problems.WolfTheProblemSolverImpl; -import com.intellij.concurrency.JobUtil; +import com.intellij.concurrency.JobLauncher; import com.intellij.injected.editor.DocumentWindow; import com.intellij.lang.Language; import com.intellij.lang.annotation.HighlightSeverity; @@ -319,14 +319,14 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP } } }; - if (!JobUtil.invokeConcurrentlyUnderProgress(new ArrayList(hosts), progress, false, new Processor() { - @Override - public boolean process(PsiElement element) { - progress.checkCanceled(); - InjectedLanguageUtil.enumerate(element, myFile, false, visitor); - return true; - } - })) throw new ProcessCanceledException(); + if (!JobLauncher.getInstance().invokeConcurrentlyUnderProgress(new ArrayList(hosts), progress, false, new Processor() { + @Override + public boolean process(PsiElement element) { + progress.checkCanceled(); + InjectedLanguageUtil.enumerate(element, myFile, false, visitor); + return true; + } + })) throw new ProcessCanceledException(); } // returns false if canceled @@ -337,59 +337,76 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP final InjectedLanguageManager injectedLanguageManager = InjectedLanguageManager.getInstance(myProject); final TextAttributes injectedAttributes = myGlobalScheme.getAttributes(EditorColors.INJECTED_LANGUAGE_FRAGMENT); - return JobUtil.invokeConcurrentlyUnderProgress(new ArrayList(injectedFiles), progress, myFailFastOnAcquireReadAction, new Processor() { - @Override - public boolean process(final PsiFile injectedPsi) { - DocumentWindow documentWindow = (DocumentWindow)PsiDocumentManager.getInstance(myProject).getCachedDocument(injectedPsi); - if (documentWindow == null) return true; - Place places = InjectedLanguageUtil.getShreds(injectedPsi); - for (PsiLanguageInjectionHost.Shred place : places) { - TextRange textRange = place.getRangeInsideHost().shiftRight(place.getHost().getTextRange().getStartOffset()); - if (textRange.isEmpty()) continue; - String desc = injectedPsi.getLanguage().getDisplayName() + ": " + injectedPsi.getText(); - HighlightInfo info = HighlightInfo.createHighlightInfo(HighlightInfoType.INJECTED_LANGUAGE_BACKGROUND, textRange, null, desc, injectedAttributes); - info.fromInjection = true; - outInfos.add(info); - } + return JobLauncher.getInstance().invokeConcurrentlyUnderProgress(new ArrayList(injectedFiles), progress, myFailFastOnAcquireReadAction, + new Processor() { + @Override + public boolean process(final PsiFile injectedPsi) { + DocumentWindow documentWindow = + (DocumentWindow)PsiDocumentManager.getInstance(myProject) + .getCachedDocument(injectedPsi); + if (documentWindow == null) return true; + Place places = InjectedLanguageUtil.getShreds(injectedPsi); + for (PsiLanguageInjectionHost.Shred place : places) { + TextRange textRange = place.getRangeInsideHost() + .shiftRight(place.getHost().getTextRange().getStartOffset()); + if (textRange.isEmpty()) continue; + String desc = + injectedPsi.getLanguage().getDisplayName() + ": " + injectedPsi.getText(); + HighlightInfo info = HighlightInfo + .createHighlightInfo(HighlightInfoType.INJECTED_LANGUAGE_BACKGROUND, + textRange, null, desc, injectedAttributes); + info.fromInjection = true; + outInfos.add(info); + } - HighlightInfoHolder holder = createInfoHolder(injectedPsi); - runHighlightVisitorsForInjected(injectedPsi, holder, progress); - for (int i = 0; i < holder.size(); i++) { - HighlightInfo info = holder.get(i); - final int startOffset = documentWindow.injectedToHost(info.startOffset); - final TextRange fixedTextRange = getFixedTextRange(documentWindow, startOffset); - addPatchedInfos(info, injectedPsi, documentWindow, injectedLanguageManager, fixedTextRange, outInfos); - } - holder.clear(); - highlightInjectedSyntax(injectedPsi, holder); - for (int i = 0; i < holder.size(); i++) { - HighlightInfo info = holder.get(i); - final int startOffset = info.startOffset; - final TextRange fixedTextRange = getFixedTextRange(documentWindow, startOffset); - if (fixedTextRange == null) { - info.fromInjection = true; - outInfos.add(info); - } - else { - HighlightInfo patched = - new HighlightInfo(info.forcedTextAttributes, info.forcedTextAttributesKey, info.type, - fixedTextRange.getStartOffset(), fixedTextRange.getEndOffset(), - info.description, info.toolTip, info.type.getSeverity(null), info.isAfterEndOfLine, null, false); - patched.fromInjection = true; - outInfos.add(patched); - } - } + HighlightInfoHolder holder = createInfoHolder(injectedPsi); + runHighlightVisitorsForInjected(injectedPsi, holder, progress); + for (int i = 0; i < holder.size(); i++) { + HighlightInfo info = holder.get(i); + final int startOffset = documentWindow.injectedToHost(info.startOffset); + final TextRange fixedTextRange = + getFixedTextRange(documentWindow, startOffset); + addPatchedInfos(info, injectedPsi, documentWindow, injectedLanguageManager, + fixedTextRange, outInfos); + } + holder.clear(); + highlightInjectedSyntax(injectedPsi, holder); + for (int i = 0; i < holder.size(); i++) { + HighlightInfo info = holder.get(i); + final int startOffset = info.startOffset; + final TextRange fixedTextRange = + getFixedTextRange(documentWindow, startOffset); + if (fixedTextRange == null) { + info.fromInjection = true; + outInfos.add(info); + } + else { + HighlightInfo patched = + new HighlightInfo(info.forcedTextAttributes, info.forcedTextAttributesKey, + info.type, + fixedTextRange.getStartOffset(), + fixedTextRange.getEndOffset(), + info.description, info.toolTip, + info.type.getSeverity(null), info.isAfterEndOfLine, null, + false); + patched.fromInjection = true; + outInfos.add(patched); + } + } - if (!isDumbMode()) { - List todos = new ArrayList(); - highlightTodos(injectedPsi, injectedPsi.getText(), 0, injectedPsi.getTextLength(), progress, myPriorityRange, todos, todos); - for (HighlightInfo info : todos) { - addPatchedInfos(info, injectedPsi, documentWindow, injectedLanguageManager, null, outInfos); - } - } - return true; - } - }); + if (!isDumbMode()) { + List todos = new ArrayList(); + highlightTodos(injectedPsi, injectedPsi.getText(), 0, + injectedPsi.getTextLength(), progress, myPriorityRange, todos, + todos); + for (HighlightInfo info : todos) { + addPatchedInfos(info, injectedPsi, documentWindow, injectedLanguageManager, + null, outInfos); + } + } + return true; + } + }); } private static TextRange getFixedTextRange(@NotNull DocumentWindow documentWindow, int startOffset) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java index 52fb9139dc94..2ad985bda25a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java @@ -25,7 +25,7 @@ import com.intellij.codeInsight.intention.EmptyIntentionAction; import com.intellij.codeInspection.*; import com.intellij.codeInspection.ex.*; import com.intellij.codeInspection.ui.ProblemDescriptionNode; -import com.intellij.concurrency.JobUtil; +import com.intellij.concurrency.JobLauncher; import com.intellij.injected.editor.DocumentWindow; import com.intellij.lang.Language; import com.intellij.lang.annotation.HighlightSeverity; @@ -300,39 +300,44 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass final ArrayList init = new ArrayList(); List>> entries = new ArrayList>>(tools.entrySet()); - boolean result = JobUtil.invokeConcurrentlyUnderProgress(entries, indicator, myFailFastOnAcquireReadAction, new Processor>>() { - @Override - public boolean process(final Map.Entry> pair) { - indicator.checkCanceled(); + boolean result = JobLauncher.getInstance().invokeConcurrentlyUnderProgress(entries, indicator, myFailFastOnAcquireReadAction, + new Processor>>() { + @Override + public boolean process(final Map.Entry> pair) { + indicator.checkCanceled(); - ApplicationManager.getApplication().assertReadAccessAllowed(); - final LocalInspectionToolWrapper wrapper = pair.getKey(); - LocalInspectionTool tool = wrapper.getTool(); - final boolean[] applyIncrementally = {isOnTheFly}; - ProblemsHolder holder = new ProblemsHolder(iManager, myFile, isOnTheFly) { - @Override - public void registerProblem(@NotNull ProblemDescriptor descriptor) { - super.registerProblem(descriptor); - if (applyIncrementally[0]) { - addDescriptorIncrementally(descriptor, wrapper, indicator); - } - } - }; - Set languages = (Set)pair.getValue(); - PsiElementVisitor visitor = createVisitorAndAcceptElements(tool, holder, isOnTheFly, session, elements, languages); + ApplicationManager.getApplication().assertReadAccessAllowed(); + final LocalInspectionToolWrapper wrapper = pair.getKey(); + LocalInspectionTool tool = wrapper.getTool(); + final boolean[] applyIncrementally = {isOnTheFly}; + ProblemsHolder holder = + new ProblemsHolder(iManager, myFile, isOnTheFly) { + @Override + public void registerProblem(@NotNull ProblemDescriptor descriptor) { + super.registerProblem(descriptor); + if (applyIncrementally[0]) { + addDescriptorIncrementally(descriptor, wrapper, indicator); + } + } + }; + Set languages = (Set)pair.getValue(); + PsiElementVisitor visitor = + createVisitorAndAcceptElements(tool, holder, isOnTheFly, session, + elements, languages); - synchronized (init) { - init.add(new InspectionContext(wrapper, holder, visitor, languages)); - } - advanceProgress(1); + synchronized (init) { + init.add(new InspectionContext(wrapper, holder, visitor, languages)); + } + advanceProgress(1); - if (holder.hasResults()) { - appendDescriptors(myFile, holder.getResults(), wrapper); - } - applyIncrementally[0] = false; // do not apply incrementally outside visible range - return true; - } - }); + if (holder.hasResults()) { + appendDescriptors(myFile, holder.getResults(), wrapper); + } + applyIncrementally[0] = + false; // do not apply incrementally outside visible range + return true; + } + }); if (!result) throw new ProcessCanceledException(); inspectInjectedPsi(elements, isOnTheFly, indicator, iManager, true, checkDumbAwareness, wrappers); return init; @@ -381,7 +386,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass return true; } }; - boolean result = JobUtil.invokeConcurrentlyUnderProgress(init, indicator, myFailFastOnAcquireReadAction, processor); + boolean result = JobLauncher.getInstance().invokeConcurrentlyUnderProgress(init, indicator, myFailFastOnAcquireReadAction, processor); if (!result) { throw new ProcessCanceledException(); } @@ -416,13 +421,15 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass }); } if (injected.isEmpty()) return; - if (!JobUtil.invokeConcurrentlyUnderProgress(new ArrayList(injected), indicator, myFailFastOnAcquireReadAction, new Processor() { - @Override - public boolean process(final PsiFile injectedPsi) { - doInspectInjectedPsi(injectedPsi, onTheFly, indicator, iManager, inVisibleRange, wrappers, checkDumbAwareness); - return true; - } - })) throw new ProcessCanceledException(); + if (!JobLauncher.getInstance().invokeConcurrentlyUnderProgress(new ArrayList(injected), indicator, myFailFastOnAcquireReadAction, + new Processor() { + @Override + public boolean process(final PsiFile injectedPsi) { + doInspectInjectedPsi(injectedPsi, onTheFly, indicator, iManager, inVisibleRange, + wrappers, checkDumbAwareness); + return true; + } + })) throw new ProcessCanceledException(); } @Nullable diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java index 8a27bba247ab..eae3cd4269a0 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java @@ -20,7 +20,7 @@ import com.intellij.codeHighlighting.HighlightingPass; import com.intellij.codeHighlighting.TextEditorHighlightingPass; import com.intellij.concurrency.Job; import com.intellij.concurrency.JobImpl; -import com.intellij.concurrency.JobUtil; +import com.intellij.concurrency.JobLauncher; import com.intellij.injected.editor.EditorWindow; import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationManager; @@ -271,7 +271,7 @@ public abstract class PassExecutorService implements Disposable { private void submit(final ScheduledPass pass) { if (!pass.myUpdateProgress.isCanceled()) { - Job job = JobUtil.submitToJobThread(pass.myJobPriority, pass, new Consumer() { + Job job = JobLauncher.getInstance().submitToJobThread(pass.myJobPriority, pass, new Consumer() { @Override public void consume(Future future) { try { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java index 88e8ce92db32..24e619be216d 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java @@ -27,7 +27,7 @@ package com.intellij.codeInsight.highlighting; import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.hint.EditorFragmentComponent; import com.intellij.concurrency.Job; -import com.intellij.concurrency.JobUtil; +import com.intellij.concurrency.JobLauncher; import com.intellij.injected.editor.EditorWindow; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; @@ -109,7 +109,7 @@ public class BraceHighlightingHandler { final Project project = editor.getProject(); if (project == null) return; final int offset = editor.getCaretModel().getOffset(); - JobUtil.submitToJobThread(Job.DEFAULT_PRIORITY, new Runnable() { + JobLauncher.getInstance().submitToJobThread(Job.DEFAULT_PRIORITY, new Runnable() { public void run() { final PsiFile injected; try { @@ -132,7 +132,7 @@ public class BraceHighlightingHandler { }); throw e; } - ApplicationManager.getApplication().invokeLater(new DumbAwareRunnable(){ + ApplicationManager.getApplication().invokeLater(new DumbAwareRunnable() { public void run() { try { if (!isReallyDisposed(editor, project)) { diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java index 87e76ffe3409..9bfe60f7b633 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java @@ -25,7 +25,7 @@ import com.intellij.codeInspection.lang.GlobalInspectionContextExtension; import com.intellij.codeInspection.lang.InspectionExtensionsFactory; import com.intellij.codeInspection.reference.*; import com.intellij.codeInspection.ui.InspectionResultsView; -import com.intellij.concurrency.JobUtil; +import com.intellij.concurrency.JobLauncher; import com.intellij.lang.injection.InjectedLanguageManager; import com.intellij.notification.NotificationGroup; import com.intellij.openapi.actionSystem.ToggleAction; @@ -601,19 +601,19 @@ public class GlobalInspectionContextImpl extends UserDataHolderBase implements G } pass.doInspectInBatch((InspectionManagerEx)manager, lTools); - JobUtil.invokeConcurrentlyUnderProgress(globalSimpleTools, myProgressIndicator, false, new Processor() { - @Override - public boolean process(Tools tools) { - GlobalInspectionToolWrapper toolWrapper = (GlobalInspectionToolWrapper)tools.getTool(); - GlobalSimpleInspectionTool tool = (GlobalSimpleInspectionTool)toolWrapper.getTool(); - ProblemsHolder problemsHolder = new ProblemsHolder(manager, file, false); - GlobalInspectionToolWrapper problemDescriptionProcessor = getProblemDescriptionProcessor(toolWrapper, map); - tool.checkFile(file, manager, problemsHolder, GlobalInspectionContextImpl.this, problemDescriptionProcessor); - LocalInspectionToolWrapper.addProblemDescriptors(problemsHolder.getResults(), false, GlobalInspectionContextImpl.this, null, - CONVERT, toolWrapper); - return true; - } - }); + JobLauncher.getInstance().invokeConcurrentlyUnderProgress(globalSimpleTools, myProgressIndicator, false, new Processor() { + @Override + public boolean process(Tools tools) { + GlobalInspectionToolWrapper toolWrapper = (GlobalInspectionToolWrapper)tools.getTool(); + GlobalSimpleInspectionTool tool = (GlobalSimpleInspectionTool)toolWrapper.getTool(); + ProblemsHolder problemsHolder = new ProblemsHolder(manager, file, false); + GlobalInspectionToolWrapper problemDescriptionProcessor = getProblemDescriptionProcessor(toolWrapper, map); + tool.checkFile(file, manager, problemsHolder, GlobalInspectionContextImpl.this, problemDescriptionProcessor); + LocalInspectionToolWrapper.addProblemDescriptors(problemsHolder.getResults(), false, GlobalInspectionContextImpl.this, null, + CONVERT, toolWrapper); + return true; + } + }); } catch (ProcessCanceledException e) { throw e; diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java index 01eda277a3cf..c205510199ac 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java @@ -15,7 +15,7 @@ */ package com.intellij.ide.util.gotoByName; -import com.intellij.concurrency.JobUtil; +import com.intellij.concurrency.JobLauncher; import com.intellij.diagnostic.PluginException; import com.intellij.ide.plugins.PluginManager; import com.intellij.ide.util.NavigationItemListCellRenderer; @@ -32,7 +32,6 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.Processor; import com.intellij.util.containers.ConcurrentHashSet; import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.ui.UIUtil; import javax.swing.*; import java.awt.*; @@ -66,26 +65,27 @@ public abstract class ContributorsBasedGotoByModel implements ChooseByNameModel public String[] getNames(final boolean checkBoxState) { final Set names = new ConcurrentHashSet(); - JobUtil.invokeConcurrentlyUnderProgress(filterDumb(myContributors), ProgressManager.getInstance().getProgressIndicator(), false, new Processor() { - @Override - public boolean process(ChooseByNameContributor contributor) { - try { - if (!myProject.isDisposed()) { - ContainerUtil.addAll(names, contributor.getNames(myProject, checkBoxState)); - } - } - catch (ProcessCanceledException ex) { - // index corruption detected, ignore - } - catch (IndexNotReadyException ex) { - // index corruption detected, ignore - } - catch (Exception ex) { - LOG.error(ex); - } - return true; - } - }); + JobLauncher.getInstance().invokeConcurrentlyUnderProgress(filterDumb(myContributors), ProgressManager.getInstance().getProgressIndicator(), false, + new Processor() { + @Override + public boolean process(ChooseByNameContributor contributor) { + try { + if (!myProject.isDisposed()) { + ContainerUtil.addAll(names, contributor.getNames(myProject, checkBoxState)); + } + } + catch (ProcessCanceledException ex) { + // index corruption detected, ignore + } + catch (IndexNotReadyException ex) { + // index corruption detected, ignore + } + catch (Exception ex) { + LOG.error(ex); + } + return true; + } + }); return ArrayUtil.toStringArray(names); } @@ -115,36 +115,40 @@ public abstract class ContributorsBasedGotoByModel implements ChooseByNameModel public Object[] getElementsByName(final String name, final boolean checkBoxState, final String pattern) { final List items = Collections.synchronizedList(new ArrayList()); - JobUtil.invokeConcurrentlyUnderProgress(filterDumb(myContributors), ProgressManager.getInstance().getProgressIndicator(), false, new Processor() { - @Override - public boolean process(ChooseByNameContributor contributor) { - try { - for (NavigationItem item : contributor.getItemsByName(name, pattern, myProject, checkBoxState)) { - if (item == null) { - final PluginId pluginId = PluginManager.getPluginByClassName(contributor.getClass().getName()); - if (pluginId != null) { - LOG.error(new PluginException("null item from contributor " + contributor + " for name " + name, pluginId)); - } - else { - LOG.error("null item from contributor " + contributor + " for name " + name); - } - continue; - } + JobLauncher.getInstance().invokeConcurrentlyUnderProgress(filterDumb(myContributors), ProgressManager.getInstance().getProgressIndicator(), false, + new Processor() { + @Override + public boolean process(ChooseByNameContributor contributor) { + try { + for (NavigationItem item : contributor + .getItemsByName(name, pattern, myProject, checkBoxState)) { + if (item == null) { + final PluginId pluginId = + PluginManager.getPluginByClassName(contributor.getClass().getName()); + if (pluginId != null) { + LOG.error(new PluginException( + "null item from contributor " + contributor + " for name " + name, pluginId)); + } + else { + LOG.error("null item from contributor " + contributor + " for name " + name); + } + continue; + } - if (acceptItem(item)) { - items.add(item); - } - } - } - catch (ProcessCanceledException ex) { - // index corruption detected, ignore - } - catch (Exception ex) { - LOG.error(ex); - } - return true; - } - }); + if (acceptItem(item)) { + items.add(item); + } + } + } + catch (ProcessCanceledException ex) { + // index corruption detected, ignore + } + catch (Exception ex) { + LOG.error(ex); + } + return true; + } + }); return ArrayUtil.toObjectArray(items); } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java index 7b2454f1bf2b..d217714f70fb 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java @@ -17,7 +17,7 @@ package com.intellij.psi.impl.search; import com.intellij.codeInsight.CommentUtil; -import com.intellij.concurrency.JobUtil; +import com.intellij.concurrency.JobLauncher; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.application.ReadActionProcessor; @@ -138,7 +138,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { PsiElement[] scopeElements = scope.getScope(); final boolean ignoreInjectedPsi = scope.isIgnoreInjectedPsi(); - return JobUtil.invokeConcurrentlyUnderProgress(Arrays.asList(scopeElements), progress, false, new Processor() { + return JobLauncher.getInstance().invokeConcurrentlyUnderProgress(Arrays.asList(scopeElements), progress, false, new Processor() { @Override public boolean process(PsiElement scopeElement) { return processElementsWithWordInScopeElement(scopeElement, processor, text, caseSensitively, ignoreInjectedPsi, progress); @@ -207,7 +207,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { final AtomicBoolean pceThrown = new AtomicBoolean(false); final int size = files.size(); - boolean completed = JobUtil.invokeConcurrentlyUnderProgress(files, progress, false, new Processor() { + boolean completed = JobLauncher.getInstance().invokeConcurrentlyUnderProgress(files, progress, false, new Processor() { @Override public boolean process(final VirtualFile vfile) { final PsiFile file = ApplicationManager.getApplication().runReadAction(new Computable() { @@ -228,7 +228,14 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { for (PsiElement psiRoot : psiRoots) { if (progress != null) progress.checkCanceled(); if (!processed.add(psiRoot)) continue; - assert psiRoot != null : "One of the roots of file "+file + " is null. All roots: "+Arrays.asList(psiRoots)+"; Viewprovider: "+file.getViewProvider()+"; Virtual file: "+file.getViewProvider().getVirtualFile(); + assert psiRoot != null : "One of the roots of file " + + file + + " is null. All roots: " + + Arrays.asList(psiRoots) + + "; Viewprovider: " + + file.getViewProvider() + + "; Virtual file: " + + file.getViewProvider().getVirtualFile(); if (!psiRootProcessor.process(psiRoot)) { canceled.set(true); return; diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java index 7aa201ea2521..4046517f7c0b 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java @@ -19,7 +19,7 @@ package com.intellij.psi.impl.source.tree.injected; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.codeInsight.daemon.impl.DaemonProgressIndicator; import com.intellij.concurrency.Job; -import com.intellij.concurrency.JobUtil; +import com.intellij.concurrency.JobLauncher; import com.intellij.injected.editor.DocumentWindow; import com.intellij.injected.editor.DocumentWindowImpl; import com.intellij.injected.editor.VirtualFileWindow; @@ -181,7 +181,7 @@ public class InjectedLanguageManagerImpl extends InjectedLanguageManager impleme @Override public void run() { if (myProgress.isCanceled()) return; - JobUtil.invokeConcurrentlyUnderProgress(new ArrayList(injected), myProgress, !synchronously, commitProcessor); + JobLauncher.getInstance().invokeConcurrentlyUnderProgress(new ArrayList(injected), myProgress, !synchronously, commitProcessor); } }; @@ -196,7 +196,7 @@ public class InjectedLanguageManagerImpl extends InjectedLanguageManager impleme } } else { - JobUtil.submitToJobThread(Job.DEFAULT_PRIORITY, new Runnable() { + JobLauncher.getInstance().submitToJobThread(Job.DEFAULT_PRIORITY, new Runnable() { @Override public void run() { ApplicationManagerEx.getApplicationEx().tryRunReadAction(commitInjectionsRunnable); diff --git a/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java b/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java index 7624d5bd6827..9dfb6f5b52a0 100644 --- a/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java +++ b/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java @@ -20,7 +20,7 @@ package com.intellij.ui; import com.intellij.concurrency.Job; -import com.intellij.concurrency.JobUtil; +import com.intellij.concurrency.JobLauncher; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.util.Ref; @@ -117,14 +117,15 @@ public class DeferredIconImpl implements DeferredIcon { paintingParentRec.set(((PaintingParent)pp).getChildRec(c)); } - JobUtil.submitToJobThread(Job.DEFAULT_PRIORITY, new Runnable() { + JobLauncher.getInstance().submitToJobThread(Job.DEFAULT_PRIORITY, new Runnable() { @Override public void run() { int oldWidth = myDelegateIcon.getIconWidth(); final Icon result = evaluate(); myDelegateIcon = result; - final boolean shouldRevalidate = Registry.is("ide.tree.deferredicon.invalidates.cache") && myDelegateIcon.getIconWidth() != oldWidth; + final boolean shouldRevalidate = + Registry.is("ide.tree.deferredicon.invalidates.cache") && myDelegateIcon.getIconWidth() != oldWidth; //noinspection SSBasedInspection SwingUtilities.invokeLater(new Runnable() { diff --git a/platform/platform-impl/src/com/intellij/concurrency/JobUtil.java b/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java similarity index 91% rename from platform/platform-impl/src/com/intellij/concurrency/JobUtil.java rename to platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java index eea654bf9d0e..b859dce5c97f 100644 --- a/platform/platform-impl/src/com/intellij/concurrency/JobUtil.java +++ b/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java @@ -34,13 +34,10 @@ import java.util.concurrent.Future; * @author cdr */ -public class JobUtil { - private static final Logger LOG = Logger.getInstance("#com.intellij.concurrency.JobUtil"); +public class JobLauncherImpl extends JobLauncher { + private static final Logger LOG = Logger.getInstance("#com.intellij.concurrency.JobLauncher"); - private JobUtil() { - } - - private static boolean invokeConcurrentlyForAll(@NotNull final List things, + private boolean invokeConcurrentlyForAll(@NotNull final List things, boolean failFastOnAcquireReadAction, @NotNull final Processor thingProcessor) throws ProcessCanceledException { final Job job = new JobImpl(Job.DEFAULT_PRIORITY, failFastOnAcquireReadAction); @@ -95,7 +92,8 @@ public class JobUtil { * or we were unable to start read action in at least one thread * @throws ProcessCanceledException if at least one task has thrown ProcessCanceledException */ - public static boolean invokeConcurrentlyUnderProgress(@NotNull List things, + @Override + public boolean invokeConcurrentlyUnderProgress(@NotNull List things, ProgressIndicator progress, boolean failFastOnAcquireReadAction, @NotNull final Processor thingProcessor) throws ProcessCanceledException { @@ -122,11 +120,13 @@ public class JobUtil { }); } - public static Job submitToJobThread(int priority, @NotNull final Runnable action) { + @Override + public Job submitToJobThread(int priority, @NotNull final Runnable action) { return submitToJobThread(priority, action, null); } - public static Job submitToJobThread(int priority, @NotNull final Runnable action, Consumer onDoneCallback) { + @Override + public Job submitToJobThread(int priority, @NotNull final Runnable action, Consumer onDoneCallback) { final JobImpl job = new JobImpl(priority, false); Callable callable = new Callable() { public Void call() throws Exception { diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml index 490d7b359ff7..3b6bb59d6ce7 100644 --- a/platform/platform-resources/src/META-INF/LangExtensions.xml +++ b/platform/platform-resources/src/META-INF/LangExtensions.xml @@ -15,6 +15,9 @@ + + diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java index 1b9a17ec35d4..85083d159205 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java @@ -15,7 +15,7 @@ */ package com.intellij.openapi.vfs; -import com.intellij.concurrency.JobUtil; +import com.intellij.concurrency.JobLauncher; import com.intellij.openapi.application.Result; import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.application.ex.PathManagerEx; @@ -146,18 +146,19 @@ public class VfsUtilTest extends PlatformLangTestCase { public void testAsyncRefresh() throws Throwable { final Throwable[] ex = {null}; - JobUtil.invokeConcurrentlyUnderProgress(Arrays.asList(new Object[8]), ProgressManager.getInstance().getProgressIndicator(), false, new Processor() { - @Override - public boolean process(Object o) { - try { - doAsyncRefreshTest(); - } - catch (Throwable t) { - ex[0] = t; - } - return true; - } - }); + JobLauncher.getInstance().invokeConcurrentlyUnderProgress(Arrays.asList(new Object[8]), ProgressManager.getInstance().getProgressIndicator(), false, + new Processor() { + @Override + public boolean process(Object o) { + try { + doAsyncRefreshTest(); + } + catch (Throwable t) { + ex[0] = t; + } + return true; + } + }); if (ex[0] != null) throw ex[0]; } diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java index 29bd793693db..8cecf5265a11 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java @@ -15,7 +15,7 @@ */ package com.intellij.openapi.vfs.impl; -import com.intellij.concurrency.JobUtil; +import com.intellij.concurrency.JobLauncher; import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ex.PathManagerEx; @@ -514,7 +514,7 @@ public class VirtualFilePointerTest extends PlatformLangTestCase { } private static void stressRead(@NotNull final VirtualFilePointer pointer) { - boolean b = JobUtil.invokeConcurrentlyUnderProgress(Collections.nCopies(10, null), null, false, new Processor() { + boolean b = JobLauncher.getInstance().invokeConcurrentlyUnderProgress(Collections.nCopies(10, null), null, false, new Processor() { @Override public boolean process(Object o) { ApplicationManager.getApplication().runReadAction(new Runnable() { diff --git a/plugins/properties/src/com/intellij/codeInspection/duplicatePropertyInspection/DuplicatePropertyInspection.java b/plugins/properties/src/com/intellij/codeInspection/duplicatePropertyInspection/DuplicatePropertyInspection.java index 866a2ffb6873..837383eb5480 100644 --- a/plugins/properties/src/com/intellij/codeInspection/duplicatePropertyInspection/DuplicatePropertyInspection.java +++ b/plugins/properties/src/com/intellij/codeInspection/duplicatePropertyInspection/DuplicatePropertyInspection.java @@ -18,7 +18,7 @@ package com.intellij.codeInspection.duplicatePropertyInspection; import com.intellij.codeInspection.*; import com.intellij.codeInspection.ex.GlobalInspectionContextImpl; import com.intellij.codeInspection.reference.RefManager; -import com.intellij.concurrency.JobUtil; +import com.intellij.concurrency.JobLauncher; import com.intellij.lang.properties.IProperty; import com.intellij.lang.properties.PropertiesBundle; import com.intellij.lang.properties.psi.PropertiesFile; @@ -162,7 +162,7 @@ public class DuplicatePropertyInspection extends GlobalSimpleInspectionTool { final ProgressIndicator progress = ProgressWrapper.wrap(original); ProgressManager.getInstance().runProcess(new Runnable() { public void run() { - if (!JobUtil.invokeConcurrentlyUnderProgress(properties, progress, false, new Processor() { + if (!JobLauncher.getInstance().invokeConcurrentlyUnderProgress(properties, progress, false, new Processor() { public boolean process(final IProperty property) { if (original != null) { if (original.isCanceled()) return false; From d81ff970e643b206fe00eb83f01d8fef6c9615e7 Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Wed, 13 Jun 2012 16:53:30 +0200 Subject: [PATCH 10/61] Move PsiSearchHelperImpl to "indexing-impl". Introduce components for supplementary stuff --- .../regexp/psi/impl/RegExpElementImpl.java | 4 +- .../test/test/BaseParseTestcase.java | 1 - .../impl/analysis/HighlightVisitorImpl.java | 4 +- .../psi/formatter/java/AbstractJavaBlock.java | 5 +- .../usages/impl/rules/ClassGroupingRule.java | 4 +- .../usages/impl/rules/MethodGroupingRule.java | 4 +- .../daemon/LightDaemonAnalyzerTestCase.java | 4 +- .../quickFix/LightQuickFixTestCase.java | 4 +- .../lang/CodeDocumentationAwareCommenter.java | 0 .../CodeDocumentationAwareCommenterEx.java | 0 .../src/com/intellij/lang/Commenter.java | 0 .../com/intellij/lang/LanguageCommenters.java | 0 .../application/BaseActionRunnable.java | 0 .../openapi/application/ReadAction.java | 2 +- .../intellij/openapi/application/Result.java | 2 +- .../openapi/application/RunResult.java | 2 +- .../psi/impl/InjectedLanguageFacade.java | 35 ++++ .../com/intellij/psi/impl/PsiManagerImpl.java | 2 +- .../psi/impl/cache/{impl => }/CacheUtil.java | 2 +- .../intellij/psi/impl/source/PsiFileImpl.java | 2 +- .../util/codeInsight/CommentUtilCore.java | 46 +++++ .../psi/impl/search/LowLevelSearchUtil.java | 6 +- .../psi/impl/search/PsiSearchHelperImpl.java | 29 +-- .../intellij/psi/search/UseScopeEnlarger.java | 2 +- .../intellij/ide/actions/ElementCreator.java | 1 - .../codeInsight/AutoPopupController.java | 4 +- .../com/intellij/codeInsight/CommentUtil.java | 30 +--- .../actions/BaseCodeInsightAction.java | 4 +- .../completion/CodeCompletionHandlerBase.java | 15 +- .../impl/CompletionServiceImpl.java | 4 +- .../daemon/impl/CodeFoldingPass.java | 4 +- .../daemon/impl/GeneralHighlightingPass.java | 170 ++++++++++-------- .../impl/IdentifierHighlighterPass.java | 4 +- .../daemon/impl/LineMarkersPass.java | 4 +- .../daemon/impl/LocalInspectionsPass.java | 98 +++++----- .../daemon/impl/quickfix/QuickFixAction.java | 6 +- .../documentation/DockablePopupManager.java | 4 +- .../CompletionAutoPopupHandler.java | 8 +- .../editorActions/SelectWordHandler.java | 4 +- .../editorActions/TypedHandler.java | 6 +- .../folding/impl/FoldingUpdate.java | 6 +- .../impl/OffsetsElementSignatureProvider.java | 4 +- .../actions/CommentByLineCommentAction.java | 2 - .../BraceHighlightingHandler.java | 6 +- .../highlighting/HighlightManagerImpl.java | 4 +- .../intention/impl/IntentionListStep.java | 6 +- .../intention/impl/QuickEditAction.java | 4 +- .../intention/impl/QuickEditHandler.java | 4 +- .../impl/ShowIntentionActionsHandler.java | 8 +- .../codeInsight/lookup/LookupManager.java | 4 +- .../navigation/CtrlMouseHandler.java | 4 +- .../template/CustomTemplateCallback.java | 8 +- .../template/TemplateBuilderImpl.java | 4 +- .../ex/ProblemDescriptorImpl.java | 4 +- .../PsiElement2UsageTargetAdapter.java | 4 +- .../intellij/ide/todo/nodes/TodoFileNode.java | 6 +- .../injected/editor/EditorWindow.java | 4 +- .../internal/psiView/PsiViewerDialog.java | 13 +- .../internal/psiView/ViewerTreeStructure.java | 4 +- .../impl/PsiAwareFileEditorManagerImpl.java | 4 +- .../impl/text/TextEditorPsiDataProvider.java | 4 +- .../FormattingDocumentModelImpl.java | 4 +- .../formatter/PsiBasedFormattingModel.java | 4 +- .../common/InjectedLanguageBlockBuilder.java | 4 +- .../impl/id/PlatformIdTableBuilding.java | 2 +- .../InjectedSelfElementInfo.java | 6 +- .../SmartPointerManagerImpl.java | 8 +- .../source/PostprocessReformattingAspect.java | 4 +- .../source/codeStyle/CodeFormatterFacade.java | 6 +- .../codeStyle/CodeStyleManagerImpl.java | 6 +- .../codeStyle/CodeStyleManagerRunnable.java | 6 +- .../impl/providers/FileReferenceSet.java | 4 +- .../injected/InjectedFileViewProvider.java | 4 +- ...l.java => InjectedLanguageFacadeImpl.java} | 6 +- .../injected/InjectedLanguageManagerImpl.java | 13 +- .../tree/injected/MultiHostRegistrarImpl.java | 6 +- .../move/FileReferenceContextUtil.java | 8 +- .../rename/PsiElementRenameHandler.java | 6 +- .../rename/inplace/InplaceRefactoring.java | 12 +- .../inplace/MemberInplaceRenameHandler.java | 4 +- .../rename/inplace/MemberInplaceRenamer.java | 6 +- .../rename/inplace/MyLookupExpression.java | 4 +- .../inplace/VariableInplaceRenamer.java | 6 +- .../src/META-INF/LangExtensions.xml | 2 + .../LightPlatformCodeInsightTestCase.java | 8 +- .../impl/CodeInsightTestFixtureImpl.java | 4 +- .../inject/EditInjectionSettingsAction.java | 6 +- .../inject/InjectLanguageAction.java | 4 +- .../inject/UnInjectLanguageAction.java | 8 +- .../CommentOnLineWithSourcePredicate.java | 4 +- .../jetbrains/android/AndroidRenameTest.java | 4 +- .../completion/InjectedGroovyTest.groovy | 10 +- .../i18n/SuppressByCommentOutAction.java | 4 +- .../spellchecker/quickfixes/RenameTo.java | 4 +- .../spellchecker/tokenizer/TokenizerBase.java | 4 +- .../tokenizer/XmlTextTokenizer.java | 4 +- .../lang/xpath/psi/impl/XPathElementImpl.java | 4 +- .../intellij/lang/xpath/xslt/XsltSupport.java | 4 +- .../xpath/xslt/util/XsltCodeInsightUtil.java | 6 +- .../xslt/validation/XsltXmlAnnotator.java | 4 +- .../lang/xpath/xslt/Xslt2RefactoringTest.java | 6 +- .../impl/GenericValueReferenceProvider.java | 6 +- .../xml/AbstractDomDeclarationSearcher.java | 6 +- .../editorActions/XmlAutoPopupHandler.java | 4 +- .../editorActions/moveUpDown/XmlMover.java | 6 +- .../cache/impl/idCache/XHtmlFilterLexer.java | 2 +- .../psi/impl/source/xml/XmlTextImpl.java | 6 +- .../src/com/intellij/xml/util/HtmlUtil.java | 6 +- 108 files changed, 487 insertions(+), 401 deletions(-) rename platform/{lang-api => core-api}/src/com/intellij/lang/CodeDocumentationAwareCommenter.java (100%) rename platform/{lang-api => core-api}/src/com/intellij/lang/CodeDocumentationAwareCommenterEx.java (100%) rename platform/{platform-api => core-api}/src/com/intellij/lang/Commenter.java (100%) rename platform/{lang-api => core-api}/src/com/intellij/lang/LanguageCommenters.java (100%) rename platform/{platform-api => core-api}/src/com/intellij/openapi/application/BaseActionRunnable.java (100%) rename platform/{platform-api => core-api}/src/com/intellij/openapi/application/ReadAction.java (96%) rename platform/{platform-api => core-api}/src/com/intellij/openapi/application/Result.java (94%) rename platform/{platform-api => core-api}/src/com/intellij/openapi/application/RunResult.java (98%) create mode 100644 platform/core-impl/src/com/intellij/psi/impl/InjectedLanguageFacade.java rename platform/core-impl/src/com/intellij/psi/impl/cache/{impl => }/CacheUtil.java (98%) create mode 100644 platform/core-impl/src/com/intellij/util/codeInsight/CommentUtilCore.java rename platform/{lang-impl => indexing-impl}/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java (97%) rename platform/{lang-impl => indexing-impl}/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java (95%) rename platform/{lang-impl => indexing-impl}/src/com/intellij/psi/search/UseScopeEnlarger.java (96%) rename platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/{InjectedLanguageUtil.java => InjectedLanguageFacadeImpl.java} (98%) diff --git a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpElementImpl.java b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpElementImpl.java index f0befa3c0287..dbc64d0382de 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpElementImpl.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpElementImpl.java @@ -23,7 +23,7 @@ import com.intellij.lang.ParserDefinition; import com.intellij.lang.injection.InjectedLanguageManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.tree.IElementType; import com.intellij.util.IncorrectOperationException; import org.intellij.lang.regexp.RegExpLanguage; @@ -76,7 +76,7 @@ public abstract class RegExpElementImpl extends ASTWrapperPsiElement implements } public final String getUnescapedText() { - if (InjectedLanguageUtil.isInInjectedLanguagePrefixSuffix(this)) { + if (InjectedLanguageFacadeImpl.isInInjectedLanguagePrefixSuffix(this)) { // do not attempt to decode text if PsiElement is part of prefix/suffix return getText(); } diff --git a/RegExpSupport/test/test/BaseParseTestcase.java b/RegExpSupport/test/test/BaseParseTestcase.java index e6cb0fc0d726..efb7b4188d6a 100644 --- a/RegExpSupport/test/test/BaseParseTestcase.java +++ b/RegExpSupport/test/test/BaseParseTestcase.java @@ -26,7 +26,6 @@ import com.intellij.testFramework.fixtures.CodeInsightTestFixture; import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory; import com.intellij.testFramework.fixtures.TestFixtureBuilder; -import junit.framework.TestCase; import org.intellij.lang.regexp.RegExpFileType; import java.io.File; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java index 00021004bb24..4515b75d36a6 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java @@ -34,7 +34,7 @@ import com.intellij.psi.*; import com.intellij.psi.controlFlow.ControlFlowUtil; import com.intellij.psi.impl.source.javadoc.PsiDocMethodOrFieldRef; import com.intellij.psi.impl.source.jsp.jspJava.JspClass; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.javadoc.PsiDocComment; import com.intellij.psi.javadoc.PsiDocTagValue; import com.intellij.psi.util.MethodSignatureBackedByPsiMethod; @@ -106,7 +106,7 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh } private void registerReferencesFromInjectedFragments(final PsiElement element) { - InjectedLanguageUtil.enumerate(element, myFile, false, new PsiLanguageInjectionHost.InjectedPsiVisitor() { + InjectedLanguageFacadeImpl.enumerate(element, myFile, false, new PsiLanguageInjectionHost.InjectedPsiVisitor() { @Override public void visit(@NotNull final PsiFile injectedPsi, @NotNull final List places) { injectedPsi.accept(REGISTER_REFERENCES_VISITOR); diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java index de4191afcd9a..dd93897539f0 100644 --- a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java +++ b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java @@ -34,7 +34,7 @@ import com.intellij.psi.formatter.java.wrap.ReservedWrapsProvider; import com.intellij.psi.impl.source.SourceTreeToPsiMap; import com.intellij.psi.impl.source.codeStyle.ShiftIndentInsideHelper; import com.intellij.psi.impl.source.tree.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.impl.source.tree.java.ClassElement; import com.intellij.psi.jsp.JspElementType; import com.intellij.psi.tree.IElementType; @@ -172,7 +172,8 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo if (isStatement(child, child.getTreeParent())) { return new CodeBlockBlock(child, wrap, alignment, actualIndent, settings); } - if (child instanceof PsiComment && child instanceof PsiLanguageInjectionHost && InjectedLanguageUtil.hasInjections((PsiLanguageInjectionHost)child)) { + if (child instanceof PsiComment && child instanceof PsiLanguageInjectionHost && InjectedLanguageFacadeImpl + .hasInjections((PsiLanguageInjectionHost)child)) { return new CommentWithInjectionBlock(child, wrap, alignment, indent, settings); } if (child instanceof LeafElement) { diff --git a/java/java-impl/src/com/intellij/usages/impl/rules/ClassGroupingRule.java b/java/java-impl/src/com/intellij/usages/impl/rules/ClassGroupingRule.java index 8b40b441006b..23c07d65a139 100644 --- a/java/java-impl/src/com/intellij/usages/impl/rules/ClassGroupingRule.java +++ b/java/java-impl/src/com/intellij/usages/impl/rules/ClassGroupingRule.java @@ -25,7 +25,7 @@ import com.intellij.openapi.util.Iconable; import com.intellij.openapi.vcs.FileStatus; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.jsp.JspFile; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.usageView.UsageInfo; @@ -48,7 +48,7 @@ public class ClassGroupingRule implements UsageGroupingRule { } final PsiElement psiElement = ((PsiElementUsage)usage).getElement(); final PsiFile containingFile = psiElement.getContainingFile(); - PsiFile topLevelFile = InjectedLanguageUtil.getTopLevelFile(containingFile); + PsiFile topLevelFile = InjectedLanguageFacadeImpl.getTopLevelFile(containingFile); if (!(topLevelFile instanceof PsiJavaFile) || topLevelFile instanceof JspFile) { return null; diff --git a/java/java-impl/src/com/intellij/usages/impl/rules/MethodGroupingRule.java b/java/java-impl/src/com/intellij/usages/impl/rules/MethodGroupingRule.java index ec3e39f92939..c82180d92721 100644 --- a/java/java-impl/src/com/intellij/usages/impl/rules/MethodGroupingRule.java +++ b/java/java-impl/src/com/intellij/usages/impl/rules/MethodGroupingRule.java @@ -28,7 +28,7 @@ import com.intellij.openapi.util.Iconable; import com.intellij.openapi.util.Segment; import com.intellij.openapi.vcs.FileStatus; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.util.PsiFormatUtil; import com.intellij.psi.util.PsiFormatUtilBase; import com.intellij.psi.util.PsiTreeUtil; @@ -51,7 +51,7 @@ public class MethodGroupingRule implements UsageGroupingRule { if (!(usage instanceof PsiElementUsage)) return null; PsiElement psiElement = ((PsiElementUsage)usage).getElement(); PsiFile containingFile = psiElement.getContainingFile(); - PsiFile topLevelFile = InjectedLanguageUtil.getTopLevelFile(containingFile); + PsiFile topLevelFile = InjectedLanguageFacadeImpl.getTopLevelFile(containingFile); if (topLevelFile instanceof PsiJavaFile) { PsiElement containingMethod = topLevelFile == containingFile ? psiElement : InjectedLanguageManager .getInstance(containingFile.getProject()).getInjectionHost(containingFile); diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java index 357134d2a19d..e085ce9f8687 100644 --- a/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java @@ -25,7 +25,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.vfs.VirtualFileFilter; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.testFramework.ExpectedHighlightingData; import com.intellij.testFramework.FileTreeAccessFilter; import com.intellij.testFramework.HighlightTestInfo; @@ -144,7 +144,7 @@ public abstract class LightDaemonAnalyzerTestCase extends LightCodeInsightTestCa PsiFile file = getFile(); if (editor instanceof EditorWindow) { editor = ((EditorWindow)editor).getDelegate(); - file = InjectedLanguageUtil.getTopLevelFile(file); + file = InjectedLanguageFacadeImpl.getTopLevelFile(file); } return CodeInsightTestFixtureImpl.instantiateAndRun(file, editor, toIgnore, false); diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java index 155c3110e9cf..86331a0dcfd3 100644 --- a/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java @@ -29,7 +29,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.psi.PsiFile; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl; import com.intellij.util.IncorrectOperationException; @@ -107,7 +107,7 @@ public abstract class LightQuickFixTestCase extends LightDaemonAnalyzerTestCase } public static Pair parseActionHint(final PsiFile file, String contents, @NonNls @RegExp String actionPattern) { - PsiFile hostFile = InjectedLanguageUtil.getTopLevelFile(file); + PsiFile hostFile = InjectedLanguageFacadeImpl.getTopLevelFile(file); final Commenter commenter = LanguageCommenters.INSTANCE.forLanguage(hostFile.getLanguage()); String comment = commenter.getLineCommentPrefix(); diff --git a/platform/lang-api/src/com/intellij/lang/CodeDocumentationAwareCommenter.java b/platform/core-api/src/com/intellij/lang/CodeDocumentationAwareCommenter.java similarity index 100% rename from platform/lang-api/src/com/intellij/lang/CodeDocumentationAwareCommenter.java rename to platform/core-api/src/com/intellij/lang/CodeDocumentationAwareCommenter.java diff --git a/platform/lang-api/src/com/intellij/lang/CodeDocumentationAwareCommenterEx.java b/platform/core-api/src/com/intellij/lang/CodeDocumentationAwareCommenterEx.java similarity index 100% rename from platform/lang-api/src/com/intellij/lang/CodeDocumentationAwareCommenterEx.java rename to platform/core-api/src/com/intellij/lang/CodeDocumentationAwareCommenterEx.java diff --git a/platform/platform-api/src/com/intellij/lang/Commenter.java b/platform/core-api/src/com/intellij/lang/Commenter.java similarity index 100% rename from platform/platform-api/src/com/intellij/lang/Commenter.java rename to platform/core-api/src/com/intellij/lang/Commenter.java diff --git a/platform/lang-api/src/com/intellij/lang/LanguageCommenters.java b/platform/core-api/src/com/intellij/lang/LanguageCommenters.java similarity index 100% rename from platform/lang-api/src/com/intellij/lang/LanguageCommenters.java rename to platform/core-api/src/com/intellij/lang/LanguageCommenters.java diff --git a/platform/platform-api/src/com/intellij/openapi/application/BaseActionRunnable.java b/platform/core-api/src/com/intellij/openapi/application/BaseActionRunnable.java similarity index 100% rename from platform/platform-api/src/com/intellij/openapi/application/BaseActionRunnable.java rename to platform/core-api/src/com/intellij/openapi/application/BaseActionRunnable.java diff --git a/platform/platform-api/src/com/intellij/openapi/application/ReadAction.java b/platform/core-api/src/com/intellij/openapi/application/ReadAction.java similarity index 96% rename from platform/platform-api/src/com/intellij/openapi/application/ReadAction.java rename to platform/core-api/src/com/intellij/openapi/application/ReadAction.java index 9741e409d130..9c1b26affcbe 100644 --- a/platform/platform-api/src/com/intellij/openapi/application/ReadAction.java +++ b/platform/core-api/src/com/intellij/openapi/application/ReadAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/platform-api/src/com/intellij/openapi/application/Result.java b/platform/core-api/src/com/intellij/openapi/application/Result.java similarity index 94% rename from platform/platform-api/src/com/intellij/openapi/application/Result.java rename to platform/core-api/src/com/intellij/openapi/application/Result.java index f48ec1894695..8693d83234d1 100644 --- a/platform/platform-api/src/com/intellij/openapi/application/Result.java +++ b/platform/core-api/src/com/intellij/openapi/application/Result.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/platform-api/src/com/intellij/openapi/application/RunResult.java b/platform/core-api/src/com/intellij/openapi/application/RunResult.java similarity index 98% rename from platform/platform-api/src/com/intellij/openapi/application/RunResult.java rename to platform/core-api/src/com/intellij/openapi/application/RunResult.java index 5129c54a2fd0..8ff9327e9cff 100644 --- a/platform/platform-api/src/com/intellij/openapi/application/RunResult.java +++ b/platform/core-api/src/com/intellij/openapi/application/RunResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/core-impl/src/com/intellij/psi/impl/InjectedLanguageFacade.java b/platform/core-impl/src/com/intellij/psi/impl/InjectedLanguageFacade.java new file mode 100644 index 000000000000..bbec2bc0bb85 --- /dev/null +++ b/platform/core-impl/src/com/intellij/psi/impl/InjectedLanguageFacade.java @@ -0,0 +1,35 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.psi.impl; + +import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.util.Pair; +import com.intellij.openapi.util.TextRange; +import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +public abstract class InjectedLanguageFacade { + public static InjectedLanguageFacade getInstance() { + return ServiceManager.getService(InjectedLanguageFacade.class); + } + + @Nullable + public abstract List> getInjectedPsiFiles(@NotNull PsiElement host); + +} diff --git a/platform/core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java b/platform/core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java index f3a3f3655de8..cc962e206302 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java +++ b/platform/core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java @@ -31,7 +31,7 @@ import com.intellij.openapi.util.Key; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileFilter; import com.intellij.psi.*; -import com.intellij.psi.impl.cache.impl.CacheUtil; +import com.intellij.psi.impl.cache.CacheUtil; import com.intellij.psi.impl.file.impl.FileManager; import com.intellij.psi.impl.file.impl.FileManagerImpl; import com.intellij.psi.impl.source.PsiFileImpl; diff --git a/platform/core-impl/src/com/intellij/psi/impl/cache/impl/CacheUtil.java b/platform/core-impl/src/com/intellij/psi/impl/cache/CacheUtil.java similarity index 98% rename from platform/core-impl/src/com/intellij/psi/impl/cache/impl/CacheUtil.java rename to platform/core-impl/src/com/intellij/psi/impl/cache/CacheUtil.java index f698b9a0b3fe..69afa59adbc9 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/cache/impl/CacheUtil.java +++ b/platform/core-impl/src/com/intellij/psi/impl/cache/CacheUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intellij.psi.impl.cache.impl; +package com.intellij.psi.impl.cache; import com.intellij.ide.caches.FileContent; import com.intellij.lang.Language; diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java index 5ba93fd8b982..57fb0f2ccb91 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java @@ -39,7 +39,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileWithId; import com.intellij.psi.*; import com.intellij.psi.impl.*; -import com.intellij.psi.impl.cache.impl.CacheUtil; +import com.intellij.psi.impl.cache.CacheUtil; import com.intellij.psi.impl.file.PsiFileImplUtil; import com.intellij.psi.impl.source.codeStyle.CodeEditUtil; import com.intellij.psi.impl.source.resolve.FileContextUtil; diff --git a/platform/core-impl/src/com/intellij/util/codeInsight/CommentUtilCore.java b/platform/core-impl/src/com/intellij/util/codeInsight/CommentUtilCore.java new file mode 100644 index 000000000000..887d49c852e7 --- /dev/null +++ b/platform/core-impl/src/com/intellij/util/codeInsight/CommentUtilCore.java @@ -0,0 +1,46 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.util.codeInsight; + +import com.intellij.lang.*; +import com.intellij.psi.PsiComment; +import com.intellij.psi.PsiElement; +import com.intellij.psi.tree.IElementType; +import org.jetbrains.annotations.Nullable; + +public class CommentUtilCore { + public static boolean isComment(@Nullable final PsiElement element) { + return element != null && isComment(element.getNode()); + } + + public static boolean isComment(@Nullable final ASTNode node) { + if (node == null) return false; + final IElementType type = node.getElementType(); + final ParserDefinition parserDefinition = LanguageParserDefinitions.INSTANCE.forLanguage(type.getLanguage()); + return parserDefinition != null && parserDefinition.getCommentTokens().contains(type); + } + + public static boolean isCommentTextElement(final PsiElement element) { + final Commenter commenter = LanguageCommenters.INSTANCE.forLanguage(element.getLanguage()); + if (commenter instanceof CodeDocumentationAwareCommenterEx) { + final CodeDocumentationAwareCommenterEx commenterEx = (CodeDocumentationAwareCommenterEx)commenter; + if (commenterEx.isDocumentationCommentText(element)) return true; + if (element instanceof PsiComment && commenterEx.isDocumentationComment((PsiComment)element)) return false; + } + + return isComment(element); + } +} diff --git a/platform/lang-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java similarity index 97% rename from platform/lang-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java rename to platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java index 3737b39d28c0..bf0f4ba81f26 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,9 +24,9 @@ import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiLanguageInjectionHost; +import com.intellij.psi.impl.InjectedLanguageFacade; import com.intellij.psi.impl.source.tree.LeafElement; import com.intellij.psi.impl.source.tree.TreeElement; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; import com.intellij.psi.search.TextOccurenceProcessor; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.text.CharArrayUtil; @@ -49,7 +49,7 @@ public class LowLevelSearchUtil { final StringSearcher searcher, ProgressIndicator progress) { if (!(element instanceof PsiLanguageInjectionHost)) return null; - List> list = InjectedLanguageUtil.getInjectedPsiFiles(element); + List> list = InjectedLanguageFacade.getInstance().getInjectedPsiFiles(element); if (list == null) return null; for (Pair pair : list) { final PsiElement injected = pair.getFirst(); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java similarity index 95% rename from platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java rename to platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java index d217714f70fb..102d132e8193 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java @@ -16,7 +16,6 @@ package com.intellij.psi.impl.search; -import com.intellij.codeInsight.CommentUtil; import com.intellij.concurrency.JobLauncher; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; @@ -25,7 +24,7 @@ import com.intellij.openapi.application.Result; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; -import com.intellij.openapi.progress.ProgressManager; +import com.intellij.openapi.progress.ProgressIndicatorProvider; import com.intellij.openapi.roots.FileIndexFacade; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Condition; @@ -43,6 +42,7 @@ import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.CommonProcessors; import com.intellij.util.Processor; import com.intellij.util.SmartList; +import com.intellij.util.codeInsight.CommentUtilCore; import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; @@ -104,7 +104,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { TextOccurenceProcessor occurrenceProcessor = new TextOccurenceProcessor() { @Override public boolean execute(PsiElement element, int offsetInElement) { - if (CommentUtil.isCommentTextElement(element)) { + if (CommentUtilCore.isCommentTextElement(element)) { if (element.findReferenceAt(offsetInElement) == null) { return processor.process(element); } @@ -124,7 +124,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { if (text.length() == 0) { throw new IllegalArgumentException("Cannot search for elements with empty text"); } - final ProgressIndicator progress = ProgressManager.getInstance().getProgressIndicator(); + final ProgressIndicator progress = ProgressIndicatorProvider.getInstance().getProgressIndicator(); if (searchScope instanceof GlobalSearchScope) { StringSearcher searcher = new StringSearcher(text, caseSensitively, true); @@ -138,12 +138,17 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { PsiElement[] scopeElements = scope.getScope(); final boolean ignoreInjectedPsi = scope.isIgnoreInjectedPsi(); - return JobLauncher.getInstance().invokeConcurrentlyUnderProgress(Arrays.asList(scopeElements), progress, false, new Processor() { - @Override - public boolean process(PsiElement scopeElement) { - return processElementsWithWordInScopeElement(scopeElement, processor, text, caseSensitively, ignoreInjectedPsi, progress); - } - }); + return JobLauncher.getInstance().invokeConcurrentlyUnderProgress(Arrays.asList(scopeElements), progress, false, + new Processor() { + @Override + public boolean process(PsiElement scopeElement) { + return processElementsWithWordInScopeElement(scopeElement, + processor, text, + caseSensitively, + ignoreInjectedPsi, + progress); + } + }); } } @@ -343,7 +348,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { if (qName.length() == 0) { throw new IllegalArgumentException("Cannot search for elements with empty text"); } - final ProgressIndicator progress = ProgressManager.getInstance().getProgressIndicator(); + final ProgressIndicator progress = ProgressIndicatorProvider.getInstance().getProgressIndicator(); int dotIndex = qName.lastIndexOf('.'); int dollarIndex = qName.lastIndexOf('$'); @@ -472,7 +477,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { appendCollectorsFromQueryRequests(collectors); - ProgressIndicator progress = ProgressManager.getInstance().getProgressIndicator(); + ProgressIndicator progress = ProgressIndicatorProvider.getInstance().getProgressIndicator(); do { final MultiMap, RequestWithProcessor> globals = new MultiMap, RequestWithProcessor>(); final List> customs = CollectionFactory.arrayList(); diff --git a/platform/lang-impl/src/com/intellij/psi/search/UseScopeEnlarger.java b/platform/indexing-impl/src/com/intellij/psi/search/UseScopeEnlarger.java similarity index 96% rename from platform/lang-impl/src/com/intellij/psi/search/UseScopeEnlarger.java rename to platform/indexing-impl/src/com/intellij/psi/search/UseScopeEnlarger.java index 149b051838fa..4158be2b0663 100644 --- a/platform/lang-impl/src/com/intellij/psi/search/UseScopeEnlarger.java +++ b/platform/indexing-impl/src/com/intellij/psi/search/UseScopeEnlarger.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/lang-api/src/com/intellij/ide/actions/ElementCreator.java b/platform/lang-api/src/com/intellij/ide/actions/ElementCreator.java index e86642c1083e..0992221826a0 100644 --- a/platform/lang-api/src/com/intellij/ide/actions/ElementCreator.java +++ b/platform/lang-api/src/com/intellij/ide/actions/ElementCreator.java @@ -30,7 +30,6 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.SmartPointerManager; import com.intellij.psi.SmartPsiElementPointer; import com.intellij.psi.util.PsiUtilBase; -import com.intellij.util.IncorrectOperationException; import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java b/platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java index 179f975b6ee9..bd7753874d63 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java @@ -40,7 +40,7 @@ import com.intellij.openapi.util.Condition; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.util.Alarm; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nullable; @@ -157,7 +157,7 @@ public class AutoPopupController implements Disposable { if (file == null) return; if (!documentManager.isUncommited(editor.getDocument())) { - file = documentManager.getPsiFile(InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(editor, file).getDocument()); + file = documentManager.getPsiFile(InjectedLanguageFacadeImpl.getEditorForInjectedLanguageNoCommit(editor, file).getDocument()); if (file == null) return; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/CommentUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/CommentUtil.java index a2ac211476b1..afcd6bb833b1 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/CommentUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/CommentUtil.java @@ -16,19 +16,15 @@ package com.intellij.codeInsight; -import com.intellij.lang.*; import com.intellij.openapi.editor.Document; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.Project; -import com.intellij.psi.PsiComment; -import com.intellij.psi.PsiElement; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.codeStyle.Indent; -import com.intellij.psi.tree.IElementType; +import com.intellij.util.codeInsight.CommentUtilCore; import com.intellij.util.text.CharArrayUtil; -import org.jetbrains.annotations.Nullable; -public class CommentUtil { +public class CommentUtil extends CommentUtilCore { private CommentUtil() { } public static Indent getMinLineIndent(Project project, Document document, int line1, int line2, FileType fileType) { @@ -57,26 +53,4 @@ public class CommentUtil { //} return minIndent; } - - public static boolean isComment(@Nullable final PsiElement element) { - return element != null && isComment(element.getNode()); - } - - public static boolean isComment(@Nullable final ASTNode node) { - if (node == null) return false; - final IElementType type = node.getElementType(); - final ParserDefinition parserDefinition = LanguageParserDefinitions.INSTANCE.forLanguage(type.getLanguage()); - return parserDefinition != null && parserDefinition.getCommentTokens().contains(type); - } - - public static boolean isCommentTextElement(final PsiElement element) { - final Commenter commenter = LanguageCommenters.INSTANCE.forLanguage(element.getLanguage()); - if (commenter instanceof CodeDocumentationAwareCommenterEx) { - final CodeDocumentationAwareCommenterEx commenterEx = (CodeDocumentationAwareCommenterEx)commenter; - if (commenterEx.isDocumentationCommentText(element)) return true; - if (element instanceof PsiComment && commenterEx.isDocumentationComment((PsiComment)element)) return false; - } - - return isComment(element); - } } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/BaseCodeInsightAction.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/BaseCodeInsightAction.java index 2a76da8174ba..d3fc7311dd0e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/BaseCodeInsightAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/BaseCodeInsightAction.java @@ -26,7 +26,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -59,7 +59,7 @@ public abstract class BaseCodeInsightAction extends CodeInsightAction { PsiFile psiFile = documentManager.getCachedPsiFile(editor.getDocument()); if (psiFile != null) { if (commit) documentManager.commitAllDocuments(); - injectedEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(editor, psiFile); + injectedEditor = InjectedLanguageFacadeImpl.getEditorForInjectedLanguageNoCommit(editor, psiFile); } } return injectedEditor; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java index 4715b4e5d53f..4fba4ab21670 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java @@ -60,7 +60,7 @@ import com.intellij.psi.impl.DebugUtil; import com.intellij.psi.impl.PsiFileEx; import com.intellij.psi.impl.PsiModificationTrackerImpl; import com.intellij.psi.impl.source.PostprocessReformattingAspect; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.util.PsiUtilBase; import com.intellij.reference.SoftReference; import com.intellij.util.Consumer; @@ -223,7 +223,7 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler { int offset = editor.getCaretModel().getOffset(); int psiOffset = Math.max(0, offset - 1); - PsiElement elementAt = InjectedLanguageUtil.findInjectedElementNoCommit(psiFile, psiOffset); + PsiElement elementAt = InjectedLanguageFacadeImpl.findInjectedElementNoCommit(psiFile, psiOffset); if (elementAt == null) { elementAt = psiFile.findElementAt(psiOffset); } @@ -528,10 +528,10 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler { } } }); - final PsiFile hostFile = InjectedLanguageUtil.getTopLevelFile(fileCopy[0]); + final PsiFile hostFile = InjectedLanguageFacadeImpl.getTopLevelFile(fileCopy[0]); final InjectedLanguageManager injectedLanguageManager = InjectedLanguageManager.getInstance(hostFile.getProject()); final int hostStartOffset = injectedLanguageManager.injectedToHost(fileCopy[0], initContext.getStartOffset()); - final Editor hostEditor = InjectedLanguageUtil.getTopLevelEditor(initContext.getEditor()); + final Editor hostEditor = InjectedLanguageFacadeImpl.getTopLevelEditor(initContext.getEditor()); final OffsetMap hostMap = new OffsetMap(hostEditor.getDocument()); final OffsetMap original = initContext.getOffsetMap(); @@ -595,13 +595,14 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler { InjectedLanguageManager injectedLanguageManager = InjectedLanguageManager.getInstance(hostFile.getProject()); CompletionContext context; - PsiFile injected = InjectedLanguageUtil.findInjectedPsiNoCommit(hostFile, hostStartOffset); + PsiFile injected = InjectedLanguageFacadeImpl.findInjectedPsiNoCommit(hostFile, hostStartOffset); if (injected != null) { TextRange host = injectedLanguageManager.injectedToHost(injected, injected.getTextRange()); assert hostStartOffset >= host.getStartOffset() : "startOffset before injected"; assert hostStartOffset <= host.getEndOffset() : "startOffset after injected"; - EditorWindow injectedEditor = (EditorWindow)InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(hostEditor, hostFile, hostStartOffset); + EditorWindow injectedEditor = (EditorWindow)InjectedLanguageFacadeImpl + .getEditorForInjectedLanguageNoCommit(hostEditor, hostFile, hostStartOffset); assert injected == injectedEditor.getInjectedFile(); final OffsetMap map = new OffsetMap(injectedEditor.getDocument()); for (final OffsetKey key : hostMap.getAllOffsets()) { @@ -825,7 +826,7 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler { } private static Runnable rememberDocumentState(final Editor _editor) { - final Editor editor = InjectedLanguageUtil.getTopLevelEditor(_editor); + final Editor editor = InjectedLanguageFacadeImpl.getTopLevelEditor(_editor); final String documentText = editor.getDocument().getText(); final int caret = editor.getCaretModel().getOffset(); final int selStart = editor.getSelectionModel().getSelectionStart(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java index 4854888bfc60..85fa88ced441 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java @@ -32,7 +32,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.Weigher; import com.intellij.psi.WeighingService; import com.intellij.psi.impl.DebugUtil; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.util.Consumer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -141,7 +141,7 @@ public class CompletionServiceImpl extends CompletionService{ PsiFile positionFile = myParameters.getPosition().getContainingFile(); LOG.error("prefix should be some actual file string just before caret: " + matcher.getPrefix() + "\n text=" + fragment + - "\ninjected=" + (InjectedLanguageUtil.getTopLevelFile(positionFile) != positionFile) + + "\ninjected=" + (InjectedLanguageFacadeImpl.getTopLevelFile(positionFile) != positionFile) + "\nlang=" + positionFile.getLanguage()); } return new CompletionResultSetImpl(getConsumer(), myTextBeforePosition, matcher, myContributor, myParameters, mySorter, myProcess, this); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/CodeFoldingPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/CodeFoldingPass.java index 444f8828fb4b..ae9bcb6a03fa 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/CodeFoldingPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/CodeFoldingPass.java @@ -25,7 +25,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.util.Key; import com.intellij.psi.PsiFile; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import org.jetbrains.annotations.NotNull; class CodeFoldingPass extends TextEditorHighlightingPass implements DumbAware { @@ -72,7 +72,7 @@ class CodeFoldingPass extends TextEditorHighlightingPass implements DumbAware { } } - if (InjectedLanguageUtil.getTopLevelFile(myFile) == myFile) { + if (InjectedLanguageFacadeImpl.getTopLevelFile(myFile) == myFile) { clearFirstTimeFlag(myFile, myEditor, THE_FIRST_TIME); } } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java index 45b641db1d89..06e43d25e45c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java @@ -59,7 +59,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.problems.Problem; import com.intellij.problems.WolfTheProblemSolver; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.impl.source.tree.injected.Place; import com.intellij.psi.search.PsiTodoSearchHelper; import com.intellij.psi.search.TodoItem; @@ -290,7 +290,7 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP @NotNull final List elements2, @NotNull final ProgressIndicator progress, @NotNull final Set outInjected) { - List injected = InjectedLanguageUtil.getCachedInjectedDocuments(myFile); + List injected = InjectedLanguageFacadeImpl.getCachedInjectedDocuments(myFile); Collection hosts = new THashSet(elements1.size() + elements2.size() + injected.size()); //rehighlight all injected PSI regardless the range, @@ -319,14 +319,15 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP } } }; - if (!JobLauncher.getInstance().invokeConcurrentlyUnderProgress(new ArrayList(hosts), progress, false, new Processor() { - @Override - public boolean process(PsiElement element) { - progress.checkCanceled(); - InjectedLanguageUtil.enumerate(element, myFile, false, visitor); - return true; - } - })) throw new ProcessCanceledException(); + if (!JobLauncher.getInstance().invokeConcurrentlyUnderProgress(new ArrayList(hosts), progress, false, + new Processor() { + @Override + public boolean process(PsiElement element) { + progress.checkCanceled(); + InjectedLanguageFacadeImpl.enumerate(element, myFile, false, visitor); + return true; + } + })) throw new ProcessCanceledException(); } // returns false if canceled @@ -337,76 +338,86 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP final InjectedLanguageManager injectedLanguageManager = InjectedLanguageManager.getInstance(myProject); final TextAttributes injectedAttributes = myGlobalScheme.getAttributes(EditorColors.INJECTED_LANGUAGE_FRAGMENT); - return JobLauncher.getInstance().invokeConcurrentlyUnderProgress(new ArrayList(injectedFiles), progress, myFailFastOnAcquireReadAction, - new Processor() { - @Override - public boolean process(final PsiFile injectedPsi) { - DocumentWindow documentWindow = - (DocumentWindow)PsiDocumentManager.getInstance(myProject) - .getCachedDocument(injectedPsi); - if (documentWindow == null) return true; - Place places = InjectedLanguageUtil.getShreds(injectedPsi); - for (PsiLanguageInjectionHost.Shred place : places) { - TextRange textRange = place.getRangeInsideHost() - .shiftRight(place.getHost().getTextRange().getStartOffset()); - if (textRange.isEmpty()) continue; - String desc = - injectedPsi.getLanguage().getDisplayName() + ": " + injectedPsi.getText(); - HighlightInfo info = HighlightInfo - .createHighlightInfo(HighlightInfoType.INJECTED_LANGUAGE_BACKGROUND, - textRange, null, desc, injectedAttributes); - info.fromInjection = true; - outInfos.add(info); - } + return JobLauncher.getInstance().invokeConcurrentlyUnderProgress(new ArrayList(injectedFiles), progress, + myFailFastOnAcquireReadAction, + new Processor() { + @Override + public boolean process(final PsiFile injectedPsi) { + DocumentWindow documentWindow = + (DocumentWindow)PsiDocumentManager.getInstance(myProject) + .getCachedDocument(injectedPsi); + if (documentWindow == null) return true; + Place places = InjectedLanguageFacadeImpl.getShreds(injectedPsi); + for (PsiLanguageInjectionHost.Shred place : places) { + TextRange textRange = place.getRangeInsideHost() + .shiftRight(place.getHost().getTextRange().getStartOffset()); + if (textRange.isEmpty()) continue; + String desc = + injectedPsi.getLanguage().getDisplayName() + + ": " + + injectedPsi.getText(); + HighlightInfo info = HighlightInfo + .createHighlightInfo( + HighlightInfoType.INJECTED_LANGUAGE_BACKGROUND, + textRange, null, desc, injectedAttributes); + info.fromInjection = true; + outInfos.add(info); + } - HighlightInfoHolder holder = createInfoHolder(injectedPsi); - runHighlightVisitorsForInjected(injectedPsi, holder, progress); - for (int i = 0; i < holder.size(); i++) { - HighlightInfo info = holder.get(i); - final int startOffset = documentWindow.injectedToHost(info.startOffset); - final TextRange fixedTextRange = - getFixedTextRange(documentWindow, startOffset); - addPatchedInfos(info, injectedPsi, documentWindow, injectedLanguageManager, - fixedTextRange, outInfos); - } - holder.clear(); - highlightInjectedSyntax(injectedPsi, holder); - for (int i = 0; i < holder.size(); i++) { - HighlightInfo info = holder.get(i); - final int startOffset = info.startOffset; - final TextRange fixedTextRange = - getFixedTextRange(documentWindow, startOffset); - if (fixedTextRange == null) { - info.fromInjection = true; - outInfos.add(info); - } - else { - HighlightInfo patched = - new HighlightInfo(info.forcedTextAttributes, info.forcedTextAttributesKey, - info.type, - fixedTextRange.getStartOffset(), - fixedTextRange.getEndOffset(), - info.description, info.toolTip, - info.type.getSeverity(null), info.isAfterEndOfLine, null, - false); - patched.fromInjection = true; - outInfos.add(patched); - } - } + HighlightInfoHolder holder = createInfoHolder(injectedPsi); + runHighlightVisitorsForInjected(injectedPsi, holder, progress); + for (int i = 0; i < holder.size(); i++) { + HighlightInfo info = holder.get(i); + final int startOffset = + documentWindow.injectedToHost(info.startOffset); + final TextRange fixedTextRange = + getFixedTextRange(documentWindow, startOffset); + addPatchedInfos(info, injectedPsi, documentWindow, + injectedLanguageManager, + fixedTextRange, outInfos); + } + holder.clear(); + highlightInjectedSyntax(injectedPsi, holder); + for (int i = 0; i < holder.size(); i++) { + HighlightInfo info = holder.get(i); + final int startOffset = info.startOffset; + final TextRange fixedTextRange = + getFixedTextRange(documentWindow, startOffset); + if (fixedTextRange == null) { + info.fromInjection = true; + outInfos.add(info); + } + else { + HighlightInfo patched = + new HighlightInfo(info.forcedTextAttributes, + info.forcedTextAttributesKey, + info.type, + fixedTextRange.getStartOffset(), + fixedTextRange.getEndOffset(), + info.description, info.toolTip, + info.type.getSeverity(null), + info.isAfterEndOfLine, null, + false); + patched.fromInjection = true; + outInfos.add(patched); + } + } - if (!isDumbMode()) { - List todos = new ArrayList(); - highlightTodos(injectedPsi, injectedPsi.getText(), 0, - injectedPsi.getTextLength(), progress, myPriorityRange, todos, - todos); - for (HighlightInfo info : todos) { - addPatchedInfos(info, injectedPsi, documentWindow, injectedLanguageManager, - null, outInfos); - } - } - return true; - } - }); + if (!isDumbMode()) { + List todos = new ArrayList(); + highlightTodos(injectedPsi, injectedPsi.getText(), 0, + injectedPsi.getTextLength(), progress, + myPriorityRange, todos, + todos); + for (HighlightInfo info : todos) { + addPatchedInfos(info, injectedPsi, documentWindow, + injectedLanguageManager, + null, outInfos); + } + } + return true; + } + }); } private static TextRange getFixedTextRange(@NotNull DocumentWindow documentWindow, int startOffset) { @@ -510,7 +521,8 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP } private void highlightInjectedSyntax(final PsiFile injectedPsi, HighlightInfoHolder holder) { - List, TextRange>> tokens = InjectedLanguageUtil.getHighlightTokens(injectedPsi); + List, TextRange>> tokens = InjectedLanguageFacadeImpl + .getHighlightTokens(injectedPsi); if (tokens == null) return; final Language injectedLanguage = injectedPsi.getLanguage(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java index 2012c5c95773..b52c21cf28a6 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java @@ -37,7 +37,7 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiReference; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.search.LocalSearchScope; import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.util.Processor; @@ -100,7 +100,7 @@ public class IdentifierHighlighterPass extends TextEditorHighlightingPass { if (myTarget == null) { if (!PsiDocumentManager.getInstance(myProject).isUncommited(myEditor.getDocument())) { // when document is committed, try to check injected stuff - it's fast - Editor injectedEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(myEditor, myFile, myCaretOffset); + Editor injectedEditor = InjectedLanguageFacadeImpl.getEditorForInjectedLanguageNoCommit(myEditor, myFile, myCaretOffset); if (injectedEditor != null) { myTarget = TargetElementUtilBase.getInstance().findTargetElement(injectedEditor, flags, injectedEditor.getCaretModel().getOffset()); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java index 07d4c0672e26..e961ecd989ff 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java @@ -47,7 +47,7 @@ import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.util.Function; import com.intellij.util.FunctionUtil; import gnu.trove.THashSet; @@ -211,7 +211,7 @@ public class LineMarkersPass extends ProgressableTextEditorHighlightingPass impl } }; for (int i = 0, size = elements.size(); i < size; ++i) { - InjectedLanguageUtil.enumerate(elements.get(i), file, false, collectingVisitor); + InjectedLanguageFacadeImpl.enumerate(elements.get(i), file, false, collectingVisitor); } for (PsiFile injectedPsi : injectedFiles) { final Project project = injectedPsi.getProject(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java index 2ad985bda25a..b3f706976e75 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java @@ -53,7 +53,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.profile.codeInspection.InspectionProjectProfileManager; import com.intellij.profile.codeInspection.SeverityProvider; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.util.ConcurrencyUtil; import com.intellij.util.Function; import com.intellij.util.Processor; @@ -301,43 +301,49 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass final ArrayList init = new ArrayList(); List>> entries = new ArrayList>>(tools.entrySet()); boolean result = JobLauncher.getInstance().invokeConcurrentlyUnderProgress(entries, indicator, myFailFastOnAcquireReadAction, - new Processor>>() { - @Override - public boolean process(final Map.Entry> pair) { - indicator.checkCanceled(); + new Processor>>() { + @Override + public boolean process(final Map.Entry> pair) { + indicator.checkCanceled(); - ApplicationManager.getApplication().assertReadAccessAllowed(); - final LocalInspectionToolWrapper wrapper = pair.getKey(); - LocalInspectionTool tool = wrapper.getTool(); - final boolean[] applyIncrementally = {isOnTheFly}; - ProblemsHolder holder = - new ProblemsHolder(iManager, myFile, isOnTheFly) { - @Override - public void registerProblem(@NotNull ProblemDescriptor descriptor) { - super.registerProblem(descriptor); - if (applyIncrementally[0]) { - addDescriptorIncrementally(descriptor, wrapper, indicator); - } - } - }; - Set languages = (Set)pair.getValue(); - PsiElementVisitor visitor = - createVisitorAndAcceptElements(tool, holder, isOnTheFly, session, - elements, languages); + ApplicationManager.getApplication() + .assertReadAccessAllowed(); + final LocalInspectionToolWrapper wrapper = pair.getKey(); + LocalInspectionTool tool = wrapper.getTool(); + final boolean[] applyIncrementally = {isOnTheFly}; + ProblemsHolder holder = + new ProblemsHolder(iManager, myFile, isOnTheFly) { + @Override + public void registerProblem(@NotNull ProblemDescriptor descriptor) { + super.registerProblem(descriptor); + if (applyIncrementally[0]) { + addDescriptorIncrementally(descriptor, wrapper, + indicator); + } + } + }; + Set languages = (Set)pair.getValue(); + PsiElementVisitor visitor = + createVisitorAndAcceptElements(tool, holder, + isOnTheFly, session, + elements, languages); - synchronized (init) { - init.add(new InspectionContext(wrapper, holder, visitor, languages)); - } - advanceProgress(1); + synchronized (init) { + init.add( + new InspectionContext(wrapper, holder, visitor, + languages)); + } + advanceProgress(1); - if (holder.hasResults()) { - appendDescriptors(myFile, holder.getResults(), wrapper); - } - applyIncrementally[0] = - false; // do not apply incrementally outside visible range - return true; - } - }); + if (holder.hasResults()) { + appendDescriptors(myFile, holder.getResults(), + wrapper); + } + applyIncrementally[0] = + false; // do not apply incrementally outside visible range + return true; + } + }); if (!result) throw new ProcessCanceledException(); inspectInjectedPsi(elements, isOnTheFly, indicator, iManager, true, checkDumbAwareness, wrappers); return init; @@ -413,7 +419,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass final boolean inVisibleRange, final boolean checkDumbAwareness, final List wrappers) { final Set injected = new THashSet(); for (PsiElement element : elements) { - InjectedLanguageUtil.enumerate(element, myFile, false, new PsiLanguageInjectionHost.InjectedPsiVisitor() { + InjectedLanguageFacadeImpl.enumerate(element, myFile, false, new PsiLanguageInjectionHost.InjectedPsiVisitor() { @Override public void visit(@NotNull PsiFile injectedPsi, @NotNull List places) { injected.add(injectedPsi); @@ -421,15 +427,17 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass }); } if (injected.isEmpty()) return; - if (!JobLauncher.getInstance().invokeConcurrentlyUnderProgress(new ArrayList(injected), indicator, myFailFastOnAcquireReadAction, - new Processor() { - @Override - public boolean process(final PsiFile injectedPsi) { - doInspectInjectedPsi(injectedPsi, onTheFly, indicator, iManager, inVisibleRange, - wrappers, checkDumbAwareness); - return true; - } - })) throw new ProcessCanceledException(); + if (!JobLauncher.getInstance().invokeConcurrentlyUnderProgress(new ArrayList(injected), indicator, + myFailFastOnAcquireReadAction, + new Processor() { + @Override + public boolean process(final PsiFile injectedPsi) { + doInspectInjectedPsi(injectedPsi, onTheFly, indicator, iManager, + inVisibleRange, + wrappers, checkDumbAwareness); + return true; + } + })) throw new ProcessCanceledException(); } @Nullable diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QuickFixAction.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QuickFixAction.java index 70d351d6092e..bad2d1853659 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QuickFixAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QuickFixAction.java @@ -29,7 +29,7 @@ import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiFile; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.util.Processor; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -145,8 +145,8 @@ public final class QuickFixAction { PsiFile fileToUse; if (info.fromInjection) { if (injectedEditor == null) { - injectedFile = InjectedLanguageUtil.findInjectedPsiNoCommit(file, offset); - injectedEditor = InjectedLanguageUtil.getInjectedEditorForInjectedFile(editor, injectedFile); + injectedFile = InjectedLanguageFacadeImpl.findInjectedPsiNoCommit(file, offset); + injectedEditor = InjectedLanguageFacadeImpl.getInjectedEditorForInjectedFile(editor, injectedFile); } editorToUse = injectedEditor; fileToUse = injectedFile; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java index 066fffe385d1..b704d190cc80 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java @@ -32,7 +32,7 @@ import com.intellij.openapi.wm.WindowManager; import com.intellij.openapi.wm.ex.ToolWindowManagerEx; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.util.PsiUtilBase; import com.intellij.ui.content.*; import com.intellij.util.ui.update.Activatable; @@ -181,7 +181,7 @@ public abstract class DockablePopupManager { final PsiFile file = PsiUtilBase.getPsiFileInEditor(editor, myProject); - final Editor injectedEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(editor, file); + final Editor injectedEditor = InjectedLanguageFacadeImpl.getEditorForInjectedLanguageNoCommit(editor, file); if (injectedEditor != null) { final PsiFile psiFile = PsiUtilBase.getPsiFileInEditor(injectedEditor, myProject); if (psiFile != null) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java index d0a8ae4db1c3..282890eec51a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java @@ -31,7 +31,7 @@ import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import org.jetbrains.annotations.NotNull; /** @@ -83,16 +83,16 @@ public class CompletionAutoPopupHandler extends TypedHandlerDelegate { if (editor.isDisposed()) return; // retrieve the injected file from scratch since our typing might have destroyed the old one completely - Editor topLevelEditor = InjectedLanguageUtil.getTopLevelEditor(editor); + Editor topLevelEditor = InjectedLanguageFacadeImpl.getTopLevelEditor(editor); PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(topLevelEditor.getDocument()); if (file == null) return; - PsiFile topLevelFile = InjectedLanguageUtil.getTopLevelFile(file); + PsiFile topLevelFile = InjectedLanguageFacadeImpl.getTopLevelFile(file); if (!PsiDocumentManager.getInstance(project).isCommitted(editor.getDocument())) { LOG.error("Non-committed document"); PsiDocumentManager.getInstance(project).commitAllDocuments(); } - Editor newEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(topLevelEditor, topLevelFile); + Editor newEditor = InjectedLanguageFacadeImpl.getEditorForInjectedLanguageNoCommit(topLevelEditor, topLevelFile); try { new CodeCompletionHandlerBase(completionType, false, autopopup, false).invokeCompletion(project, newEditor, time, false); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java index 7bc43282dcdc..04b49b51046c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java @@ -32,7 +32,7 @@ import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.templateLanguages.OuterLanguageElement; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; @@ -52,7 +52,7 @@ public class SelectWordHandler extends EditorActionHandler { LOG.debug("enter: execute(editor='" + editor + "')"); } if (editor instanceof EditorWindow && editor.getSelectionModel().hasSelection() - && InjectedLanguageUtil.isSelectionIsAboutToOverflowInjectedFragment((EditorWindow)editor)) { + && InjectedLanguageFacadeImpl.isSelectionIsAboutToOverflowInjectedFragment((EditorWindow)editor)) { // selection about to spread beyond injected fragment editor = ((EditorWindow)editor).getDelegate(); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java index a9261cc8d532..a9f107fd2935 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java @@ -50,7 +50,7 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleManager; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; import com.intellij.psi.util.PsiUtilBase; @@ -270,10 +270,10 @@ public class TypedHandler extends TypedActionHandlerBase { // even for uncommitted document try to retrieve injected fragment that has been there recently // we are assuming here that when user is (even furiously) typing, injected language would not change // and thus we can use its lexer to insert closing braces etc - for (DocumentWindow documentWindow : InjectedLanguageUtil.getCachedInjectedDocuments(oldFile)) { + for (DocumentWindow documentWindow : InjectedLanguageFacadeImpl.getCachedInjectedDocuments(oldFile)) { if (documentWindow.isValid() && documentWindow.containsRange(offset, offset)) { PsiFile injectedFile = PsiDocumentManager.getInstance(oldFile.getProject()).getPsiFile(documentWindow); - final Editor injectedEditor = InjectedLanguageUtil.getInjectedEditorForInjectedFile(editor, injectedFile); + final Editor injectedEditor = InjectedLanguageFacadeImpl.getInjectedEditorForInjectedFile(editor, injectedFile); // IDEA-52375 fix: last quote sign should be handled by outer language quote handler final CharSequence charsSequence = editor.getDocument().getCharsSequence(); if (injectedEditor.getCaretModel().getOffset() == injectedEditor.getDocument().getTextLength() && diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java index 51cf80b83161..e233872ba2d4 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java @@ -34,7 +34,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.util.CachedValueProvider; import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.ParameterizedCachedValue; @@ -151,7 +151,7 @@ public class FoldingUpdate { Object lastTimeStamp = editor.getUserData(LAST_UPDATE_INJECTED_STAMP_KEY); if (lastTimeStamp instanceof Long && ((Long)lastTimeStamp).longValue() == timeStamp) return null; - List injectedDocuments = InjectedLanguageUtil.getCachedInjectedDocuments(file); + List injectedDocuments = InjectedLanguageFacadeImpl.getCachedInjectedDocuments(file); if (injectedDocuments.isEmpty()) return null; final List injectedEditors = new ArrayList(); final List injectedFiles = new ArrayList(); @@ -159,7 +159,7 @@ public class FoldingUpdate { for (DocumentWindow injectedDocument : injectedDocuments) { PsiFile injectedFile = PsiDocumentManager.getInstance(project).getPsiFile(injectedDocument); if (injectedFile == null || !injectedFile.isValid() || !injectedDocument.isValid()) continue; - Editor injectedEditor = InjectedLanguageUtil.getInjectedEditorForInjectedFile(editor, injectedFile); + Editor injectedEditor = InjectedLanguageFacadeImpl.getInjectedEditorForInjectedFile(editor, injectedFile); if (!(injectedEditor instanceof EditorWindow)) continue; injectedEditors.add((EditorWindow)injectedEditor); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/OffsetsElementSignatureProvider.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/OffsetsElementSignatureProvider.java index f1e78494c8a7..35a75cf476b0 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/OffsetsElementSignatureProvider.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/OffsetsElementSignatureProvider.java @@ -18,7 +18,7 @@ package com.intellij.codeInsight.folding.impl; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -87,7 +87,7 @@ public class OffsetsElementSignatureProvider extends AbstractElementSignaturePro } if (result == null) { - final PsiElement injectedStartElement = InjectedLanguageUtil.findElementAtNoCommit(file, start); + final PsiElement injectedStartElement = InjectedLanguageFacadeImpl.findElementAtNoCommit(file, start); if (processingInfoStorage != null) { processingInfoStorage.append(String.format( "Trying to find injected element starting from the '%s'%s%n", diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByLineCommentAction.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByLineCommentAction.java index 4a7421675b9f..ec447bcdf6a7 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByLineCommentAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByLineCommentAction.java @@ -23,8 +23,6 @@ import com.intellij.openapi.fileTypes.impl.AbstractFileType; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.project.DumbAwareAction; -import com.intellij.openapi.project.DumbAwareRunnable; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.lang.LanguageCommenters; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java index 24e619be216d..d58ad07377c2 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java @@ -52,7 +52,7 @@ import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiUtilBase; import com.intellij.util.Alarm; @@ -136,7 +136,7 @@ public class BraceHighlightingHandler { public void run() { try { if (!isReallyDisposed(editor, project)) { - Editor newEditor = InjectedLanguageUtil.getInjectedEditorForInjectedFile(editor, injected); + Editor newEditor = InjectedLanguageFacadeImpl.getInjectedEditorForInjectedFile(editor, injected); BraceHighlightingHandler handler = new BraceHighlightingHandler(project, newEditor, alarm, injected); processor.process(handler); } @@ -161,7 +161,7 @@ public class BraceHighlightingHandler { Document document = editor.getDocument(); // when document is committed, try to highlight braces in injected lang - it's fast if (!PsiDocumentManager.getInstance(project).isUncommited(document)) { - final PsiElement injectedElement = InjectedLanguageUtil.findInjectedElementNoCommit(psiFile, offset); + final PsiElement injectedElement = InjectedLanguageFacadeImpl.findInjectedElementNoCommit(psiFile, offset); if (injectedElement != null /*&& !(injectedElement instanceof PsiWhiteSpace)*/) { final PsiFile injected = injectedElement.getContainingFile(); if (injected != null) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java index 255f2353d97e..c0d1376c94cb 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java @@ -41,7 +41,7 @@ import com.intellij.openapi.util.UserDataHolderEx; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiReference; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.util.containers.HashMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -167,7 +167,7 @@ public class HighlightManagerImpl extends HighlightManager implements ProjectCom PsiFile containingFile = element.getContainingFile(); Project project = element.getProject(); // each reference can reside in its own injected editor - Editor textEditor = InjectedLanguageUtil.openEditorFor(containingFile, project); + Editor textEditor = InjectedLanguageFacadeImpl.openEditorFor(containingFile, project); if (textEditor != null) { addOccurrenceHighlight(textEditor, start, end, attributes, flags, outHighlighters, scrollmarkColor); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java index b5759a2d63a9..d690edf18225 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java @@ -36,7 +36,7 @@ import com.intellij.openapi.ui.popup.*; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Iconable; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.util.PsiUtilBase; import gnu.trove.THashSet; import gnu.trove.TObjectHashingStrategy; @@ -112,7 +112,7 @@ class IntentionListStep implements ListPopupStep } else { hostElement = myFile.getViewProvider().findElementAt(fileOffset, myFile.getLanguage()); - element = InjectedLanguageUtil.findElementAtNoCommit(myFile, fileOffset); + element = InjectedLanguageFacadeImpl.findElementAtNoCommit(myFile, fileOffset); } PsiFile injectedFile; Editor injectedEditor; @@ -122,7 +122,7 @@ class IntentionListStep implements ListPopupStep } else { injectedFile = element.getContainingFile(); - injectedEditor = InjectedLanguageUtil.getInjectedEditorForInjectedFile(myEditor, injectedFile); + injectedEditor = InjectedLanguageFacadeImpl.getInjectedEditorForInjectedFile(myEditor, injectedFile); } boolean result = true; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditAction.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditAction.java index df76329d288b..a109226d8b82 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditAction.java @@ -24,7 +24,7 @@ import com.intellij.openapi.ui.popup.Balloon; import com.intellij.openapi.util.*; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; @@ -58,7 +58,7 @@ public class QuickEditAction implements IntentionAction, LowPriorityAction { final PsiLanguageInjectionHost host = PsiTreeUtil.getParentOfType(file.findElementAt(offset), PsiLanguageInjectionHost.class, false); if (host == null) return null; - final List> injections = InjectedLanguageUtil.getInjectedPsiFiles(host); + final List> injections = InjectedLanguageFacadeImpl.getInstance().getInjectedPsiFiles(host); if (injections == null || injections.isEmpty()) return null; final int offsetInElement = offset - host.getTextRange().getStartOffset(); final Pair rangePair = ContainerUtil.find(injections, new Condition>() { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditHandler.java index 1a8b9ba856d2..814bad1e40dd 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditHandler.java @@ -48,7 +48,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.impl.source.PostprocessReformattingAspect; import com.intellij.psi.impl.source.resolve.FileContextUtil; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.impl.source.tree.injected.Place; import com.intellij.testFramework.LightVirtualFile; import com.intellij.ui.awt.RelativePoint; @@ -86,7 +86,7 @@ public class QuickEditHandler extends DocumentAdapter implements Disposable { myEditor = editor; myAction = action; myOrigDocument = editor.getDocument(); - final Place shreds = InjectedLanguageUtil.getShreds(myInjectedFile); + final Place shreds = InjectedLanguageFacadeImpl.getShreds(myInjectedFile); final FileType fileType = injectedFile.getFileType(); final Language language = injectedFile.getLanguage(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/ShowIntentionActionsHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/ShowIntentionActionsHandler.java index b93aeb096594..4421b4d39641 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/ShowIntentionActionsHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/ShowIntentionActionsHandler.java @@ -40,7 +40,7 @@ import com.intellij.psi.PsiCodeFragment; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.util.IncorrectOperationException; import com.intellij.util.PairProcessor; import org.jetbrains.annotations.NotNull; @@ -56,7 +56,7 @@ public class ShowIntentionActionsHandler implements CodeInsightActionHandler { PsiDocumentManager.getInstance(project).commitAllDocuments(); if (editor instanceof EditorWindow) { editor = ((EditorWindow)editor).getDelegate(); - file = InjectedLanguageUtil.getTopLevelFile(file); + file = InjectedLanguageFacadeImpl.getTopLevelFile(file); } final LookupEx lookup = LookupManager.getActiveLookup(editor); @@ -122,9 +122,9 @@ public class ShowIntentionActionsHandler implements CodeInsightActionHandler { PsiFile fileToApply = null; int offset = hostEditor.getCaretModel().getOffset(); - PsiFile injectedFile = InjectedLanguageUtil.findInjectedPsiNoCommit(hostFile, offset); + PsiFile injectedFile = InjectedLanguageFacadeImpl.findInjectedPsiNoCommit(hostFile, offset); if (injectedFile != null) { - Editor injectedEditor = InjectedLanguageUtil.getInjectedEditorForInjectedFile(hostEditor, injectedFile); + Editor injectedEditor = InjectedLanguageFacadeImpl.getInjectedEditorForInjectedFile(hostEditor, injectedFile); if (predicate.process(injectedFile, injectedEditor)) { editorToApply = injectedEditor; fileToApply = injectedFile; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupManager.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupManager.java index a1a95fd65e09..cde7df077e25 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupManager.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupManager.java @@ -19,7 +19,7 @@ package com.intellij.codeInsight.lookup; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -41,7 +41,7 @@ public abstract class LookupManager { final LookupEx lookup = getInstance(project).getActiveLookup(); if (lookup == null) return null; - return InjectedLanguageUtil.getTopLevelEditor(lookup.getEditor()) == InjectedLanguageUtil.getTopLevelEditor(editor) ? lookup : null; + return InjectedLanguageFacadeImpl.getTopLevelEditor(lookup.getEditor()) == InjectedLanguageFacadeImpl.getTopLevelEditor(editor) ? lookup : null; } @Nullable diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java index a9010dac1ca5..6ae8ea014d38 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java @@ -60,7 +60,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.pom.Navigatable; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.search.searches.DefinitionsSearch; import com.intellij.psi.util.PsiUtilBase; import com.intellij.ui.LightweightHint; @@ -154,7 +154,7 @@ public class CtrlMouseHandler extends AbstractProjectComponent { Point point = new Point(mouseEvent.getPoint()); if (PsiDocumentManager.getInstance(myProject).isCommitted(editor.getDocument())) { // when document is committed, try to check injected stuff - it's fast - editor = InjectedLanguageUtil + editor = InjectedLanguageFacadeImpl .getEditorForInjectedLanguageNoCommit(editor, psiFile, editor.logicalPositionToOffset(editor.xyToLogicalPosition(point))); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/CustomTemplateCallback.java b/platform/lang-impl/src/com/intellij/codeInsight/template/CustomTemplateCallback.java index 656946038734..925052258b1d 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/CustomTemplateCallback.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/CustomTemplateCallback.java @@ -25,7 +25,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -55,11 +55,11 @@ public class CustomTemplateCallback { PsiDocumentManager.getInstance(myProject).commitAllDocuments(); int offset = getOffset(wrapping, editor); - PsiElement element = InjectedLanguageUtil.findInjectedElementNoCommit(file, offset); + PsiElement element = InjectedLanguageFacadeImpl.findInjectedElementNoCommit(file, offset); myFile = element != null ? element.getContainingFile() : file; myInInjectedFragment = InjectedLanguageManager.getInstance(myProject).isInjectedFragment(myFile); - myEditor = myInInjectedFragment ? InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(editor, file, offset) : editor; + myEditor = myInInjectedFragment ? InjectedLanguageFacadeImpl.getEditorForInjectedLanguageNoCommit(editor, file, offset) : editor; fixInitialState(wrapping); } @@ -164,7 +164,7 @@ public class CustomTemplateCallback { public static PsiElement getContext(@NotNull PsiFile file, int offset) { PsiElement element = null; if (!InjectedLanguageManager.getInstance(file.getProject()).isInjectedFragment(file)) { - element = InjectedLanguageUtil.findInjectedElementNoCommit(file, offset); + element = InjectedLanguageFacadeImpl.findInjectedElementNoCommit(file, offset); } if (element == null) { element = file.findElementAt(offset); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/TemplateBuilderImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/template/TemplateBuilderImpl.java index 04f26ab11815..435b2eca0411 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/TemplateBuilderImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/TemplateBuilderImpl.java @@ -32,7 +32,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiReference; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.util.Function; import org.jetbrains.annotations.NotNull; @@ -60,7 +60,7 @@ public class TemplateBuilderImpl implements TemplateBuilder { private static final Logger LOG = Logger.getInstance("#" + TemplateBuilderImpl.class.getName()); public TemplateBuilderImpl(@NotNull PsiElement element) { - myFile = InjectedLanguageUtil.getTopLevelFile(element); + myFile = InjectedLanguageFacadeImpl.getTopLevelFile(element); myDocument = myFile.getViewProvider().getDocument(); myContainerElement = wrapElement(element); } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/ProblemDescriptorImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/ProblemDescriptorImpl.java index 86798bb39e6e..85d9534bf46d 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/ProblemDescriptorImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/ProblemDescriptorImpl.java @@ -26,7 +26,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.pom.Navigatable; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -142,7 +142,7 @@ public class ProblemDescriptorImpl extends CommonProblemDescriptorImpl implement if (psiElement == null) return -1; if (!psiElement.isValid()) return -1; LOG.assertTrue(psiElement.isPhysical()); - PsiFile containingFile = InjectedLanguageUtil.getTopLevelFile(psiElement); + PsiFile containingFile = InjectedLanguageFacadeImpl.getTopLevelFile(psiElement); Document document = PsiDocumentManager.getInstance(psiElement.getProject()).getDocument(containingFile); if (document == null) return -1; TextRange textRange = getTextRange(); diff --git a/platform/lang-impl/src/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java b/platform/lang-impl/src/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java index fae0f9ee875a..146d03a1a1d9 100644 --- a/platform/lang-impl/src/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java +++ b/platform/lang-impl/src/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java @@ -29,7 +29,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.fileEditor.FileEditor; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.meta.PsiMetaData; import com.intellij.psi.meta.PsiMetaOwner; import com.intellij.psi.meta.PsiPresentableMetaData; @@ -131,7 +131,7 @@ public class PsiElement2UsageTargetAdapter implements PsiElementUsageTarget, Typ Collection refs; // in case of injected file, use host file to highlight all occurrences of the target in each injected file - PsiFile context = InjectedLanguageUtil.getTopLevelFile(file); + PsiFile context = InjectedLanguageFacadeImpl.getTopLevelFile(file); SearchScope searchScope = new LocalSearchScope(context); if (handler != null) { refs = handler.findReferencesToHighlight(target, searchScope); diff --git a/platform/lang-impl/src/com/intellij/ide/todo/nodes/TodoFileNode.java b/platform/lang-impl/src/com/intellij/ide/todo/nodes/TodoFileNode.java index 89be7f2eca84..6a629737c801 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/nodes/TodoFileNode.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/nodes/TodoFileNode.java @@ -31,7 +31,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.psi.impl.search.TodoItemImpl; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.search.PsiTodoSearchHelper; import com.intellij.psi.search.TodoItem; import com.intellij.ui.HighlightedRegion; @@ -102,13 +102,13 @@ public final class TodoFileNode extends PsiFileNode implements HighlightedRegion @Override public void visitElement(PsiElement element) { if (element instanceof PsiLanguageInjectionHost) { - InjectedLanguageUtil.enumerate(element, new PsiLanguageInjectionHost.InjectedPsiVisitor() { + InjectedLanguageFacadeImpl.enumerate(element, new PsiLanguageInjectionHost.InjectedPsiVisitor() { @Override public void visit(@NotNull PsiFile injectedPsi, @NotNull List places) { if (places.size() == 1) { Document document = PsiDocumentManager.getInstance(injectedPsi.getProject()).getCachedDocument(injectedPsi); if (!(document instanceof DocumentWindow)) return; - for(TodoItem item: helper.findTodoItems(injectedPsi)) { + for (TodoItem item : helper.findTodoItems(injectedPsi)) { TextRange rangeInHost = ((DocumentWindow)document).injectedToHost(item.getTextRange()); todoItems.add(new TodoItemImpl(psiFile, rangeInHost.getStartOffset(), rangeInHost.getEndOffset(), item.getPattern())); } diff --git a/platform/lang-impl/src/com/intellij/injected/editor/EditorWindow.java b/platform/lang-impl/src/com/intellij/injected/editor/EditorWindow.java index 46341c274783..ff69f00bccb2 100644 --- a/platform/lang-impl/src/com/intellij/injected/editor/EditorWindow.java +++ b/platform/lang-impl/src/com/intellij/injected/editor/EditorWindow.java @@ -43,7 +43,7 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.UserDataHolderBase; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.util.containers.WeakList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -113,7 +113,7 @@ public class EditorWindow extends UserDataHolderBase implements EditorEx { if (!editorWindow.isValid()) { editorWindow.dispose(); - InjectedLanguageUtil.clearCaches(editorWindow.myInjectedFile, editorWindow.getDocument()); + InjectedLanguageFacadeImpl.clearCaches(editorWindow.myInjectedFile, editorWindow.getDocument()); iterator.remove(); } } diff --git a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java index cfb74dc28a0a..26c2616f4597 100644 --- a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java +++ b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java @@ -23,6 +23,7 @@ import com.intellij.formatting.ASTBlock; import com.intellij.formatting.Block; import com.intellij.formatting.FormattingModel; import com.intellij.formatting.FormattingModelBuilder; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.ui.ListCellRendererWrapper; import com.intellij.ide.util.treeView.AbstractTreeStructure; import com.intellij.ide.util.treeView.NodeRenderer; @@ -69,7 +70,6 @@ import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.psi.impl.DebugUtil; import com.intellij.psi.impl.source.resolve.FileContextUtil; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; import com.intellij.psi.search.FilenameIndex; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.LightVirtualFile; @@ -818,7 +818,8 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider, Disp } if (currentElem == null) { currentElem = - InjectedLanguageUtil.findElementAtNoCommit(psiEl.getContainingFile(), rootBlockNode.getBlock().getTextRange().getStartOffset()); + InjectedLanguageFacadeImpl + .findElementAtNoCommit(psiEl.getContainingFile(), rootBlockNode.getBlock().getTextRange().getStartOffset()); } myPsiToBlockMap.put(currentElem, rootBlockNode); @@ -976,7 +977,7 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider, Disp BlockTreeNode descriptor = (BlockTreeNode)blockElementsSet.iterator().next(); PsiElement rootPsi = ((ViewerTreeStructure)myPsiTreeBuilder.getTreeStructure()).getRootPsiElement(); int blockStart = descriptor.getBlock().getTextRange().getStartOffset(); - PsiElement currentPsiEl = InjectedLanguageUtil.findElementAtNoCommit(rootPsi.getContainingFile(), blockStart); + PsiElement currentPsiEl = InjectedLanguageFacadeImpl.findElementAtNoCommit(rootPsi.getContainingFile(), blockStart); int blockLength = descriptor.getBlock().getTextRange().getLength(); while (currentPsiEl.getParent() != null && currentPsiEl.getTextRange().getStartOffset() == blockStart && @@ -1233,7 +1234,7 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider, Disp final PsiElement rootElement = ((ViewerTreeStructure)myPsiTreeBuilder.getTreeStructure()).getRootPsiElement(); int baseOffset = rootPsiElement.getTextRange().getStartOffset(); final int offset = myEditor.getCaretModel().getOffset() + baseOffset; - final PsiElement element = InjectedLanguageUtil.findElementAtNoCommit(rootElement.getContainingFile(), offset); + final PsiElement element = InjectedLanguageFacadeImpl.findElementAtNoCommit(rootElement.getContainingFile(), offset); if (element != null && myBlockTreeBuilder != null) { TextRange rangeInHostFile = InjectedLanguageManager.getInstance(myProject).injectedToHost(element, element.getTextRange()); selectBlockNode(findBlockNode(rangeInHostFile, true)); @@ -1254,8 +1255,8 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider, Disp final int start = selection.getSelectionStart()+baseOffset; final int end = selection.getSelectionEnd()+baseOffset - 1; final PsiElement element = - findCommonParent(InjectedLanguageUtil.findElementAtNoCommit(rootElement.getContainingFile(), start), - InjectedLanguageUtil.findElementAtNoCommit(rootElement.getContainingFile(), end)); + findCommonParent(InjectedLanguageFacadeImpl.findElementAtNoCommit(rootElement.getContainingFile(), start), + InjectedLanguageFacadeImpl.findElementAtNoCommit(rootElement.getContainingFile(), end)); if (element != null && myBlockTreeBuilder != null) { if (myEditor.getContentComponent().hasFocus()) { TextRange rangeInHostFile = InjectedLanguageManager.getInstance(myProject).injectedToHost(element, element.getTextRange()); diff --git a/platform/lang-impl/src/com/intellij/internal/psiView/ViewerTreeStructure.java b/platform/lang-impl/src/com/intellij/internal/psiView/ViewerTreeStructure.java index 48f1e2d4c506..3f037ebdece6 100644 --- a/platform/lang-impl/src/com/intellij/internal/psiView/ViewerTreeStructure.java +++ b/platform/lang-impl/src/com/intellij/internal/psiView/ViewerTreeStructure.java @@ -29,7 +29,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.impl.source.SourceTreeToPsiMap; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; @@ -99,7 +99,7 @@ public class ViewerTreeStructure extends AbstractTreeStructure { } final PsiElement psi = root.getPsi(); if (psi instanceof PsiLanguageInjectionHost) { - InjectedLanguageUtil.enumerate(psi, new PsiLanguageInjectionHost.InjectedPsiVisitor() { + InjectedLanguageFacadeImpl.enumerate(psi, new PsiLanguageInjectionHost.InjectedPsiVisitor() { @Override public void visit(@NotNull PsiFile injectedPsi, @NotNull List places) { list.add(new Inject(psi, injectedPsi)); diff --git a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/PsiAwareFileEditorManagerImpl.java b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/PsiAwareFileEditorManagerImpl.java index d5761461754b..e35ddf938039 100644 --- a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/PsiAwareFileEditorManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/PsiAwareFileEditorManagerImpl.java @@ -27,7 +27,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.problems.WolfTheProblemSolver; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.ui.ColorUtil; import com.intellij.ui.docking.DockManager; import org.jetbrains.annotations.NotNull; @@ -99,7 +99,7 @@ public class PsiAwareFileEditorManagerImpl extends FileEditorManagerImpl { return editor; } - return InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(editor, psiFile); + return InjectedLanguageFacadeImpl.getEditorForInjectedLanguageNoCommit(editor, psiFile); } /** diff --git a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorPsiDataProvider.java b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorPsiDataProvider.java index 0238e016a128..ef799405eea6 100644 --- a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorPsiDataProvider.java +++ b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorPsiDataProvider.java @@ -28,7 +28,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.ToolWindowManager; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.util.PsiUtilBase; import org.jetbrains.annotations.Nullable; @@ -48,7 +48,7 @@ public class TextEditorPsiDataProvider implements EditorDataProvider { return e; } else { - return InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(e, getPsiFile(e, file)); + return InjectedLanguageFacadeImpl.getEditorForInjectedLanguageNoCommit(e, getPsiFile(e, file)); } } if (dataId.equals(injectedId(PSI_ELEMENT.getName()))) { diff --git a/platform/lang-impl/src/com/intellij/psi/formatter/FormattingDocumentModelImpl.java b/platform/lang-impl/src/com/intellij/psi/formatter/FormattingDocumentModelImpl.java index c177b80b5dee..c0ab0725a6c1 100644 --- a/platform/lang-impl/src/com/intellij/psi/formatter/FormattingDocumentModelImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/formatter/FormattingDocumentModelImpl.java @@ -28,7 +28,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.impl.PsiDocumentManagerImpl; import com.intellij.psi.impl.PsiToDocumentSynchronizer; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -128,7 +128,7 @@ public class FormattingDocumentModelImpl implements FormattingDocumentModel { if (strategy.check(myDocument.getCharsSequence(), startOffset, endOffset) >= endOffset) { return true; } - PsiElement injectedElement = myFile != null ? InjectedLanguageUtil.findElementAtNoCommit(myFile, startOffset) : null; + PsiElement injectedElement = myFile != null ? InjectedLanguageFacadeImpl.findElementAtNoCommit(myFile, startOffset) : null; if (injectedElement != null) { Language injectedLanguage = injectedElement.getLanguage(); if (!injectedLanguage.equals(myFile.getLanguage())) { diff --git a/platform/lang-impl/src/com/intellij/psi/formatter/PsiBasedFormattingModel.java b/platform/lang-impl/src/com/intellij/psi/formatter/PsiBasedFormattingModel.java index 5fb63836e61d..68bcf08c59ba 100644 --- a/platform/lang-impl/src/com/intellij/psi/formatter/PsiBasedFormattingModel.java +++ b/platform/lang-impl/src/com/intellij/psi/formatter/PsiBasedFormattingModel.java @@ -28,7 +28,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.TokenType; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.impl.source.SourceTreeToPsiMap; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -117,7 +117,7 @@ public class PsiBasedFormattingModel implements FormattingModel { Project project = containingFile.getProject(); assert !PsiDocumentManager.getInstance(project).isUncommited(myDocumentModel.getDocument()); // TODO:default project can not be used for injections, because latter might wants (unavailable) indices - PsiElement psiElement = project.isDefault() ? null : InjectedLanguageUtil.findInjectedElementNoCommit(containingFile, offset); + PsiElement psiElement = project.isDefault() ? null : InjectedLanguageFacadeImpl.findInjectedElementNoCommit(containingFile, offset); if (psiElement == null) psiElement = containingFile.findElementAt(offset); if (psiElement == null) return null; return psiElement.getNode(); diff --git a/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockBuilder.java b/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockBuilder.java index 7070493c72a1..4d06bdc3b8e5 100644 --- a/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockBuilder.java +++ b/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockBuilder.java @@ -27,7 +27,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiLanguageInjectionHost; import com.intellij.psi.codeStyle.CodeStyleSettings; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -76,7 +76,7 @@ public abstract class InjectedLanguageBlockBuilder { } } }; - InjectedLanguageUtil.enumerate(injectionHost.getPsi(), injectedPsiVisitor); + InjectedLanguageFacadeImpl.enumerate(injectionHost.getPsi(), injectedPsiVisitor); if (injectedFile[0] != null) { final Language childLanguage = injectedFile[0].getLanguage(); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java index 733a5949fbf1..94e663d5abe9 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java @@ -31,7 +31,7 @@ import com.intellij.openapi.fileTypes.impl.CustomSyntaxTableFileType; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.CustomHighlighterTokenType; import com.intellij.psi.impl.cache.impl.BaseFilterLexer; -import com.intellij.psi.impl.cache.impl.CacheUtil; +import com.intellij.psi.impl.cache.CacheUtil; import com.intellij.psi.impl.cache.impl.IndexPatternUtil; import com.intellij.psi.impl.cache.impl.OccurrenceConsumer; import com.intellij.psi.impl.cache.impl.todo.TodoIndexEntry; diff --git a/platform/lang-impl/src/com/intellij/psi/impl/smartPointers/InjectedSelfElementInfo.java b/platform/lang-impl/src/com/intellij/psi/impl/smartPointers/InjectedSelfElementInfo.java index f4a0db2a0ab2..e251006a5428 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/smartPointers/InjectedSelfElementInfo.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/smartPointers/InjectedSelfElementInfo.java @@ -25,7 +25,7 @@ import com.intellij.openapi.util.Segment; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import org.jetbrains.annotations.NotNull; import java.util.Collections; @@ -86,7 +86,7 @@ class InjectedSelfElementInfo extends SelfElementInfo { PsiDocumentManager documentManager = PsiDocumentManager.getInstance(hostFile.getProject()); Document document = documentManager.getDocument(hostFile); if (document != null && documentManager.isUncommited(document)) { - for (DocumentWindow documentWindow : InjectedLanguageUtil.getCachedInjectedDocuments(hostFile)) { + for (DocumentWindow documentWindow : InjectedLanguageFacadeImpl.getCachedInjectedDocuments(hostFile)) { PsiFile injected = documentManager.getPsiFile(documentWindow); if (injected != null) { visitor.visit(injected, Collections.emptyList()); @@ -94,7 +94,7 @@ class InjectedSelfElementInfo extends SelfElementInfo { } } else { - InjectedLanguageUtil.enumerate(hostContext, hostFile, true, visitor); + InjectedLanguageFacadeImpl.enumerate(hostContext, hostFile, true, visitor); } return result.get(); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/smartPointers/SmartPointerManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/smartPointers/SmartPointerManagerImpl.java index fb8722d0156b..29442fd80cdf 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/smartPointers/SmartPointerManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/smartPointers/SmartPointerManagerImpl.java @@ -29,7 +29,7 @@ import com.intellij.openapi.util.Key; import com.intellij.openapi.util.ProperTextRange; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.reference.SoftReference; import com.intellij.util.containers.UnsafeWeakList; import org.jetbrains.annotations.NotNull; @@ -72,7 +72,7 @@ public class SmartPointerManagerImpl extends SmartPointerManager { } } - for (DocumentWindow injectedDoc : InjectedLanguageUtil.getCachedInjectedDocuments(file)) { + for (DocumentWindow injectedDoc : InjectedLanguageFacadeImpl.getCachedInjectedDocuments(file)) { PsiFile injectedFile = psiDocumentManager.getPsiFile(injectedDoc); if (injectedFile == null) continue; RangeMarker cachedMarker = getCachedRangeMarkerToInjectedFragment(injectedFile); @@ -114,7 +114,7 @@ public class SmartPointerManagerImpl extends SmartPointerManager { } } - for (DocumentWindow injectedDoc : InjectedLanguageUtil.getCachedInjectedDocuments(file)) { + for (DocumentWindow injectedDoc : InjectedLanguageFacadeImpl.getCachedInjectedDocuments(file)) { PsiFile injectedFile = psiDocumentManager.getPsiFile(injectedDoc); if (injectedFile == null) continue; unfastenBelts(injectedFile, 0); @@ -145,7 +145,7 @@ public class SmartPointerManagerImpl extends SmartPointerManager { } final PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(file.getProject()); - for (Document document : InjectedLanguageUtil.getCachedInjectedDocuments(file)) { + for (Document document : InjectedLanguageFacadeImpl.getCachedInjectedDocuments(file)) { PsiFile injectedfile = psiDocumentManager.getPsiFile(document); if (injectedfile == null) continue; _synchronizePointers(injectedfile); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java b/platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java index 42b4ee1f167b..1f87406009a6 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java @@ -45,7 +45,7 @@ import com.intellij.psi.impl.source.codeStyle.CodeEditUtil; import com.intellij.psi.impl.source.codeStyle.CodeFormatterFacade; import com.intellij.psi.impl.source.codeStyle.IndentHelperImpl; import com.intellij.psi.impl.source.tree.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.util.LocalTimeCounter; import com.intellij.util.text.CharArrayUtil; import org.jetbrains.annotations.TestOnly; @@ -168,7 +168,7 @@ public class PostprocessReformattingAspect implements PomModelAspect { if (changeSet == null) return; final PsiElement psiElement = changeSet.getRootElement().getPsi(); if (psiElement == null) return; - PsiFile containingFile = InjectedLanguageUtil.getTopLevelFile(psiElement); + PsiFile containingFile = InjectedLanguageFacadeImpl.getTopLevelFile(psiElement); final FileViewProvider viewProvider = containingFile.getViewProvider(); if (!viewProvider.isEventSystemEnabled()) return; diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java index d9af7a4b628a..f6be88df1c35 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java @@ -45,7 +45,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.formatter.DocumentBasedFormattingModel; import com.intellij.psi.impl.source.PostprocessReformattingAspect; import com.intellij.psi.impl.source.SourceTreeToPsiMap; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtilBase; import com.intellij.testFramework.LightVirtualFile; @@ -88,7 +88,7 @@ public class CodeFormatterFacade { final Document document = file.getViewProvider().getDocument(); final RangeMarker rangeMarker = document != null && endOffset < document.getTextLength()? document.createRangeMarker(startOffset, endOffset):null; - PsiElement elementToFormat = document instanceof DocumentWindow ? InjectedLanguageUtil.getTopLevelFile(file) : psiElement; + PsiElement elementToFormat = document instanceof DocumentWindow ? InjectedLanguageFacadeImpl.getTopLevelFile(file) : psiElement; final PsiFile fileToFormat = elementToFormat.getContainingFile(); final FormattingModelBuilder builder = LanguageFormatting.INSTANCE.forContext(fileToFormat); @@ -137,7 +137,7 @@ public class CodeFormatterFacade { Document document = PsiDocumentManager.getInstance(project).getDocument(file); final List textRanges = ranges.getRanges(); if (document instanceof DocumentWindow) { - file = InjectedLanguageUtil.getTopLevelFile(file); + file = InjectedLanguageFacadeImpl.getTopLevelFile(file); final DocumentWindow documentWindow = (DocumentWindow)document; for (FormatTextRanges.FormatTextRange range : textRanges) { range.setTextRange(documentWindow.injectedToHost(range.getTextRange())); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java index c0d69b38c25c..b6685b1e5e08 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java @@ -38,7 +38,7 @@ import com.intellij.psi.impl.CheckUtil; import com.intellij.psi.impl.source.PostprocessReformattingAspect; import com.intellij.psi.impl.source.SourceTreeToPsiMap; import com.intellij.psi.impl.source.tree.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.util.PsiUtilBase; import com.intellij.util.CharTable; import com.intellij.util.IncorrectOperationException; @@ -274,7 +274,7 @@ public class CodeStyleManagerImpl extends CodeStyleManager { TextRange textRange = addedElement.getTextRange(); final Document document = fileViewProvider.getDocument(); if (document instanceof DocumentWindow) { - containingFile = InjectedLanguageUtil.getTopLevelFile(containingFile); + containingFile = InjectedLanguageFacadeImpl.getTopLevelFile(containingFile); textRange = ((DocumentWindow)document).injectedToHost(textRange); } @@ -614,7 +614,7 @@ public class CodeStyleManagerImpl extends CodeStyleManager { if (!(astNode instanceof FileElement)) { return new Pair(null, null); } - PsiElement elementAt = InjectedLanguageUtil.findInjectedElementNoCommit(file, offset); + PsiElement elementAt = InjectedLanguageFacadeImpl.findInjectedElementNoCommit(file, offset); final CharTable charTable = ((FileElement)astNode).getCharTable(); if (elementAt == null) { elementAt = findElementInTreeWithFormatterEnabled(file, offset); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerRunnable.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerRunnable.java index de0243002b23..3862e08e4749 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerRunnable.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerRunnable.java @@ -28,7 +28,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.formatter.DocumentBasedFormattingModel; import com.intellij.psi.impl.source.SourceTreeToPsiMap; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.text.CharArrayUtil; import org.jetbrains.annotations.Nullable; @@ -56,7 +56,7 @@ abstract class CodeStyleManagerRunnable { Document document = documentManager.getDocument(file); if (document instanceof DocumentWindow) { final DocumentWindow documentWindow = (DocumentWindow)document; - final PsiFile topLevelFile = InjectedLanguageUtil.getTopLevelFile(file); + final PsiFile topLevelFile = InjectedLanguageFacadeImpl.getTopLevelFile(file); if (!file.equals(topLevelFile)) { if (range != null) { range = documentWindow.injectedToHost(range); @@ -125,7 +125,7 @@ abstract class CodeStyleManagerRunnable { return false; } - if (element instanceof PsiLanguageInjectionHost && InjectedLanguageUtil.hasInjections((PsiLanguageInjectionHost)element)) { + if (element instanceof PsiLanguageInjectionHost && InjectedLanguageFacadeImpl.hasInjections((PsiLanguageInjectionHost)element)) { return false; } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java index 2d73b9b02f82..b76d8c89d481 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java @@ -25,7 +25,7 @@ import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.util.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -306,7 +306,7 @@ public class FileReferenceSet { @Nullable private PsiFile getContainingFile() { - final PsiFile file = InjectedLanguageUtil.getTopLevelFile(myElement.getContainingFile()); + final PsiFile file = InjectedLanguageFacadeImpl.getTopLevelFile(myElement.getContainingFile()); if (file == null) { LOG.error("Invalid element: " + myElement); } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedFileViewProvider.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedFileViewProvider.java index 4cd558854598..21b6a6a4841c 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedFileViewProvider.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedFileViewProvider.java @@ -90,7 +90,7 @@ public class InjectedFileViewProvider extends SingleRootFileViewProvider impleme PsiFile hostFile = documentManager.getPsiFile(hostDocument); Language language = getBaseLanguage(); PsiFile file = getPsi(language); - final Language hostFileLanguage = InjectedLanguageUtil.getTopLevelFile(file).getLanguage(); + final Language hostFileLanguage = InjectedLanguageFacadeImpl.getTopLevelFile(file).getLanguage(); PsiFile hostPsiFileCopy = (PsiFile)hostFile.copy(); Segment firstTextRange = oldDocumentWindow.getHostRanges()[0]; PsiElement hostElementCopy = hostPsiFileCopy.getViewProvider().findElementAt(firstTextRange.getStartOffset(), hostFileLanguage); @@ -108,7 +108,7 @@ public class InjectedFileViewProvider extends SingleRootFileViewProvider impleme for (PsiElement current = hostElementCopy; current != null && current != hostPsiFileCopy; current = current.getParent()) { current.putUserData(LANGUAGE_FOR_INJECTED_COPY_KEY, language); try { - InjectedLanguageUtil.enumerate(current, hostPsiFileCopy, false, visitor); + InjectedLanguageFacadeImpl.enumerate(current, hostPsiFileCopy, false, visitor); } finally { current.putUserData(LANGUAGE_FOR_INJECTED_COPY_KEY, null); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageFacadeImpl.java similarity index 98% rename from platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java rename to platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageFacadeImpl.java index 11784f3dcfb9..d885166ad175 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageFacadeImpl.java @@ -30,6 +30,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.*; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; +import com.intellij.psi.impl.InjectedLanguageFacade; import com.intellij.psi.impl.PsiManagerEx; import com.intellij.psi.impl.PsiParameterizedCachedValue; import com.intellij.psi.impl.source.DummyHolder; @@ -45,7 +46,7 @@ import java.util.List; /** * @author cdr */ -public class InjectedLanguageUtil { +public class InjectedLanguageFacadeImpl extends InjectedLanguageFacade { static final Key, TextRange>>> HIGHLIGHT_TOKENS = Key.create("HIGHLIGHT_TOKENS"); public static void forceInjectionOnElement(@NotNull PsiElement host) { @@ -75,8 +76,9 @@ public class InjectedLanguageUtil { return host; } + @Override @Nullable - public static List> getInjectedPsiFiles(@NotNull final PsiElement host) { + public List> getInjectedPsiFiles(@NotNull final PsiElement host) { if (!(host instanceof PsiLanguageInjectionHost) || !((PsiLanguageInjectionHost) host).isValidHost()) { return null; } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java index 4046517f7c0b..8a086947820c 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java @@ -131,7 +131,7 @@ public class InjectedLanguageManagerImpl extends InjectedLanguageManager impleme if (hostPsiFile == null) return; final CopyOnWriteArrayList injected = - (CopyOnWriteArrayList)InjectedLanguageUtil.getCachedInjectedDocuments(hostPsiFile); + (CopyOnWriteArrayList)InjectedLanguageFacadeImpl.getCachedInjectedDocuments(hostPsiFile); if (injected.isEmpty()) return; if (myProgress.isCanceled()) { @@ -157,7 +157,7 @@ public class InjectedLanguageManagerImpl extends InjectedLanguageManager impleme } final DocumentWindow[] stillInjectedDocument = {null}; // it is here where the reparse happens and old file contents replaced - InjectedLanguageUtil.enumerate(element, hostPsiFile, true, new PsiLanguageInjectionHost.InjectedPsiVisitor() { + InjectedLanguageFacadeImpl.enumerate(element, hostPsiFile, true, new PsiLanguageInjectionHost.InjectedPsiVisitor() { @Override public void visit(@NotNull PsiFile injectedPsi, @NotNull List places) { stillInjectedDocument[0] = (DocumentWindow)injectedPsi.getViewProvider().getDocument(); @@ -181,7 +181,8 @@ public class InjectedLanguageManagerImpl extends InjectedLanguageManager impleme @Override public void run() { if (myProgress.isCanceled()) return; - JobLauncher.getInstance().invokeConcurrentlyUnderProgress(new ArrayList(injected), myProgress, !synchronously, commitProcessor); + JobLauncher.getInstance().invokeConcurrentlyUnderProgress(new ArrayList(injected), myProgress, !synchronously, + commitProcessor); } }; @@ -332,7 +333,7 @@ public class InjectedLanguageManagerImpl extends InjectedLanguageManager impleme @SuppressWarnings({"ConstantConditions", "unchecked"}) @NotNull public List intersectWithAllEditableFragments(@NotNull PsiFile injectedPsi, @NotNull TextRange rangeToEdit) { - Place shreds = InjectedLanguageUtil.getShreds(injectedPsi); + Place shreds = InjectedLanguageFacadeImpl.getShreds(injectedPsi); if (shreds == null) return Collections.emptyList(); Object result = null; // optimization: TextRange or ArrayList int count = 0; @@ -380,12 +381,12 @@ public class InjectedLanguageManagerImpl extends InjectedLanguageManager impleme @Override public PsiElement findInjectedElementAt(@NotNull PsiFile hostFile, int hostDocumentOffset) { - return InjectedLanguageUtil.findInjectedElementNoCommit(hostFile, hostDocumentOffset); + return InjectedLanguageFacadeImpl.findInjectedElementNoCommit(hostFile, hostDocumentOffset); } @Override public void dropFileCaches(@NotNull PsiFile file) { - InjectedLanguageUtil.clearCachedInjectedFragmentsForFile(file); + InjectedLanguageFacadeImpl.clearCachedInjectedFragmentsForFile(file); } private final Map myInjectorsClone = new HashMap(); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/MultiHostRegistrarImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/MultiHostRegistrarImpl.java index d1ee84f27989..19ca2be6c298 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/MultiHostRegistrarImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/MultiHostRegistrarImpl.java @@ -256,7 +256,7 @@ public class MultiHostRegistrarImpl implements MultiHostRegistrar, ModificationT PsiFile newFile = registerDocument(documentWindow, psiFile, place, myHostPsiFile, documentManager); boolean mergeHappened = newFile != psiFile; if (mergeHappened) { - InjectedLanguageUtil.clearCaches(psiFile, documentWindow); + InjectedLanguageFacadeImpl.clearCaches(psiFile, documentWindow); psiFile = newFile; viewProvider = (InjectedFileViewProvider)psiFile.getViewProvider(); documentWindow = (DocumentWindowImpl)viewProvider.getDocument(); @@ -274,7 +274,7 @@ public class MultiHostRegistrarImpl implements MultiHostRegistrar, ModificationT try { List, TextRange>> tokens = obtainHighlightTokensFromLexer(myLanguage, outChars, escapers, place, virtualFile, myProject); - psiFile.putUserData(InjectedLanguageUtil.HIGHLIGHT_TOKENS, tokens); + psiFile.putUserData(InjectedLanguageFacadeImpl.HIGHLIGHT_TOKENS, tokens); } catch (ProcessCanceledException e) { throw e; @@ -385,7 +385,7 @@ public class MultiHostRegistrarImpl implements MultiHostRegistrar, ModificationT final Place shreds, final PsiFile hostPsiFile, final PsiDocumentManager documentManager) { - List injected = InjectedLanguageUtil.getCachedInjectedDocuments(hostPsiFile); + List injected = InjectedLanguageFacadeImpl.getCachedInjectedDocuments(hostPsiFile); for (int i = injected.size()-1; i>=0; i--) { DocumentWindowImpl oldDocument = (DocumentWindowImpl)injected.get(i); diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/FileReferenceContextUtil.java b/platform/lang-impl/src/com/intellij/refactoring/move/FileReferenceContextUtil.java index e5fafd442a26..a15dfa42e4f2 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/move/FileReferenceContextUtil.java +++ b/platform/lang-impl/src/com/intellij/refactoring/move/FileReferenceContextUtil.java @@ -22,7 +22,7 @@ import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReference; import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceOwner; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.HashMap; import org.jetbrains.annotations.NotNull; @@ -43,10 +43,10 @@ public class FileReferenceContextUtil { element.accept(new PsiRecursiveElementWalkingVisitor(true) { @Override public void visitElement(PsiElement element) { if (element instanceof PsiLanguageInjectionHost) { - InjectedLanguageUtil.enumerate(element, new PsiLanguageInjectionHost.InjectedPsiVisitor() { + InjectedLanguageFacadeImpl.enumerate(element, new PsiLanguageInjectionHost.InjectedPsiVisitor() { public void visit(@NotNull final PsiFile injectedPsi, @NotNull final List places) { encodeFileReferences(injectedPsi); - } + } }); } @@ -89,7 +89,7 @@ public class FileReferenceContextUtil { } if (element instanceof PsiLanguageInjectionHost) { - InjectedLanguageUtil.enumerate(element, new PsiLanguageInjectionHost.InjectedPsiVisitor() { + InjectedLanguageFacadeImpl.enumerate(element, new PsiLanguageInjectionHost.InjectedPsiVisitor() { public void visit(@NotNull final PsiFile injectedPsi, @NotNull final List places) { decodeFileReferences(injectedPsi); } diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java b/platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java index c23fe24e664d..3b5c3f49bdfd 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java @@ -31,7 +31,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Condition; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.meta.PsiMetaOwner; import com.intellij.psi.meta.PsiWritableMetaData; import com.intellij.refactoring.RefactoringBundle; @@ -57,7 +57,7 @@ public class PsiElementRenameHandler implements RenameHandler { public void invoke(@NotNull Project project, Editor editor, PsiFile file, DataContext dataContext) { PsiElement element = getElement(dataContext); editor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE); - final PsiElement nameSuggestionContext = InjectedLanguageUtil.findElementAtNoCommit(file, editor.getCaretModel().getOffset()); + final PsiElement nameSuggestionContext = InjectedLanguageFacadeImpl.findElementAtNoCommit(file, editor.getCaretModel().getOffset()); invoke(element, project, nameSuggestionContext, editor); } @@ -127,7 +127,7 @@ public class PsiElementRenameHandler implements RenameHandler { } } - if (InjectedLanguageUtil.isInInjectedLanguagePrefixSuffix(element)) { + if (InjectedLanguageFacadeImpl.isInInjectedLanguagePrefixSuffix(element)) { final String message = RefactoringBundle.message("error.in.injected.lang.prefix.suffix", UsageViewUtil.getType(element)); return RefactoringBundle.getCannotRefactorMessage(message); } diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java index b7e94bc7f93d..971a0b98d4f6 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java @@ -62,7 +62,7 @@ import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.util.*; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.search.LocalSearchScope; import com.intellij.psi.search.ProjectScope; import com.intellij.psi.search.PsiSearchHelper; @@ -151,7 +151,7 @@ public abstract class InplaceRefactoring { public boolean performInplaceRefactoring(final LinkedHashSet nameSuggestions) { myNameSuggestions = nameSuggestions; - if (InjectedLanguageUtil.isInInjectedLanguagePrefixSuffix(myElementToRename)) { + if (InjectedLanguageFacadeImpl.isInInjectedLanguagePrefixSuffix(myElementToRename)) { return false; } @@ -274,7 +274,7 @@ public abstract class InplaceRefactoring { } else { revertState(); - final TemplateState templateState = TemplateManagerImpl.getTemplateState(InjectedLanguageUtil.getTopLevelEditor(myEditor)); + final TemplateState templateState = TemplateManagerImpl.getTemplateState(InjectedLanguageFacadeImpl.getTopLevelEditor(myEditor)); if (templateState != null) { templateState.gotoEnd(true); } @@ -332,7 +332,7 @@ public abstract class InplaceRefactoring { TextRange range = myScope.getTextRange(); assert range != null; myHighlighters = new ArrayList(); - Editor topLevelEditor = InjectedLanguageUtil.getTopLevelEditor(myEditor); + Editor topLevelEditor = InjectedLanguageFacadeImpl.getTopLevelEditor(myEditor); topLevelEditor.getCaretModel().moveToOffset(range.getStartOffset()); TemplateManager.getInstance(myProject).startTemplate(topLevelEditor, template, templateListener); @@ -505,7 +505,7 @@ public abstract class InplaceRefactoring { if (myOldName == null) return; CommandProcessor.getInstance().executeCommand(myProject, new Runnable() { public void run() { - final Editor topLevelEditor = InjectedLanguageUtil.getTopLevelEditor(myEditor); + final Editor topLevelEditor = InjectedLanguageFacadeImpl.getTopLevelEditor(myEditor); ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { final TemplateState state = TemplateManagerImpl.getTemplateState(topLevelEditor); @@ -748,7 +748,7 @@ public abstract class InplaceRefactoring { finally { if (!bind) { try { - ((EditorImpl)InjectedLanguageUtil.getTopLevelEditor(myEditor)).stopDumb(); + ((EditorImpl)InjectedLanguageFacadeImpl.getTopLevelEditor(myEditor)).stopDumb(); } finally { FinishMarkAction.finish(myProject, myEditor, myMarkAction); diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenameHandler.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenameHandler.java index 45d74ff03420..f6a107357ad9 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenameHandler.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenameHandler.java @@ -28,7 +28,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiNameIdentifierOwner; import com.intellij.psi.PsiNamedElement; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.rename.RenamePsiElementProcessor; import org.jetbrains.annotations.NotNull; @@ -73,7 +73,7 @@ public class MemberInplaceRenameHandler extends VariableInplaceRenameHandler { else { final InplaceRefactoring inplaceRefactoring = editor.getUserData(InplaceRefactoring.INPLACE_RENAMER); if (inplaceRefactoring != null && inplaceRefactoring.getClass() == MemberInplaceRenamer.class) { - final TemplateState templateState = TemplateManagerImpl.getTemplateState(InjectedLanguageUtil.getTopLevelEditor(editor)); + final TemplateState templateState = TemplateManagerImpl.getTemplateState(InjectedLanguageFacadeImpl.getTopLevelEditor(editor)); if (templateState != null) { templateState.gotoEnd(true); } diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java index 6d5477e406f2..1dd8e81c2091 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java @@ -30,7 +30,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.search.LocalSearchScope; import com.intellij.psi.search.ProjectScope; import com.intellij.psi.search.SearchScope; @@ -202,7 +202,7 @@ public class MemberInplaceRenamer extends VariableInplaceRenamer { } finally { try { - ((EditorImpl)InjectedLanguageUtil.getTopLevelEditor(myEditor)).stopDumb(); + ((EditorImpl)InjectedLanguageFacadeImpl.getTopLevelEditor(myEditor)).stopDumb(); } finally { FinishMarkAction.finish(myProject, myEditor, markAction); @@ -248,7 +248,7 @@ public class MemberInplaceRenamer extends VariableInplaceRenamer { @Override protected void revertStateOnFinish() { - final Editor editor = InjectedLanguageUtil.getTopLevelEditor(myEditor); + final Editor editor = InjectedLanguageFacadeImpl.getTopLevelEditor(myEditor); if (editor == FileEditorManager.getInstance(myProject).getSelectedTextEditor()) { ((EditorImpl)editor).startDumb(); } diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MyLookupExpression.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MyLookupExpression.java index 7db3a3693faf..70960742e739 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MyLookupExpression.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MyLookupExpression.java @@ -30,7 +30,7 @@ import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiNamedElement; import com.intellij.psi.codeStyle.SuggestedNameInfo; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.refactoring.rename.NameSuggestionProvider; import com.intellij.refactoring.rename.PreferrableNameSuggestionProvider; @@ -78,7 +78,7 @@ public class MyLookupExpression extends Expression { @Override public void handleInsert(InsertionContext context, LookupElement item) { if (shouldSelectAll) return; - final Editor topLevelEditor = InjectedLanguageUtil.getTopLevelEditor(context.getEditor()); + final Editor topLevelEditor = InjectedLanguageFacadeImpl.getTopLevelEditor(context.getEditor()); final TemplateState templateState = TemplateManagerImpl.getTemplateState(topLevelEditor); if (templateState != null) { final TextRange range = templateState.getCurrentVariableRange(); diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java index f52e6635ef16..222ca0db8098 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java @@ -32,7 +32,7 @@ import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.util.PsiUtilCore; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.rename.AutomaticRenamingDialog; @@ -249,7 +249,7 @@ public class VariableInplaceRenamer extends InplaceRefactoring { } finally { try { - ((EditorImpl)InjectedLanguageUtil.getTopLevelEditor(myEditor)).stopDumb(); + ((EditorImpl)InjectedLanguageFacadeImpl.getTopLevelEditor(myEditor)).stopDumb(); } finally { FinishMarkAction.finish(myProject, myEditor, markAction); @@ -298,7 +298,7 @@ public class VariableInplaceRenamer extends InplaceRefactoring { revertStateOnFinish(); } else { - ((EditorImpl)InjectedLanguageUtil.getTopLevelEditor(myEditor)).stopDumb(); + ((EditorImpl)InjectedLanguageFacadeImpl.getTopLevelEditor(myEditor)).stopDumb(); } } diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml index 3b6bb59d6ce7..e1305c2cc0e1 100644 --- a/platform/platform-resources/src/META-INF/LangExtensions.xml +++ b/platform/platform-resources/src/META-INF/LangExtensions.xml @@ -50,6 +50,8 @@ + > injectedPsi = InjectedLanguageUtil.getInjectedPsiFiles(host); + final List> injectedPsi = InjectedLanguageFacadeImpl.getInstance().getInjectedPsiFiles(host); return injectedPsi == null || injectedPsi.isEmpty(); } diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java index 83a6b160497a..3829287efc27 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java @@ -28,7 +28,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiLanguageInjectionHost; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.util.FileContentUtil; import com.intellij.util.IncorrectOperationException; import gnu.trove.THashSet; @@ -55,7 +55,7 @@ public class UnInjectLanguageAction implements IntentionAction, LowPriorityActio public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { final int offset = editor.getCaretModel().getOffset(); - final PsiFile psiFile = InjectedLanguageUtil.findInjectedPsiNoCommit(file, offset); + final PsiFile psiFile = InjectedLanguageFacadeImpl.findInjectedPsiNoCommit(file, offset); if (psiFile == null) return false; final LanguageInjectionSupport support = psiFile.getUserData(LanguageInjectionSupport.INJECTOR_SUPPORT); return support != null; @@ -70,7 +70,7 @@ public class UnInjectLanguageAction implements IntentionAction, LowPriorityActio } private static void invokeImpl(Project project, Editor editor, PsiFile file) { - final PsiFile psiFile = InjectedLanguageUtil.findInjectedPsiNoCommit(file, editor.getCaretModel().getOffset()); + final PsiFile psiFile = InjectedLanguageFacadeImpl.findInjectedPsiNoCommit(file, editor.getCaretModel().getOffset()); if (psiFile == null) return; final PsiLanguageInjectionHost host = InjectedLanguageManager.getInstance(project).getInjectionHost(psiFile); if (host == null) return; @@ -88,7 +88,7 @@ public class UnInjectLanguageAction implements IntentionAction, LowPriorityActio private static boolean defaultFunctionalityWorked(final PsiLanguageInjectionHost host) { final THashSet languages = new THashSet(); - final List> files = InjectedLanguageUtil.getInjectedPsiFiles(host); + final List> files = InjectedLanguageFacadeImpl.getInstance().getInjectedPsiFiles(host); if (files == null) return false; for (Pair pair : files) { for (Language lang = pair.first.getLanguage(); lang != null; lang = lang.getBaseLanguage()) { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/comment/CommentOnLineWithSourcePredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/comment/CommentOnLineWithSourcePredicate.java index a76a86fedbbe..ed366ec1b1ef 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/comment/CommentOnLineWithSourcePredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/comment/CommentOnLineWithSourcePredicate.java @@ -16,7 +16,7 @@ package com.siyeh.ipp.comment; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.javadoc.PsiDocComment; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; @@ -37,7 +37,7 @@ class CommentOnLineWithSourcePredicate implements PsiElementPredicate { } final PsiComment comment = (PsiComment)element; - if (comment instanceof PsiLanguageInjectionHost && InjectedLanguageUtil.hasInjections((PsiLanguageInjectionHost)comment)) { + if (comment instanceof PsiLanguageInjectionHost && InjectedLanguageFacadeImpl.hasInjections((PsiLanguageInjectionHost)comment)) { return false; } final IElementType type = comment.getTokenType(); diff --git a/plugins/android/testSrc/org/jetbrains/android/AndroidRenameTest.java b/plugins/android/testSrc/org/jetbrains/android/AndroidRenameTest.java index 6e022c678f55..c50973b5ae49 100644 --- a/plugins/android/testSrc/org/jetbrains/android/AndroidRenameTest.java +++ b/plugins/android/testSrc/org/jetbrains/android/AndroidRenameTest.java @@ -25,7 +25,7 @@ import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.refactoring.PackageWrapper; import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesProcessor; @@ -98,7 +98,7 @@ public class AndroidRenameTest extends AndroidTestCase { protected void run() throws Throwable { Editor editor = myFixture.getEditor(); PsiFile file = myFixture.getFile(); - Editor completionEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(editor, file); + Editor completionEditor = InjectedLanguageFacadeImpl.getEditorForInjectedLanguageNoCommit(editor, file); PsiElement element = TargetElementUtilBase.findTargetElement(completionEditor, TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED | TargetElementUtilBase.ELEMENT_NAME_ACCEPTED); assert element != null; diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/InjectedGroovyTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/InjectedGroovyTest.groovy index a2a9c6d6916f..ec9a72e32c68 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/InjectedGroovyTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/InjectedGroovyTest.groovy @@ -16,13 +16,15 @@ package org.jetbrains.plugins.groovy.completion import com.intellij.psi.PsiFile -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil + import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.xml.XmlText import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.intellij.plugins.intelliLang.inject.TemporaryPlacesRegistry import org.jetbrains.plugins.groovy.GroovyFileType +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl + /** * @author peter */ @@ -52,7 +54,7 @@ s.codePointAt(0) def offset = psiFile.getText().indexOf('"') + 1 assertNotNull(psiFile.findElementAt(offset)); - assert InjectedLanguageUtil.findInjectedPsiNoCommit(psiFile, offset) + assert InjectedLanguageFacadeImpl.findInjectedPsiNoCommit(psiFile, offset) } public void testRegexInjections() { @@ -60,8 +62,8 @@ s.codePointAt(0) final PsiFile psiFile = myFixture.configureByText("script.groovy", 'new groovy.lang.GroovyShell().evaluate(/ blah-blah-blah \\ language won\'t be injected here /)'); assertNotNull(psiFile); - assert InjectedLanguageUtil.findInjectedPsiNoCommit(psiFile, psiFile.getText().indexOf('blah') + 1) - assert InjectedLanguageUtil.findInjectedPsiNoCommit(psiFile, psiFile.getText().indexOf('injected') + 1) + assert InjectedLanguageFacadeImpl.findInjectedPsiNoCommit(psiFile, psiFile.getText().indexOf('blah') + 1) + assert InjectedLanguageFacadeImpl.findInjectedPsiNoCommit(psiFile, psiFile.getText().indexOf('injected') + 1) } } diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/SuppressByCommentOutAction.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/SuppressByCommentOutAction.java index f674084163a0..dad8077bb62e 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/SuppressByCommentOutAction.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/SuppressByCommentOutAction.java @@ -24,7 +24,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; @@ -45,7 +45,7 @@ class SuppressByCommentOutAction extends SuppressIntentionAction { if (!CodeInsightUtilBase.preparePsiElementForWrite(element)) return; element = findJavaCodeUpThere(element); PsiFile file = element.getContainingFile(); - editor = InjectedLanguageUtil.openEditorFor(file, project); + editor = InjectedLanguageFacadeImpl.openEditorFor(file, project); int endOffset = element.getTextRange().getEndOffset(); int line = editor.getDocument().getLineNumber(endOffset); int lineEndOffset = editor.getDocument().getLineEndOffset(line); diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java b/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java index 2bf1a9205d96..407a4cf0ccdc 100644 --- a/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java +++ b/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java @@ -27,7 +27,7 @@ import com.intellij.openapi.fileEditor.impl.text.TextEditorPsiDataProvider; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.refactoring.actions.RenameElementAction; import com.intellij.refactoring.rename.NameSuggestionProvider; import com.intellij.refactoring.rename.RenameHandlerRegistry; @@ -86,7 +86,7 @@ public class RenameTo extends ShowSuggestions implements SpellCheckerQuickFix { HashMap map = new HashMap(); PsiElement psiElement = descriptor.getPsiElement(); PsiFile containingFile = psiElement.getContainingFile(); - Editor editor = InjectedLanguageUtil.openEditorFor(containingFile, project); + Editor editor = InjectedLanguageFacadeImpl.openEditorFor(containingFile, project); if (editor == null) { return; } diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/TokenizerBase.java b/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/TokenizerBase.java index 5210dbe5e639..d9b83abbd6c8 100644 --- a/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/TokenizerBase.java +++ b/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/TokenizerBase.java @@ -17,7 +17,7 @@ package com.intellij.spellchecker.tokenizer; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiLanguageInjectionHost; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.spellchecker.inspections.Splitter; import org.jetbrains.annotations.NotNull; @@ -37,7 +37,7 @@ public class TokenizerBase extends Tokenizer { @Override public void tokenize(@NotNull T element, TokenConsumer consumer) { - if (element instanceof PsiLanguageInjectionHost && InjectedLanguageUtil.hasInjections((PsiLanguageInjectionHost)element)) { + if (element instanceof PsiLanguageInjectionHost && InjectedLanguageFacadeImpl.hasInjections((PsiLanguageInjectionHost)element)) { return; } consumer.consumeToken(element, mySplitter); diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/XmlTextTokenizer.java b/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/XmlTextTokenizer.java index 3e66da49e6cb..3864f8e04691 100644 --- a/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/XmlTextTokenizer.java +++ b/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/XmlTextTokenizer.java @@ -18,7 +18,7 @@ package com.intellij.spellchecker.tokenizer; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.xml.XmlText; import com.intellij.psi.xml.XmlToken; import com.intellij.psi.xml.XmlTokenType; @@ -30,7 +30,7 @@ import java.util.List; public class XmlTextTokenizer extends Tokenizer { @Override public void tokenize(@NotNull XmlText element, TokenConsumer consumer) { - List> list = InjectedLanguageUtil.getInjectedPsiFiles(element); + List> list = InjectedLanguageFacadeImpl.getInstance().getInjectedPsiFiles(element); if (list != null && list.size() > 0) return; final PsiElement[] children = element.getChildren(); for (PsiElement child : children) { diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/XPathElementImpl.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/XPathElementImpl.java index 728bbee7c3d3..b4ffb6a8298d 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/XPathElementImpl.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/XPathElementImpl.java @@ -21,7 +21,7 @@ import com.intellij.lang.injection.InjectedLanguageManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; import com.intellij.psi.impl.PsiTreeDebugBuilder; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.util.IncorrectOperationException; import org.intellij.lang.xpath.XPath2ElementTypes; import org.intellij.lang.xpath.XPathElementTypes; @@ -141,7 +141,7 @@ public class XPathElementImpl extends ASTWrapperPsiElement implements XPathEleme } public final String getUnescapedText() { - if (InjectedLanguageUtil.isInInjectedLanguagePrefixSuffix(this)) { + if (InjectedLanguageFacadeImpl.isInInjectedLanguagePrefixSuffix(this)) { // do not attempt to decode text if PsiElement is part of prefix/suffix return getText(); } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java index 76887f89f3eb..a73a30a3e741 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiLanguageInjectionHost; import com.intellij.psi.impl.PsiFileEx; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.util.*; import com.intellij.psi.xml.*; import com.intellij.ui.LayeredIcon; @@ -88,7 +88,7 @@ public class XsltSupport { final XmlAttributeValue value = attribute.getValueElement(); if (value != null) { final List files = new SmartList(); - InjectedLanguageUtil.enumerate(value, new PsiLanguageInjectionHost.InjectedPsiVisitor() { + InjectedLanguageFacadeImpl.enumerate(value, new PsiLanguageInjectionHost.InjectedPsiVisitor() { public void visit(@NotNull PsiFile injectedPsi, @NotNull List places) { if (injectedPsi instanceof XPathFile) { files.add(injectedPsi); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/util/XsltCodeInsightUtil.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/util/XsltCodeInsightUtil.java index edf7225c60e2..65baf53f6eae 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/util/XsltCodeInsightUtil.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/util/XsltCodeInsightUtil.java @@ -23,7 +23,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiLanguageInjectionHost; import com.intellij.psi.PsiRecursiveElementVisitor; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.search.PsiElementProcessor; import com.intellij.psi.util.PsiElementFilter; import com.intellij.psi.util.PsiTreeUtil; @@ -125,7 +125,7 @@ public class XsltCodeInsightUtil { public static TextRange getRangeInsideHostingFile(XPathElement expr) { final PsiLanguageInjectionHost host = PsiTreeUtil.getContextOfType(expr, PsiLanguageInjectionHost.class, true); assert host != null; - final List> psi = InjectedLanguageUtil.getInjectedPsiFiles(host); + final List> psi = InjectedLanguageFacadeImpl.getInstance().getInjectedPsiFiles(host); assert psi != null; for (Pair pair : psi) { if (PsiTreeUtil.isAncestor(pair.first, expr, false)) { @@ -140,7 +140,7 @@ public class XsltCodeInsightUtil { public static TextRange getRangeInsideHost(XPathElement expr) { final PsiLanguageInjectionHost host = PsiTreeUtil.getContextOfType(expr, PsiLanguageInjectionHost.class, true); assert host != null; - final List> psi = InjectedLanguageUtil.getInjectedPsiFiles(host); + final List> psi = InjectedLanguageFacadeImpl.getInstance().getInjectedPsiFiles(host); assert psi != null; for (Pair pair : psi) { if (PsiTreeUtil.isAncestor(pair.first, expr, false)) { diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltXmlAnnotator.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltXmlAnnotator.java index 444410b9d045..236012e7e968 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltXmlAnnotator.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltXmlAnnotator.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiLanguageInjectionHost; import com.intellij.psi.XmlElementVisitor; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlAttributeValue; import org.intellij.lang.xpath.XPathFile; @@ -49,7 +49,7 @@ public class XsltXmlAnnotator extends XmlElementVisitor implements Annotator { if (s == null || s.length() == 0) { final PsiElement parent = value.getParent(); if (parent instanceof XmlAttribute && XsltSupport.isXPathAttribute((XmlAttribute)parent)) { - InjectedLanguageUtil.enumerate(value, new PsiLanguageInjectionHost.InjectedPsiVisitor() { + InjectedLanguageFacadeImpl.enumerate(value, new PsiLanguageInjectionHost.InjectedPsiVisitor() { @Override public void visit(@NotNull PsiFile injectedPsi, @NotNull List places) { if (injectedPsi instanceof XPathFile) { diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/Xslt2RefactoringTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/Xslt2RefactoringTest.java index 4f27becf8d88..2d65472b76d5 100644 --- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/Xslt2RefactoringTest.java +++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/Xslt2RefactoringTest.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.psi.formatter.xml.XmlCodeStyleSettings; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import org.intellij.lang.xpath.TestBase; import org.intellij.lang.xpath.psi.XPathExpression; import org.intellij.lang.xpath.xslt.refactoring.RefactoringOptions; @@ -77,8 +77,8 @@ public class Xslt2RefactoringTest extends TestBase { } }; - final PsiFile file = InjectedLanguageUtil.findInjectedPsiNoCommit(myFixture.getFile(), editor.getCaretModel().getOffset()); - final Editor editorWindow = InjectedLanguageUtil.getInjectedEditorForInjectedFile(editor, file); + final PsiFile file = InjectedLanguageFacadeImpl.findInjectedPsiNoCommit(myFixture.getFile(), editor.getCaretModel().getOffset()); + final Editor editorWindow = InjectedLanguageFacadeImpl.getInjectedEditorForInjectedFile(editor, file); assertTrue(editorWindow instanceof EditorWindow); action.invoke(myFixture.getProject(), editorWindow, file, null); diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/GenericValueReferenceProvider.java b/xml/dom-impl/src/com/intellij/util/xml/impl/GenericValueReferenceProvider.java index 4040ade8572a..8d53fae183a3 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/GenericValueReferenceProvider.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/GenericValueReferenceProvider.java @@ -19,7 +19,7 @@ import com.intellij.javaee.web.PsiReferenceConverter; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.xml.*; import com.intellij.util.ProcessingContext; import com.intellij.util.ReflectionCache; @@ -61,10 +61,10 @@ public class GenericValueReferenceProvider extends PsiReferenceProvider { if (psiElement instanceof XmlTag) { for (XmlText text : ((XmlTag)psiElement).getValue().getTextElements()) { - if (InjectedLanguageUtil.hasInjections((PsiLanguageInjectionHost)text)) return PsiReference.EMPTY_ARRAY; + if (InjectedLanguageFacadeImpl.hasInjections((PsiLanguageInjectionHost)text)) return PsiReference.EMPTY_ARRAY; } } else { - if (InjectedLanguageUtil.hasInjections((PsiLanguageInjectionHost)psiElement)) return PsiReference.EMPTY_ARRAY; + if (InjectedLanguageFacadeImpl.hasInjections((PsiLanguageInjectionHost)psiElement)) return PsiReference.EMPTY_ARRAY; } final GenericDomValue domValue = (GenericDomValue)domElement; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/AbstractDomDeclarationSearcher.java b/xml/dom-openapi/src/com/intellij/util/xml/AbstractDomDeclarationSearcher.java index f11d5ada84e9..ed613ed5d3c0 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/AbstractDomDeclarationSearcher.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/AbstractDomDeclarationSearcher.java @@ -19,7 +19,7 @@ import com.intellij.pom.PomDeclarationSearcher; import com.intellij.pom.PomTarget; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiLanguageInjectionHost; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.tree.IElementType; import com.intellij.psi.xml.*; import com.intellij.util.Consumer; @@ -42,7 +42,7 @@ public abstract class AbstractDomDeclarationSearcher extends PomDeclarationSearc if (tokenType == XmlTokenType.XML_DATA_CHARACTERS && psiElement.getParent() instanceof XmlText && psiElement.getParent().getParent() instanceof XmlTag) { final XmlTag tag = (XmlTag)psiElement.getParent().getParent(); for (XmlText text : tag.getValue().getTextElements()) { - if (InjectedLanguageUtil.hasInjections((PsiLanguageInjectionHost)text)) { + if (InjectedLanguageFacadeImpl.hasInjections((PsiLanguageInjectionHost)text)) { return; } } @@ -50,7 +50,7 @@ public abstract class AbstractDomDeclarationSearcher extends PomDeclarationSearc nameElement = domManager.getDomElement(tag); } else if (tokenType == XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN && psiElement.getParent() instanceof XmlAttributeValue && psiElement.getParent().getParent() instanceof XmlAttribute) { final PsiElement attributeValue = psiElement.getParent(); - if (InjectedLanguageUtil.hasInjections((PsiLanguageInjectionHost)attributeValue)) { + if (InjectedLanguageFacadeImpl.hasInjections((PsiLanguageInjectionHost)attributeValue)) { return; } nameElement = domManager.getDomElement((XmlAttribute)attributeValue.getParent()); diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlAutoPopupHandler.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlAutoPopupHandler.java index 97cbbcef64c8..9995f3202056 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlAutoPopupHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlAutoPopupHandler.java @@ -26,7 +26,7 @@ import com.intellij.psi.FileViewProvider; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiWhiteSpace; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.templateLanguages.TemplateLanguageFileViewProvider; import com.intellij.psi.xml.XmlTag; import com.intellij.xml.util.XmlUtil; @@ -61,7 +61,7 @@ public class XmlAutoPopupHandler extends TypedHandlerDelegate { public boolean value(PsiFile file) { int offset = editor.getCaretModel().getOffset(); - PsiElement lastElement = InjectedLanguageUtil.findElementAtNoCommit(file, offset - 1); + PsiElement lastElement = InjectedLanguageFacadeImpl.findElementAtNoCommit(file, offset - 1); if (lastElement instanceof PsiFile) { //the very end of an injected file lastElement = file.findElementAt(offset - 1); } diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMover.java b/xml/impl/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMover.java index fb3329487988..c3cc4d979ee1 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMover.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMover.java @@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.psi.html.HtmlTag; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlFile; @@ -56,8 +56,8 @@ class XmlMover extends LineMover { final XmlText text2 = PsiTreeUtil.getParentOfType(movedEndElement, XmlText.class); // Let's do not care about injections for this mover - if ( ( text != null && InjectedLanguageUtil.getInjectedPsiFiles(text) != null) || - ( text2 != null && InjectedLanguageUtil.getInjectedPsiFiles(text2) != null)) { + if ( ( text != null && InjectedLanguageFacadeImpl.getInstance().getInjectedPsiFiles(text) != null) || + ( text2 != null && InjectedLanguageFacadeImpl.getInstance().getInjectedPsiFiles(text2) != null)) { return false; } diff --git a/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlFilterLexer.java b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlFilterLexer.java index 075c8b9bbc2b..f0d3a014665d 100644 --- a/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlFilterLexer.java +++ b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlFilterLexer.java @@ -19,7 +19,7 @@ import com.intellij.lang.Language; import com.intellij.lang.xml.XMLLanguage; import com.intellij.lexer.Lexer; import com.intellij.psi.impl.cache.impl.BaseFilterLexer; -import com.intellij.psi.impl.cache.impl.CacheUtil; +import com.intellij.psi.impl.cache.CacheUtil; import com.intellij.psi.impl.cache.impl.OccurrenceConsumer; import com.intellij.psi.search.UsageSearchContext; import com.intellij.psi.tree.IElementType; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java index e5dd01f0d588..7adad3fb99e4 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java @@ -37,7 +37,7 @@ import com.intellij.psi.impl.source.codeStyle.CodeEditUtil; import com.intellij.psi.impl.source.tree.FileElement; import com.intellij.psi.impl.source.tree.LeafElement; import com.intellij.psi.impl.source.tree.TreeElement; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.impl.source.tree.injected.XmlTextLiteralEscaper; import com.intellij.psi.impl.source.xml.behavior.DefaultXmlPsiPolicy; import com.intellij.psi.tree.IElementType; @@ -365,7 +365,7 @@ public class XmlTextImpl extends XmlElementImpl implements XmlText, PsiLanguageI @Nullable public List> getInjectedPsi() { - return InjectedLanguageUtil.getInjectedPsiFiles(this); + return InjectedLanguageFacadeImpl.getInstance().getInjectedPsiFiles(this); } public TextRange getCDATAInterior() { @@ -520,6 +520,6 @@ public class XmlTextImpl extends XmlElementImpl implements XmlText, PsiLanguageI return new XmlTextLiteralEscaper(this); } public void processInjectedPsi(@NotNull InjectedPsiVisitor visitor) { - InjectedLanguageUtil.enumerate(this, visitor); + InjectedLanguageFacadeImpl.enumerate(this, visitor); } } diff --git a/xml/impl/src/com/intellij/xml/util/HtmlUtil.java b/xml/impl/src/com/intellij/xml/util/HtmlUtil.java index 27207f7d8178..1e8fb921b9c9 100644 --- a/xml/impl/src/com/intellij/xml/util/HtmlUtil.java +++ b/xml/impl/src/com/intellij/xml/util/HtmlUtil.java @@ -38,7 +38,7 @@ import com.intellij.psi.html.HtmlTag; import com.intellij.psi.impl.source.html.HtmlDocumentImpl; import com.intellij.psi.impl.source.parsing.xml.HtmlBuilderDriver; import com.intellij.psi.impl.source.parsing.xml.XmlBuilder; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl; import com.intellij.psi.impl.source.xml.XmlAttributeImpl; import com.intellij.psi.templateLanguages.TemplateLanguageFileViewProvider; import com.intellij.psi.templateLanguages.TemplateLanguageUtil; @@ -471,7 +471,7 @@ public class HtmlUtil { for (final XmlText text : texts) { for (PsiElement _element : text.getChildren()) { if (_element instanceof PsiLanguageInjectionHost) { - InjectedLanguageUtil.enumerate(_element, injectedPsiVisitor); + InjectedLanguageFacadeImpl.enumerate(_element, injectedPsiVisitor); } } } @@ -481,7 +481,7 @@ public class HtmlUtil { if (comments != null && comments.length > 0) { for (final XmlComment comment : comments) { if (comment instanceof PsiLanguageInjectionHost) { - InjectedLanguageUtil.enumerate(comment, injectedPsiVisitor); + InjectedLanguageFacadeImpl.enumerate(comment, injectedPsiVisitor); } } } From a5207c26605810c78cdf2247806a0a6b2108726d Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Wed, 13 Jun 2012 17:04:09 +0200 Subject: [PATCH 11/61] move ReferencesSearch to "indexing" --- .../impl/quickfix/InitializeFinalFieldInConstructorFix.java | 1 - .../intellij/psi/impl/search/ConstructorReferencesSearcher.java | 1 - .../intellij/refactoring/inline/InlineConstantFieldHandler.java | 2 -- .../com/intellij/refactoring/inline/InlineMethodProcessor.java | 1 - .../src/com/intellij/psi/search/SearchRequestQuery.java | 0 .../com/intellij/psi/search/searches/ReferenceDescriptor.java | 0 .../src/com/intellij/psi/search/searches/ReferencesSearch.java | 0 7 files changed, 5 deletions(-) rename platform/{lang-api => indexing-api}/src/com/intellij/psi/search/SearchRequestQuery.java (100%) rename platform/{lang-api => indexing-api}/src/com/intellij/psi/search/searches/ReferenceDescriptor.java (100%) rename platform/{lang-api => indexing-api}/src/com/intellij/psi/search/searches/ReferencesSearch.java (100%) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java index 127aacc4a9a4..30509b05c13f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java @@ -32,7 +32,6 @@ import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiTypesUtil; import com.intellij.psi.util.PsiUtil; -import com.intellij.refactoring.util.RefactoringUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/java/java-impl/src/com/intellij/psi/impl/search/ConstructorReferencesSearcher.java b/java/java-impl/src/com/intellij/psi/impl/search/ConstructorReferencesSearcher.java index daa403fbb5cd..c64e469aab63 100644 --- a/java/java-impl/src/com/intellij/psi/impl/search/ConstructorReferencesSearcher.java +++ b/java/java-impl/src/com/intellij/psi/impl/search/ConstructorReferencesSearcher.java @@ -2,7 +2,6 @@ package com.intellij.psi.impl.search; import com.intellij.openapi.application.QueryExecutorBase; import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiManager; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiReference; import com.intellij.psi.search.searches.ReferencesSearch; diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldHandler.java index c2b22629b613..78b8beb65084 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldHandler.java @@ -29,8 +29,6 @@ import com.intellij.refactoring.HelpID; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.util.CommonRefactoringUtil; -import java.util.Collection; - /** * @author ven */ diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java index ce76e8bc97a0..8dd9acaed0dc 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java @@ -45,7 +45,6 @@ import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.introduceParameter.Util; import com.intellij.refactoring.rename.NonCodeUsageInfoFactory; import com.intellij.refactoring.rename.RenameJavaVariableProcessor; -import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceSimpleDeleteUsageInfo; import com.intellij.refactoring.util.*; import com.intellij.usageView.UsageInfo; import com.intellij.usageView.UsageViewDescriptor; diff --git a/platform/lang-api/src/com/intellij/psi/search/SearchRequestQuery.java b/platform/indexing-api/src/com/intellij/psi/search/SearchRequestQuery.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/search/SearchRequestQuery.java rename to platform/indexing-api/src/com/intellij/psi/search/SearchRequestQuery.java diff --git a/platform/lang-api/src/com/intellij/psi/search/searches/ReferenceDescriptor.java b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferenceDescriptor.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/search/searches/ReferenceDescriptor.java rename to platform/indexing-api/src/com/intellij/psi/search/searches/ReferenceDescriptor.java diff --git a/platform/lang-api/src/com/intellij/psi/search/searches/ReferencesSearch.java b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/search/searches/ReferencesSearch.java rename to platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java From 0dd96e72d5904b51738f389df53084039345be00 Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Wed, 13 Jun 2012 17:53:47 +0200 Subject: [PATCH 12/61] ReferencesSearch.EP_NAME --- .../src/com/intellij/psi/search/searches/ReferencesSearch.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java index 01a6f1f7f3b0..d473ffbc78fb 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java +++ b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java @@ -15,6 +15,7 @@ */ package com.intellij.psi.search.searches; +import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; import com.intellij.psi.search.*; @@ -27,6 +28,7 @@ import org.jetbrains.annotations.Nullable; * @author max */ public class ReferencesSearch extends ExtensibleQueryFactory { + public static ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.referencesSearch"); private static final ReferencesSearch INSTANCE = new ReferencesSearch(); private ReferencesSearch() { From e002004e4a06f1c232de81520b6f1e4e910e6be1 Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Wed, 13 Jun 2012 18:24:21 +0200 Subject: [PATCH 13/61] extension points --- .../src/com/intellij/openapi/application/QueryExecutorBase.java | 0 .../src/com/intellij/psi/search/searches/ReferencesSearch.java | 2 +- .../com/intellij/psi/impl/search/CachesBasedRefSearcher.java | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename platform/{platform-api => core-api}/src/com/intellij/openapi/application/QueryExecutorBase.java (100%) rename platform/{lang-impl => indexing-impl}/src/com/intellij/psi/impl/search/CachesBasedRefSearcher.java (100%) diff --git a/platform/platform-api/src/com/intellij/openapi/application/QueryExecutorBase.java b/platform/core-api/src/com/intellij/openapi/application/QueryExecutorBase.java similarity index 100% rename from platform/platform-api/src/com/intellij/openapi/application/QueryExecutorBase.java rename to platform/core-api/src/com/intellij/openapi/application/QueryExecutorBase.java diff --git a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java index d473ffbc78fb..ce183fee50d9 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java +++ b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; * @author max */ public class ReferencesSearch extends ExtensibleQueryFactory { - public static ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.referencesSearch"); + public static ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.referencesSearch"); private static final ReferencesSearch INSTANCE = new ReferencesSearch(); private ReferencesSearch() { diff --git a/platform/lang-impl/src/com/intellij/psi/impl/search/CachesBasedRefSearcher.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/CachesBasedRefSearcher.java similarity index 100% rename from platform/lang-impl/src/com/intellij/psi/impl/search/CachesBasedRefSearcher.java rename to platform/indexing-impl/src/com/intellij/psi/impl/search/CachesBasedRefSearcher.java From 2687ae1fa3e7eacdbe84813667f915207fdb699e Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Thu, 14 Jun 2012 11:27:28 +0200 Subject: [PATCH 14/61] - implement JobLauncher in Core - bundle resources in intellij-core-upsource --- build/scripts/layouts.gant | 2 + .../com/intellij/concurrency/JobLauncher.java | 8 ++- .../core/CoreApplicationEnvironment.java | 55 ++++++++++++++++++- .../intellij/concurrency/JobLauncherImpl.java | 5 -- 4 files changed, 62 insertions(+), 8 deletions(-) diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index 1790ca85e78d..cba7816b15ef 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -532,6 +532,8 @@ def layout_core_upsource(String home, String target) { module("projectModel-api") module("projectModel-impl") module("java-indexing-impl") + module("platform-resources") + module("platform-resources-en") } jar("annotations.jar") { diff --git a/platform/core-api/src/com/intellij/concurrency/JobLauncher.java b/platform/core-api/src/com/intellij/concurrency/JobLauncher.java index 844fd8cbe69d..b58921bd66f9 100644 --- a/platform/core-api/src/com/intellij/concurrency/JobLauncher.java +++ b/platform/core-api/src/com/intellij/concurrency/JobLauncher.java @@ -21,6 +21,7 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.util.Consumer; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.concurrent.Future; @@ -49,6 +50,9 @@ public abstract class JobLauncher { boolean failFastOnAcquireReadAction, @NotNull final Processor thingProcessor) throws ProcessCanceledException; - public abstract Job submitToJobThread(int priority, @NotNull final Runnable action); - public abstract Job submitToJobThread(int priority, @NotNull final Runnable action, Consumer onDoneCallback); + public abstract Job submitToJobThread(int priority, @NotNull final Runnable action, @Nullable Consumer onDoneCallback); + + public Job submitToJobThread(int priority, @NotNull final Runnable action) { + return submitToJobThread(priority, action, null); + } } diff --git a/platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java b/platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java index 9581a190a341..b1d7f8dda27c 100644 --- a/platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java +++ b/platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java @@ -15,6 +15,8 @@ */ package com.intellij.core; +import com.intellij.concurrency.Job; +import com.intellij.concurrency.JobLauncher; import com.intellij.lang.*; import com.intellij.lang.impl.PsiBuilderFactoryImpl; import com.intellij.mock.MockApplication; @@ -50,12 +52,16 @@ import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry import com.intellij.psi.stubs.BinaryFileStubBuilders; import com.intellij.psi.stubs.CoreStubTreeLoader; import com.intellij.psi.stubs.StubTreeLoader; +import com.intellij.util.Consumer; import com.intellij.util.Function; +import com.intellij.util.Processor; import com.intellij.util.messages.impl.MessageBusImpl; import org.jetbrains.annotations.NotNull; import org.picocontainer.MutablePicoContainer; import java.lang.reflect.Modifier; +import java.util.List; +import java.util.concurrent.*; /** * @author yole @@ -108,7 +114,6 @@ public class CoreApplicationEnvironment { } ) ); - //registerApplicationComponent(VirtualFilePointerManager.class, new CoreVirtualFilePointerManager()); myApplication.registerService(VirtualFilePointerManager.class, new CoreVirtualFilePointerManager()); myApplication.registerService(DefaultASTFactory.class, new CoreASTFactory()); @@ -139,6 +144,54 @@ public class CoreApplicationEnvironment { }; } }; + + myApplication.registerService(JobLauncher.class, new JobLauncher() { + @Override + public boolean invokeConcurrentlyUnderProgress(@NotNull List things, + ProgressIndicator progress, + boolean failFastOnAcquireReadAction, + @NotNull Processor thingProcessor) throws ProcessCanceledException { + for (T thing : things) { + if (!thingProcessor.process(thing)) + return false; + } + return true; + } + + @Override + public Job submitToJobThread(int priority, @NotNull Runnable action, Consumer onDoneCallback) { + action.run(); + if (onDoneCallback != null) + onDoneCallback.consume(new Future() { + @Override + public boolean cancel(boolean mayInterruptIfRunning) { + return false; + } + + @Override + public boolean isCancelled() { + return false; + } + + @Override + public boolean isDone() { + return true; + } + + @Override + public Object get() throws InterruptedException, ExecutionException { + return null; + } + + @Override + public Object get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { + return null; + } + }); + return null; + } + }); + } protected VirtualFileSystem createJarFileSystem() { diff --git a/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java b/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java index b859dce5c97f..e5910b81012e 100644 --- a/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java +++ b/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java @@ -120,11 +120,6 @@ public class JobLauncherImpl extends JobLauncher { }); } - @Override - public Job submitToJobThread(int priority, @NotNull final Runnable action) { - return submitToJobThread(priority, action, null); - } - @Override public Job submitToJobThread(int priority, @NotNull final Runnable action, Consumer onDoneCallback) { final JobImpl job = new JobImpl(priority, false); From f83c3f1cc1fc4c83ae70e6b3a53bc10977b0cdce Mon Sep 17 00:00:00 2001 From: Dmitry Lomov Date: Fri, 15 Jun 2012 11:36:11 +0200 Subject: [PATCH 15/61] ProjectRootManager.getInstance --- .../src/com/intellij/openapi/roots/ProjectRootManager.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectRootManager.java b/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectRootManager.java index 04503f0e2865..82b415f832ed 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectRootManager.java +++ b/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectRootManager.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.roots; +import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.Sdk; @@ -37,6 +38,8 @@ public abstract class ProjectRootManager implements ModificationTracker { * @return the instance. */ public static ProjectRootManager getInstance(Project project) { + final ProjectRootManager service = ServiceManager.getService(ProjectRootManager.class); + if (service != null) return service; return project.getComponent(ProjectRootManager.class); } From e530e97bff4bdfdd19f94cfe3e9d5c3d91273480 Mon Sep 17 00:00:00 2001 From: Dmitry Lomov Date: Fri, 15 Jun 2012 17:46:41 +0200 Subject: [PATCH 16/61] ProjectScopeBuilder moved --- platform/indexing-api/indexing-api.iml | 1 + .../src/com/intellij/psi/search/ProjectAndLibrariesScope.java | 0 platform/indexing-impl/indexing-impl.iml | 1 + .../src/com/intellij/psi/search/ProjectScopeBuilderImpl.java | 0 .../src/com/intellij/openapi/roots/ProjectRootManager.java | 2 +- 5 files changed, 3 insertions(+), 1 deletion(-) rename platform/{lang-api => indexing-api}/src/com/intellij/psi/search/ProjectAndLibrariesScope.java (100%) rename platform/{lang-impl => indexing-impl}/src/com/intellij/psi/search/ProjectScopeBuilderImpl.java (100%) diff --git a/platform/indexing-api/indexing-api.iml b/platform/indexing-api/indexing-api.iml index caff682b4a06..425683850d37 100644 --- a/platform/indexing-api/indexing-api.iml +++ b/platform/indexing-api/indexing-api.iml @@ -8,6 +8,7 @@ + diff --git a/platform/lang-api/src/com/intellij/psi/search/ProjectAndLibrariesScope.java b/platform/indexing-api/src/com/intellij/psi/search/ProjectAndLibrariesScope.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/search/ProjectAndLibrariesScope.java rename to platform/indexing-api/src/com/intellij/psi/search/ProjectAndLibrariesScope.java diff --git a/platform/indexing-impl/indexing-impl.iml b/platform/indexing-impl/indexing-impl.iml index 8446a9dbc69c..f28700956c34 100644 --- a/platform/indexing-impl/indexing-impl.iml +++ b/platform/indexing-impl/indexing-impl.iml @@ -9,6 +9,7 @@ + diff --git a/platform/lang-impl/src/com/intellij/psi/search/ProjectScopeBuilderImpl.java b/platform/indexing-impl/src/com/intellij/psi/search/ProjectScopeBuilderImpl.java similarity index 100% rename from platform/lang-impl/src/com/intellij/psi/search/ProjectScopeBuilderImpl.java rename to platform/indexing-impl/src/com/intellij/psi/search/ProjectScopeBuilderImpl.java diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectRootManager.java b/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectRootManager.java index 82b415f832ed..2f6b4204bbff 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectRootManager.java +++ b/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectRootManager.java @@ -38,7 +38,7 @@ public abstract class ProjectRootManager implements ModificationTracker { * @return the instance. */ public static ProjectRootManager getInstance(Project project) { - final ProjectRootManager service = ServiceManager.getService(ProjectRootManager.class); + final ProjectRootManager service = ServiceManager.getService(project, ProjectRootManager.class); if (service != null) return service; return project.getComponent(ProjectRootManager.class); } From bfea63e26516319d26c8ec15474f7300e6be01c2 Mon Sep 17 00:00:00 2001 From: Dmitry Lomov Date: Fri, 15 Jun 2012 17:49:57 +0200 Subject: [PATCH 17/61] More search scope-related moves --- .../src/com/intellij/openapi/module/impl/scopes/JdkScope.java | 0 .../openapi/module/impl/scopes/LibraryRuntimeClasspathScope.java | 0 .../src/com/intellij/openapi/roots/impl/LibraryScopeCache.java | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename platform/{lang-impl => indexing-impl}/src/com/intellij/openapi/module/impl/scopes/JdkScope.java (100%) rename platform/{lang-impl => indexing-impl}/src/com/intellij/openapi/module/impl/scopes/LibraryRuntimeClasspathScope.java (100%) rename platform/{lang-impl => indexing-impl}/src/com/intellij/openapi/roots/impl/LibraryScopeCache.java (100%) diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/JdkScope.java b/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/JdkScope.java similarity index 100% rename from platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/JdkScope.java rename to platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/JdkScope.java diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/LibraryRuntimeClasspathScope.java b/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/LibraryRuntimeClasspathScope.java similarity index 100% rename from platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/LibraryRuntimeClasspathScope.java rename to platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/LibraryRuntimeClasspathScope.java diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/LibraryScopeCache.java b/platform/indexing-impl/src/com/intellij/openapi/roots/impl/LibraryScopeCache.java similarity index 100% rename from platform/lang-impl/src/com/intellij/openapi/roots/impl/LibraryScopeCache.java rename to platform/indexing-impl/src/com/intellij/openapi/roots/impl/LibraryScopeCache.java From e65f183e408950250e3ac4ebd0a3b15c61d95eeb Mon Sep 17 00:00:00 2001 From: Dmitry Lomov Date: Fri, 15 Jun 2012 18:28:45 +0200 Subject: [PATCH 18/61] ResolveScopeManagerImpl moved to indexing-impl --- .../src/com/intellij/psi/ResolveScopeEnlarger.java | 0 .../src/com/intellij/psi/ResolveScopeProvider.java | 1 - .../psi/impl/file/impl/ResolveScopeManagerImpl.java | 12 +++++------- 3 files changed, 5 insertions(+), 8 deletions(-) rename platform/{lang-impl => indexing-impl}/src/com/intellij/psi/ResolveScopeEnlarger.java (100%) rename platform/{lang-impl => indexing-impl}/src/com/intellij/psi/ResolveScopeProvider.java (96%) rename platform/{lang-impl => indexing-impl}/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java (95%) diff --git a/platform/lang-impl/src/com/intellij/psi/ResolveScopeEnlarger.java b/platform/indexing-impl/src/com/intellij/psi/ResolveScopeEnlarger.java similarity index 100% rename from platform/lang-impl/src/com/intellij/psi/ResolveScopeEnlarger.java rename to platform/indexing-impl/src/com/intellij/psi/ResolveScopeEnlarger.java diff --git a/platform/lang-impl/src/com/intellij/psi/ResolveScopeProvider.java b/platform/indexing-impl/src/com/intellij/psi/ResolveScopeProvider.java similarity index 96% rename from platform/lang-impl/src/com/intellij/psi/ResolveScopeProvider.java rename to platform/indexing-impl/src/com/intellij/psi/ResolveScopeProvider.java index 2176b1c01eb2..e00cc18a1e6c 100644 --- a/platform/lang-impl/src/com/intellij/psi/ResolveScopeProvider.java +++ b/platform/indexing-impl/src/com/intellij/psi/ResolveScopeProvider.java @@ -19,7 +19,6 @@ import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.search.SearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/lang-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java similarity index 95% rename from platform/lang-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java rename to platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java index 5e638f303b43..72c28304074c 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java @@ -15,10 +15,9 @@ */ package com.intellij.psi.impl.file.impl; -import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.impl.scopes.LibraryRuntimeClasspathScope; -import com.intellij.openapi.progress.ProgressManager; +import com.intellij.openapi.progress.ProgressIndicatorProvider; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.*; import com.intellij.openapi.roots.impl.LibraryScopeCache; @@ -85,8 +84,9 @@ public class ResolveScopeManagerImpl extends ResolveScopeManager { ProjectFileIndex projectFileIndex = myProjectRootManager.getFileIndex(); Module module = projectFileIndex.getModuleForFile(vFile); if (module != null) { - boolean includeTests = projectFileIndex.isInTestSourceContent(vFile) || - !(vFile.getFileType() == StdFileTypes.JAVA && projectFileIndex.isContentSourceFile(vFile)); + boolean includeTests = projectFileIndex.isInTestSourceContent(vFile); + // TODO: dmitrylomov: removed this line to see what fails. + //!(vFile.getFileType() == StdFileTypes.JAVA && projectFileIndex.isContentSourceFile(vFile)); return GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module, includeTests); } else { @@ -96,8 +96,6 @@ public class ResolveScopeManagerImpl extends ResolveScopeManager { LibraryOrderEntry lib = null; for (OrderEntry entry : orderEntries) { - ProgressManager.checkCanceled(); - if (entry instanceof JdkOrderEntry) { return LibraryScopeCache.getInstance(myProject).getScopeForSdk((JdkOrderEntry)entry); } @@ -134,7 +132,7 @@ public class ResolveScopeManagerImpl extends ResolveScopeManager { @Override @NotNull public GlobalSearchScope getResolveScope(@NotNull PsiElement element) { - ProgressManager.checkCanceled(); + ProgressIndicatorProvider.checkCanceled(); VirtualFile vFile; final PsiFile contextFile; From 161ad009ab21c4b3028d50a4e9622e5b4ddbe188 Mon Sep 17 00:00:00 2001 From: Dmitry Lomov Date: Fri, 15 Jun 2012 18:52:53 +0200 Subject: [PATCH 19/61] More hooks in CoreProjectEnvironmentInitialization --- .../intellij/core/CoreProjectEnvironment.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java b/platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java index 8f841215f271..b0009421f4d5 100644 --- a/platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java +++ b/platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java @@ -51,13 +51,15 @@ public class CoreProjectEnvironment { myEnvironment = applicationEnvironment; myProject = new MockProject(myEnvironment.getApplication().getPicoContainer(), myParentDisposable); + preregisterServices(); + myFileIndexFacade = createFileIndexFacade(); myMessageBus = new MessageBusImpl(); PsiModificationTrackerImpl modificationTracker = new PsiModificationTrackerImpl(myProject); myProject.registerService(PsiModificationTracker.class, modificationTracker); myProject.registerService(FileIndexFacade.class, myFileIndexFacade); - myProject.registerService(ResolveScopeManager.class, new MockResolveScopeManager(myProject)); + myProject.registerService(ResolveScopeManager.class, createResolveScopeManager()); myProject.registerService(ResolveCache.class, new ResolveCache(myMessageBus)); registerProjectExtensionPoint(PsiTreeChangePreprocessor.EP_NAME, PsiTreeChangePreprocessor.class); @@ -68,14 +70,26 @@ public class CoreProjectEnvironment { myProject.registerService(PsiFileFactory.class, new PsiFileFactoryImpl(myPsiManager)); myProject.registerService(CachedValuesManager.class, new CachedValuesManagerImpl(myProject, new PsiCachedValuesFactory(myPsiManager))); myProject.registerService(PsiDirectoryFactory.class, new PsiDirectoryFactoryImpl(myPsiManager)); - myProject.registerService(ProjectScopeBuilder.class, new CoreProjectScopeBuilder(myProject, myFileIndexFacade)); + myProject.registerService(ProjectScopeBuilder.class, createProjectScopeBuilder()); myProject.registerService(DumbService.class, new MockDumbService(myProject)); } + protected CoreProjectScopeBuilder createProjectScopeBuilder() { + return new CoreProjectScopeBuilder(myProject, myFileIndexFacade); + } + + protected void preregisterServices() { + + } + protected FileIndexFacade createFileIndexFacade() { return new MockFileIndexFacade(myProject); } + protected ResolveScopeManager createResolveScopeManager() { + return new MockResolveScopeManager(myProject); + } + public void registerProjectExtensionPoint(final ExtensionPointName extensionPointName, final Class aClass) { CoreApplicationEnvironment.registerExtensionPoint(Extensions.getArea(myProject), extensionPointName, aClass); From e2a3fe7829d19bc2849e2a23cabd2c16e9e206ae Mon Sep 17 00:00:00 2001 From: Dmitry Lomov Date: Fri, 15 Jun 2012 18:56:55 +0200 Subject: [PATCH 20/61] Typo --- .../core-impl/src/com/intellij/core/CoreProjectEnvironment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java b/platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java index b0009421f4d5..5549ece71538 100644 --- a/platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java +++ b/platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java @@ -74,7 +74,7 @@ public class CoreProjectEnvironment { myProject.registerService(DumbService.class, new MockDumbService(myProject)); } - protected CoreProjectScopeBuilder createProjectScopeBuilder() { + protected ProjectScopeBuilder createProjectScopeBuilder() { return new CoreProjectScopeBuilder(myProject, myFileIndexFacade); } From a4beae00fa1ceaa2e17bebae82d9a4fda27be589 Mon Sep 17 00:00:00 2001 From: Dmitry Lomov Date: Fri, 15 Jun 2012 19:02:11 +0200 Subject: [PATCH 21/61] More wrestling with CoreProjectEnvironment --- .../src/com/intellij/core/CoreProjectEnvironment.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java b/platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java index 5549ece71538..9c285ef6a2a3 100644 --- a/platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java +++ b/platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java @@ -59,7 +59,6 @@ public class CoreProjectEnvironment { PsiModificationTrackerImpl modificationTracker = new PsiModificationTrackerImpl(myProject); myProject.registerService(PsiModificationTracker.class, modificationTracker); myProject.registerService(FileIndexFacade.class, myFileIndexFacade); - myProject.registerService(ResolveScopeManager.class, createResolveScopeManager()); myProject.registerService(ResolveCache.class, new ResolveCache(myMessageBus)); registerProjectExtensionPoint(PsiTreeChangePreprocessor.EP_NAME, PsiTreeChangePreprocessor.class); @@ -67,6 +66,8 @@ public class CoreProjectEnvironment { ((FileManagerImpl) myPsiManager.getFileManager()).markInitialized(); registerProjectComponent(PsiManager.class, myPsiManager); + myProject.registerService(ResolveScopeManager.class, createResolveScopeManager(myPsiManager)); + myProject.registerService(PsiFileFactory.class, new PsiFileFactoryImpl(myPsiManager)); myProject.registerService(CachedValuesManager.class, new CachedValuesManagerImpl(myProject, new PsiCachedValuesFactory(myPsiManager))); myProject.registerService(PsiDirectoryFactory.class, new PsiDirectoryFactoryImpl(myPsiManager)); @@ -86,7 +87,7 @@ public class CoreProjectEnvironment { return new MockFileIndexFacade(myProject); } - protected ResolveScopeManager createResolveScopeManager() { + protected ResolveScopeManager createResolveScopeManager(PsiManager psiManager) { return new MockResolveScopeManager(myProject); } From 46ab54c8b95897000120b89c8b4daf99374f5f4d Mon Sep 17 00:00:00 2001 From: Dmitry Lomov Date: Mon, 18 Jun 2012 10:27:46 +0200 Subject: [PATCH 22/61] Scopes in CoreModule --- .../module/impl/ModuleScopeProvider.java | 57 +++++++++ .../module/impl/ModuleScopeProviderImpl.java | 109 ++++++++++++++++++ .../scopes/ModuleWithDependenciesScope.java | 0 .../scopes/ModuleWithDependentsScope.java | 0 .../openapi/module/impl/ModuleImpl.java | 55 +++------ .../impl/ProjectRootManagerComponent.java | 3 +- .../src/com/intellij/core/CoreModule.java | 32 +++-- .../com/intellij/core/CoreModuleManager.java | 3 +- .../core/CoreModuleScopeProvider.java | 82 +++++++++++++ .../openapi/module/impl/ModuleEx.java | 2 + 10 files changed, 291 insertions(+), 52 deletions(-) create mode 100644 platform/core-impl/src/com/intellij/openapi/module/impl/ModuleScopeProvider.java create mode 100644 platform/indexing-impl/src/com/intellij/openapi/module/impl/ModuleScopeProviderImpl.java rename platform/{lang-impl => indexing-impl}/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java (100%) rename platform/{lang-impl => indexing-impl}/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependentsScope.java (100%) create mode 100644 platform/projectModel-impl/src/com/intellij/core/CoreModuleScopeProvider.java diff --git a/platform/core-impl/src/com/intellij/openapi/module/impl/ModuleScopeProvider.java b/platform/core-impl/src/com/intellij/openapi/module/impl/ModuleScopeProvider.java new file mode 100644 index 000000000000..720c88d60233 --- /dev/null +++ b/platform/core-impl/src/com/intellij/openapi/module/impl/ModuleScopeProvider.java @@ -0,0 +1,57 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.openapi.module.impl; + + +import com.intellij.psi.search.GlobalSearchScope; + +/** + * Author: dmitrylomov + */ +public interface ModuleScopeProvider { + /** + * Returns module scope including sources and tests, excluding libraries and dependencies. + * + * @return scope including sources and tests, excluding libraries and dependencies. + */ + GlobalSearchScope getModuleScope(); + + GlobalSearchScope getModuleScope(boolean includeTests); + + /** + * Returns module scope including sources, tests, and libraries, excluding dependencies. + * + * @return scope including sources, tests, and libraries, excluding dependencies. + */ + GlobalSearchScope getModuleWithLibrariesScope(); + + /** + * Returns module scope including sources, tests, and dependencies, excluding libraries. + * + * @return scope including sources, tests, and dependencies, excluding libraries. + */ + GlobalSearchScope getModuleWithDependenciesScope(); + + GlobalSearchScope getModuleContentScope(); + GlobalSearchScope getModuleContentWithDependenciesScope(); + + GlobalSearchScope getModuleWithDependenciesAndLibrariesScope(boolean includeTests); + GlobalSearchScope getModuleWithDependentsScope(); + GlobalSearchScope getModuleTestsWithDependentsScope(); + GlobalSearchScope getModuleRuntimeScope(boolean includeTests); + + void clearCache(); +} diff --git a/platform/indexing-impl/src/com/intellij/openapi/module/impl/ModuleScopeProviderImpl.java b/platform/indexing-impl/src/com/intellij/openapi/module/impl/ModuleScopeProviderImpl.java new file mode 100644 index 000000000000..f90fe7876987 --- /dev/null +++ b/platform/indexing-impl/src/com/intellij/openapi/module/impl/ModuleScopeProviderImpl.java @@ -0,0 +1,109 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.openapi.module.impl; + +import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.impl.scopes.ModuleWithDependenciesScope; +import com.intellij.openapi.module.impl.scopes.ModuleWithDependentsScope; +import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.util.containers.StripedLockIntObjectConcurrentHashMap; +import org.jetbrains.annotations.NotNull; + +/** + * Author: dmitrylomov + */ +public class ModuleScopeProviderImpl implements ModuleScopeProvider { + private final Module myModule; + private final StripedLockIntObjectConcurrentHashMap myScopeCache = new StripedLockIntObjectConcurrentHashMap(); + private GlobalSearchScope myModuleWithDependentsScope; + private GlobalSearchScope myModuleTestsWithDependentsScope; + + + public ModuleScopeProviderImpl(Module module) { + myModule = module; + } + + @NotNull + public GlobalSearchScope getCachedScope(@ModuleWithDependenciesScope.ScopeConstant int options) { + GlobalSearchScope scope = myScopeCache.get(options); + if (scope == null) { + scope = new ModuleWithDependenciesScope(myModule, options); + myScopeCache.put(options, scope); + } + return scope; + } + + + public GlobalSearchScope getModuleScope() { + return getCachedScope(ModuleWithDependenciesScope.COMPILE | ModuleWithDependenciesScope.TESTS); + } + + @Override + public GlobalSearchScope getModuleScope(boolean includeTests) { + return getCachedScope(ModuleWithDependenciesScope.COMPILE | (includeTests ? ModuleWithDependenciesScope.TESTS : 0)); + } + + public GlobalSearchScope getModuleWithLibrariesScope() { + return getCachedScope(ModuleWithDependenciesScope.COMPILE | ModuleWithDependenciesScope.TESTS | ModuleWithDependenciesScope.LIBRARIES); + } + + public GlobalSearchScope getModuleWithDependenciesScope() { + return getCachedScope(ModuleWithDependenciesScope.COMPILE | ModuleWithDependenciesScope.TESTS | ModuleWithDependenciesScope.MODULES); + } + + @Override + public GlobalSearchScope getModuleContentScope() { + return getCachedScope(ModuleWithDependenciesScope.CONTENT); + } + + @Override + public GlobalSearchScope getModuleContentWithDependenciesScope() { + return getCachedScope(ModuleWithDependenciesScope.CONTENT | ModuleWithDependenciesScope.MODULES); + } + + public GlobalSearchScope getModuleWithDependenciesAndLibrariesScope(boolean includeTests) { + return getCachedScope(ModuleWithDependenciesScope.COMPILE | + ModuleWithDependenciesScope.MODULES | + ModuleWithDependenciesScope.LIBRARIES | (includeTests ? ModuleWithDependenciesScope.TESTS : 0)); + } + + public GlobalSearchScope getModuleWithDependentsScope() { + if (myModuleWithDependentsScope == null) { + myModuleWithDependentsScope = new ModuleWithDependentsScope(myModule, false); + } + return myModuleWithDependentsScope; + } + + public GlobalSearchScope getModuleTestsWithDependentsScope() { + if (myModuleTestsWithDependentsScope == null) { + myModuleTestsWithDependentsScope = new ModuleWithDependentsScope(myModule, true); + } + return myModuleTestsWithDependentsScope; + } + + public GlobalSearchScope getModuleRuntimeScope(boolean includeTests) { + return getCachedScope( + ModuleWithDependenciesScope.MODULES | ModuleWithDependenciesScope.LIBRARIES | (includeTests ? ModuleWithDependenciesScope.TESTS : 0)); + } + + @Override + public void clearCache() { + myScopeCache.clear(); + myModuleWithDependentsScope = null; + myModuleTestsWithDependentsScope = null; + } + +} diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java b/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java similarity index 100% rename from platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java rename to platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependentsScope.java b/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependentsScope.java similarity index 100% rename from platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependentsScope.java rename to platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependentsScope.java diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java index dc377069df0a..1fe19548c3e9 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java @@ -33,8 +33,6 @@ import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.module.ModifiableModuleModel; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleComponent; -import com.intellij.openapi.module.impl.scopes.ModuleWithDependenciesScope; -import com.intellij.openapi.module.impl.scopes.ModuleWithDependentsScope; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.impl.storage.ClasspathStorage; import com.intellij.openapi.util.Comparing; @@ -43,7 +41,6 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.PathUtil; -import com.intellij.util.containers.StripedLockIntObjectConcurrentHashMap; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -64,16 +61,12 @@ public class ModuleImpl extends ComponentManagerImpl implements ModuleEx { @NonNls private static final String OPTION_WORKSPACE = "workspace"; - private final StripedLockIntObjectConcurrentHashMap myScopeCache = new StripedLockIntObjectConcurrentHashMap(); - - private GlobalSearchScope myModuleWithDependentsScope; - private GlobalSearchScope myModuleTestsWithDependentsScope; - public static final Object MODULE_RENAMING_REQUESTOR = new Object(); private String myName; private IModuleStore myComponentStore; + private final ModuleScopeProvider myModuleScopeProvider; public ModuleImpl(String filePath, Project project) { super(project); @@ -81,8 +74,10 @@ public class ModuleImpl extends ComponentManagerImpl implements ModuleEx { getPicoContainer().registerComponentInstance(Module.class, this); myProject = project; + myModuleScopeProvider = new ModuleScopeProviderImpl(this); init(filePath); + } protected void bootstrapPicoContainer() { @@ -240,71 +235,51 @@ public class ModuleImpl extends ComponentManagerImpl implements ModuleEx { } public GlobalSearchScope getModuleScope() { - return getCachedScope(ModuleWithDependenciesScope.COMPILE | ModuleWithDependenciesScope.TESTS); + return myModuleScopeProvider.getModuleScope(); } @Override public GlobalSearchScope getModuleScope(boolean includeTests) { - return getCachedScope(ModuleWithDependenciesScope.COMPILE | (includeTests ? ModuleWithDependenciesScope.TESTS : 0)); + return myModuleScopeProvider.getModuleScope(includeTests); } public GlobalSearchScope getModuleWithLibrariesScope() { - return getCachedScope(ModuleWithDependenciesScope.COMPILE | ModuleWithDependenciesScope.TESTS | ModuleWithDependenciesScope.LIBRARIES); + return myModuleScopeProvider.getModuleWithLibrariesScope(); } public GlobalSearchScope getModuleWithDependenciesScope() { - return getCachedScope(ModuleWithDependenciesScope.COMPILE | ModuleWithDependenciesScope.TESTS | ModuleWithDependenciesScope.MODULES); + return myModuleScopeProvider.getModuleWithDependenciesScope(); } @Override public GlobalSearchScope getModuleContentScope() { - return getCachedScope(ModuleWithDependenciesScope.CONTENT); + return myModuleScopeProvider.getModuleContentScope(); } @Override public GlobalSearchScope getModuleContentWithDependenciesScope() { - return getCachedScope(ModuleWithDependenciesScope.CONTENT | ModuleWithDependenciesScope.MODULES); + return myModuleScopeProvider.getModuleContentWithDependenciesScope(); } public GlobalSearchScope getModuleWithDependenciesAndLibrariesScope(boolean includeTests) { - return getCachedScope(ModuleWithDependenciesScope.COMPILE | - ModuleWithDependenciesScope.MODULES | - ModuleWithDependenciesScope.LIBRARIES | (includeTests ? ModuleWithDependenciesScope.TESTS : 0)); + return myModuleScopeProvider.getModuleWithDependenciesAndLibrariesScope(includeTests); } public GlobalSearchScope getModuleWithDependentsScope() { - if (myModuleWithDependentsScope == null) { - myModuleWithDependentsScope = new ModuleWithDependentsScope(this, false); - } - return myModuleWithDependentsScope; + return myModuleScopeProvider.getModuleWithDependentsScope(); } public GlobalSearchScope getModuleTestsWithDependentsScope() { - if (myModuleTestsWithDependentsScope == null) { - myModuleTestsWithDependentsScope = new ModuleWithDependentsScope(this, true); - } - return myModuleTestsWithDependentsScope; + return myModuleScopeProvider.getModuleTestsWithDependentsScope(); } public GlobalSearchScope getModuleRuntimeScope(boolean includeTests) { - return getCachedScope( - ModuleWithDependenciesScope.MODULES | ModuleWithDependenciesScope.LIBRARIES | (includeTests ? ModuleWithDependenciesScope.TESTS : 0)); - } - - @NotNull - public GlobalSearchScope getCachedScope(@ModuleWithDependenciesScope.ScopeConstant int options) { - GlobalSearchScope scope = myScopeCache.get(options); - if (scope == null) { - scope = new ModuleWithDependenciesScope(this, options); - myScopeCache.put(options, scope); - } - return scope; + return myModuleScopeProvider.getModuleRuntimeScope(includeTests); } + @Override public void clearScopesCache() { - myScopeCache.clear(); - myModuleWithDependentsScope = null; - myModuleTestsWithDependentsScope = null; + myModuleScopeProvider.clearCache(); } @SuppressWarnings({"HardCodedStringLiteral"}) diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerComponent.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerComponent.java index 4f527b4b3242..306cea8b17a5 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerComponent.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerComponent.java @@ -27,6 +27,7 @@ import com.intellij.openapi.fileTypes.FileTypeListener; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.impl.ModuleEx; import com.intellij.openapi.module.impl.ModuleImpl; import com.intellij.openapi.project.DumbServiceImpl; import com.intellij.openapi.project.Project; @@ -304,7 +305,7 @@ public class ProjectRootManagerComponent extends ProjectRootManagerImpl { super.clearScopesCachesForModules(); Module[] modules = ModuleManager.getInstance(myProject).getModules(); for (Module module : modules) { - ((ModuleImpl)module).clearScopesCache(); + ((ModuleEx)module).clearScopesCache(); } } diff --git a/platform/projectModel-impl/src/com/intellij/core/CoreModule.java b/platform/projectModel-impl/src/com/intellij/core/CoreModule.java index e4d607ee7113..7c5544c7e511 100644 --- a/platform/projectModel-impl/src/com/intellij/core/CoreModule.java +++ b/platform/projectModel-impl/src/com/intellij/core/CoreModule.java @@ -24,6 +24,7 @@ import com.intellij.openapi.components.PathMacroManager; import com.intellij.openapi.components.impl.ModulePathMacroManager; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.module.impl.ModuleEx; +import com.intellij.openapi.module.impl.ModuleScopeProvider; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModuleExtension; import com.intellij.openapi.roots.ModuleRootManager; @@ -44,6 +45,7 @@ import org.jetbrains.annotations.NotNull; public class CoreModule extends MockComponentManager implements ModuleEx { private String myPath; private final Project myProject; + private final ModuleScopeProvider myModuleScopeProvider; public CoreModule(@NotNull Disposable parentDisposable, Project project, String moduleFilePath) { super(project.getPicoContainer(), parentDisposable); @@ -65,6 +67,11 @@ public class CoreModule extends MockComponentManager implements ModuleEx { VirtualFilePointerManager.getInstance()); getPicoContainer().registerComponentInstance(ModuleRootManager.class, moduleRootManager); getPicoContainer().registerComponentInstance(PathMacroManager.class, new ModulePathMacroManager(PathMacros.getInstance(), this)); + myModuleScopeProvider = createModuleScopeProvider(); + } + + protected ModuleScopeProvider createModuleScopeProvider() { + return new CoreModuleScopeProvider(); } @Override @@ -91,6 +98,11 @@ public class CoreModule extends MockComponentManager implements ModuleEx { public void rename(String newName) { } + @Override + public void clearScopesCache() { + myModuleScopeProvider.clearCache(); + } + @Override public VirtualFile getModuleFile() { throw new UnsupportedOperationException(); @@ -136,51 +148,51 @@ public class CoreModule extends MockComponentManager implements ModuleEx { @Override public GlobalSearchScope getModuleScope() { - throw new UnsupportedOperationException(); + return myModuleScopeProvider.getModuleScope(); } @Override public GlobalSearchScope getModuleScope(boolean includeTests) { - throw new UnsupportedOperationException(); + return myModuleScopeProvider.getModuleScope(includeTests); } @Override public GlobalSearchScope getModuleWithLibrariesScope() { - throw new UnsupportedOperationException(); + return myModuleScopeProvider.getModuleWithLibrariesScope(); } @Override public GlobalSearchScope getModuleWithDependenciesScope() { - throw new UnsupportedOperationException(); + return myModuleScopeProvider.getModuleWithDependenciesScope(); } @Override public GlobalSearchScope getModuleContentScope() { - throw new UnsupportedOperationException(); + return myModuleScopeProvider.getModuleContentScope(); } @Override public GlobalSearchScope getModuleContentWithDependenciesScope() { - throw new UnsupportedOperationException(); + return myModuleScopeProvider.getModuleContentWithDependenciesScope(); } @Override public GlobalSearchScope getModuleWithDependenciesAndLibrariesScope(boolean includeTests) { - throw new UnsupportedOperationException(); + return myModuleScopeProvider.getModuleWithDependenciesAndLibrariesScope(includeTests); } @Override public GlobalSearchScope getModuleWithDependentsScope() { - throw new UnsupportedOperationException(); + return myModuleScopeProvider.getModuleWithDependentsScope(); } @Override public GlobalSearchScope getModuleTestsWithDependentsScope() { - throw new UnsupportedOperationException(); + return myModuleScopeProvider.getModuleTestsWithDependentsScope(); } @Override public GlobalSearchScope getModuleRuntimeScope(boolean includeTests) { - throw new UnsupportedOperationException(); + return myModuleScopeProvider.getModuleRuntimeScope(includeTests); } } diff --git a/platform/projectModel-impl/src/com/intellij/core/CoreModuleManager.java b/platform/projectModel-impl/src/com/intellij/core/CoreModuleManager.java index 28c41bac4e1f..6ebf80cd8922 100644 --- a/platform/projectModel-impl/src/com/intellij/core/CoreModuleManager.java +++ b/platform/projectModel-impl/src/com/intellij/core/CoreModuleManager.java @@ -18,6 +18,7 @@ package com.intellij.core; import com.intellij.openapi.Disposable; import com.intellij.openapi.components.StateStorageException; import com.intellij.openapi.components.impl.stores.StorageData; +import com.intellij.openapi.module.Module; import com.intellij.openapi.module.impl.ModuleEx; import com.intellij.openapi.module.impl.ModuleManagerImpl; import com.intellij.openapi.project.Project; @@ -49,7 +50,7 @@ public class CoreModuleManager extends ModuleManagerImpl { @Override protected ModuleEx createAndLoadModule(String filePath) throws IOException { - final CoreModule module = new CoreModule(myParentDisposable, myProject, filePath); + final ModuleEx module = createModule(filePath); VirtualFile vFile = StandardFileSystems.local().findFileByPath(filePath); try { StorageData storageData = CoreProjectLoader.loadStorageFile(module, vFile); diff --git a/platform/projectModel-impl/src/com/intellij/core/CoreModuleScopeProvider.java b/platform/projectModel-impl/src/com/intellij/core/CoreModuleScopeProvider.java new file mode 100644 index 000000000000..aeafc197aed5 --- /dev/null +++ b/platform/projectModel-impl/src/com/intellij/core/CoreModuleScopeProvider.java @@ -0,0 +1,82 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.core; + +import com.intellij.openapi.module.impl.ModuleScopeProvider; +import com.intellij.psi.search.GlobalSearchScope; + +/** + * Author: dmitrylomov + */ +public class CoreModuleScopeProvider implements ModuleScopeProvider { + public CoreModuleScopeProvider() { + } + + @Override + public GlobalSearchScope getModuleScope() { + throw new UnsupportedOperationException(); + } + + @Override + public GlobalSearchScope getModuleScope(boolean includeTests) { + throw new UnsupportedOperationException(); + } + + @Override + public GlobalSearchScope getModuleWithLibrariesScope() { + throw new UnsupportedOperationException(); + } + + @Override + public GlobalSearchScope getModuleWithDependenciesScope() { + throw new UnsupportedOperationException(); + } + + @Override + public GlobalSearchScope getModuleContentScope() { + throw new UnsupportedOperationException(); + } + + @Override + public GlobalSearchScope getModuleContentWithDependenciesScope() { + throw new UnsupportedOperationException(); + } + + @Override + public GlobalSearchScope getModuleWithDependenciesAndLibrariesScope(boolean includeTests) { + throw new UnsupportedOperationException(); + } + + @Override + public GlobalSearchScope getModuleWithDependentsScope() { + throw new UnsupportedOperationException(); + } + + @Override + public GlobalSearchScope getModuleTestsWithDependentsScope() { + throw new UnsupportedOperationException(); + } + + @Override + public GlobalSearchScope getModuleRuntimeScope(boolean includeTests) { + throw new UnsupportedOperationException(); + } + + @Override + public void clearCache() { + throw new UnsupportedOperationException(); + } +} diff --git a/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleEx.java b/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleEx.java index 4c650d007291..77f1d7ef888b 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleEx.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleEx.java @@ -27,4 +27,6 @@ public interface ModuleEx extends Module { void projectOpened(); void projectClosed(); void rename(String newName); + + void clearScopesCache(); } From ca58ba33e1029c1746fa6f98d9aec761052f8eeb Mon Sep 17 00:00:00 2001 From: Dmitry Lomov Date: Mon, 18 Jun 2012 10:59:58 +0200 Subject: [PATCH 23/61] Facetized project model environment initialization --- .../intellij/core/CoreModuleManagerTest.java | 6 +- .../src/com/intellij/core/ProjectModel.java | 123 ++++++++++++++++++ .../core/ProjectModelEnvironment.java | 68 ---------- 3 files changed, 126 insertions(+), 71 deletions(-) create mode 100644 platform/projectModel-impl/src/com/intellij/core/ProjectModel.java delete mode 100644 platform/projectModel-impl/src/com/intellij/core/ProjectModelEnvironment.java diff --git a/platform/platform-tests/testSrc/com/intellij/core/CoreModuleManagerTest.java b/platform/platform-tests/testSrc/com/intellij/core/CoreModuleManagerTest.java index 553326185600..dd2e774a9d66 100644 --- a/platform/platform-tests/testSrc/com/intellij/core/CoreModuleManagerTest.java +++ b/platform/platform-tests/testSrc/com/intellij/core/CoreModuleManagerTest.java @@ -31,12 +31,12 @@ import java.io.IOException; * @author yole */ public class CoreModuleManagerTest extends UsefulTestCase { - public void _testLoadingModules() throws IOException, JDOMException, InvalidDataException { + public void testLoadingModules() throws IOException, JDOMException, InvalidDataException { CoreApplicationEnvironment appEnv = new CoreApplicationEnvironment(getTestRootDisposable()); - ProjectModelEnvironment.registerApplicationEnvironment(appEnv); + new ProjectModel.InitApplicationEnvironment(appEnv); CoreProjectEnvironment prjEnv = new CoreProjectEnvironment(getTestRootDisposable(), appEnv); - ProjectModelEnvironment.registerProjectEnvironment(prjEnv); + new ProjectModel.InitProjectEnvironment(prjEnv); final String projectPath = PathManagerEx.getTestDataPath("/core/loadingTest"); VirtualFile vFile = StandardFileSystems.local().findFileByPath(projectPath); diff --git a/platform/projectModel-impl/src/com/intellij/core/ProjectModel.java b/platform/projectModel-impl/src/com/intellij/core/ProjectModel.java new file mode 100644 index 000000000000..5ace583e7d7f --- /dev/null +++ b/platform/projectModel-impl/src/com/intellij/core/ProjectModel.java @@ -0,0 +1,123 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.core; + +import com.intellij.application.options.PathMacrosImpl; +import com.intellij.mock.MockProject; +import com.intellij.openapi.application.PathMacroFilter; +import com.intellij.openapi.application.PathMacros; +import com.intellij.openapi.components.ExtensionAreas; +import com.intellij.openapi.components.PathMacroManager; +import com.intellij.openapi.components.impl.ProjectPathMacroManager; +import com.intellij.openapi.extensions.Extensions; +import com.intellij.openapi.fileTypes.FileTypeRegistry; +import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.projectRoots.ProjectJdkTable; +import com.intellij.openapi.roots.OrderRootType; +import com.intellij.openapi.roots.ProjectExtension; +import com.intellij.openapi.roots.ProjectFileIndex; +import com.intellij.openapi.roots.ProjectRootManager; +import com.intellij.openapi.roots.impl.*; +import com.intellij.openapi.roots.impl.libraries.ApplicationLibraryTable; +import com.intellij.openapi.roots.impl.libraries.LibraryTablesRegistrarImpl; +import com.intellij.openapi.roots.impl.libraries.ProjectLibraryTable; +import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar; + +/** + * @author yole + */ +public class ProjectModel { + + public static class InitApplicationEnvironment { + protected final CoreApplicationEnvironment myApplicationEnvironment; + public InitApplicationEnvironment(CoreApplicationEnvironment env) { + myApplicationEnvironment = env; + Extensions.registerAreaClass(ExtensionAreas.IDEA_MODULE, null); + CoreApplicationEnvironment.registerApplicationExtensionPoint(OrderRootType.EP_NAME, OrderRootType.class); + CoreApplicationEnvironment.registerApplicationExtensionPoint(SdkFinder.EP_NAME, SdkFinder.class); + CoreApplicationEnvironment.registerApplicationExtensionPoint(PathMacroFilter.EP_NAME, PathMacroFilter.class); + env.registerApplicationComponent(PathMacros.class, createPathMacros()); + env.getApplication().registerService(ProjectJdkTable.class, createProjectJdkTable()); + env.getApplication().registerService(ApplicationLibraryTable.class, createApplicationLibraryTable()); + env.getApplication().registerService(LibraryTablesRegistrar.class, createLibraryTablesRegistar()); + } + + protected PathMacros createPathMacros() { + return new PathMacrosImpl(); + } + + protected LibraryTablesRegistrar createLibraryTablesRegistar() { + return new LibraryTablesRegistrarImpl(); + } + + protected ApplicationLibraryTable createApplicationLibraryTable() { + return new ApplicationLibraryTable(); + } + + protected ProjectJdkTable createProjectJdkTable() { + return new CoreProjectJdkTable(); + } + } + + public static class InitProjectEnvironment { + protected final CoreProjectEnvironment myProjectEnvironment; + protected final Project myProject; + + public InitProjectEnvironment(CoreProjectEnvironment env) { + myProjectEnvironment = env; + final MockProject project = env.getProject(); + myProject = project; + + env.registerProjectExtensionPoint(DirectoryIndexExcludePolicy.EP_NAME, DirectoryIndexExcludePolicy.class); + env.registerProjectExtensionPoint(ProjectExtension.EP_NAME, ProjectExtension.class); + + env.registerProjectComponent(ModuleManager.class, createModuleManager()); + env.registerProjectComponent(PathMacroManager.class, createProjectPathMacroManager()); + DirectoryIndex index = createDirectoryIndex(); + //env.registerProjectComponent(DirectoryIndex.class, index); + project.registerService(DirectoryIndex.class, index); + env.registerProjectComponent(ProjectRootManager.class, createProjectRootManager(index)); + project.registerService(ProjectLibraryTable.class, createProjectLibraryTable()); + project.registerService(ProjectFileIndex.class, createProjectFileIndex(index)); + } + + protected ProjectFileIndexImpl createProjectFileIndex(DirectoryIndex index) { + return new ProjectFileIndexImpl(myProject, index, FileTypeRegistry.getInstance()); + } + + protected ProjectLibraryTable createProjectLibraryTable() { + return new ProjectLibraryTable(); + } + + protected ProjectRootManager createProjectRootManager(DirectoryIndex index) { + return new ProjectRootManagerImpl(myProject, index); + } + + protected DirectoryIndex createDirectoryIndex() { + return new DirectoryIndexImpl(myProject); + } + + private ProjectPathMacroManager createProjectPathMacroManager() { + return new ProjectPathMacroManager(PathMacros.getInstance(), myProject); + } + + protected ModuleManager createModuleManager() { + return new CoreModuleManager(myProject, myProjectEnvironment.getParentDisposable()); + } + + } +} diff --git a/platform/projectModel-impl/src/com/intellij/core/ProjectModelEnvironment.java b/platform/projectModel-impl/src/com/intellij/core/ProjectModelEnvironment.java deleted file mode 100644 index e08d13d298c9..000000000000 --- a/platform/projectModel-impl/src/com/intellij/core/ProjectModelEnvironment.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright 2000-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.core; - -import com.intellij.application.options.PathMacrosImpl; -import com.intellij.mock.MockProject; -import com.intellij.openapi.application.PathMacroFilter; -import com.intellij.openapi.application.PathMacros; -import com.intellij.openapi.components.ExtensionAreas; -import com.intellij.openapi.components.PathMacroManager; -import com.intellij.openapi.components.impl.ProjectPathMacroManager; -import com.intellij.openapi.extensions.Extensions; -import com.intellij.openapi.fileTypes.FileTypeRegistry; -import com.intellij.openapi.module.ModuleManager; -import com.intellij.openapi.projectRoots.ProjectJdkTable; -import com.intellij.openapi.roots.OrderRootType; -import com.intellij.openapi.roots.ProjectExtension; -import com.intellij.openapi.roots.ProjectFileIndex; -import com.intellij.openapi.roots.ProjectRootManager; -import com.intellij.openapi.roots.impl.*; -import com.intellij.openapi.roots.impl.libraries.ApplicationLibraryTable; -import com.intellij.openapi.roots.impl.libraries.LibraryTablesRegistrarImpl; -import com.intellij.openapi.roots.impl.libraries.ProjectLibraryTable; -import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar; - -/** - * @author yole - */ -public class ProjectModelEnvironment { - public static void registerApplicationEnvironment(CoreApplicationEnvironment env) { - Extensions.registerAreaClass(ExtensionAreas.IDEA_MODULE, null); - PathMacrosImpl pathMacros = new PathMacrosImpl(); - env.registerApplicationComponent(PathMacros.class, pathMacros); - CoreApplicationEnvironment.registerApplicationExtensionPoint(OrderRootType.EP_NAME, OrderRootType.class); - CoreApplicationEnvironment.registerApplicationExtensionPoint(SdkFinder.EP_NAME, SdkFinder.class); - CoreApplicationEnvironment.registerApplicationExtensionPoint(PathMacroFilter.EP_NAME, PathMacroFilter.class); - env.getApplication().registerService(ProjectJdkTable.class, new CoreProjectJdkTable()); - env.getApplication().registerService(ApplicationLibraryTable.class, new ApplicationLibraryTable()); - env.getApplication().registerService(LibraryTablesRegistrar.class, new LibraryTablesRegistrarImpl()); - } - - public static void registerProjectEnvironment(CoreProjectEnvironment env) { - final MockProject project = env.getProject(); - env.registerProjectComponent(ModuleManager.class, new CoreModuleManager(project, env.getParentDisposable())); - env.registerProjectComponent(PathMacroManager.class, new ProjectPathMacroManager(PathMacros.getInstance(), project)); - env.registerProjectExtensionPoint(DirectoryIndexExcludePolicy.EP_NAME, DirectoryIndexExcludePolicy.class); - env.registerProjectExtensionPoint(ProjectExtension.EP_NAME, ProjectExtension.class); - DirectoryIndex index = new DirectoryIndexImpl(project); - //env.registerProjectComponent(DirectoryIndex.class, index); - project.registerService(DirectoryIndex.class, index); - env.registerProjectComponent(ProjectRootManager.class, new ProjectRootManagerImpl(project, index)); - project.registerService(ProjectLibraryTable.class, new ProjectLibraryTable()); - project.registerService(ProjectFileIndex.class, new ProjectFileIndexImpl(project, index, FileTypeRegistry.getInstance())); - } -} From f94de6b8d15d8286702324c52c2b4afc7928d16d Mon Sep 17 00:00:00 2001 From: Dmitry Lomov Date: Mon, 18 Jun 2012 11:10:26 +0200 Subject: [PATCH 24/61] Made lifetime available to inheritors of CoreModuleManager --- .../src/com/intellij/core/CoreModuleManager.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/platform/projectModel-impl/src/com/intellij/core/CoreModuleManager.java b/platform/projectModel-impl/src/com/intellij/core/CoreModuleManager.java index 6ebf80cd8922..59751192abc3 100644 --- a/platform/projectModel-impl/src/com/intellij/core/CoreModuleManager.java +++ b/platform/projectModel-impl/src/com/intellij/core/CoreModuleManager.java @@ -74,4 +74,8 @@ public class CoreModuleManager extends ModuleManagerImpl { public void loadModules() { loadModules(myModuleModel); } + + protected Disposable getLifetime() { + return myParentDisposable; + } } From 4072483a08db352b98c9406afb2bbcec2927212d Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Mon, 18 Jun 2012 14:04:08 +0200 Subject: [PATCH 25/61] +JarFile.JarEntry --- .idea/compiler.xml | 6 +- .../libraries/JarVersionDetectionUtil.java | 2 +- .../src/com/intellij/openapi/vfs/JarFile.java | 14 +++- .../openapi/vfs/impl/jar/JarHandlerBase.java | 76 +++++++++++++++---- .../openapi/projectRoots/JdkUtil.java | 3 +- 5 files changed, 76 insertions(+), 25 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 569ac7af0c1b..fa595e20de73 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -20,11 +20,7 @@ - - - - - +