MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (service provider for JavaFileManager)

Browse Source
This commit is contained in:
Roman Shevchenko
2016-09-22 15:22:31 +03:00
parent 5c8c14768b
commit 6f3e69454f
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/file/impl/JavaFileManager.java
+10
View File
@@ -15,6 +15,8 @@
*/
package com.intellij.psi.impl.file.impl;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiJavaModule;
import com.intellij.psi.PsiPackage;
@@ -28,6 +30,14 @@ import java.util.Collection;
* @author max
*/
public interface JavaFileManager {
class SERVICE {
private SERVICE() { }
public static JavaFileManager getInstance(@NotNull Project project) {
return ServiceManager.getService(project, JavaFileManager.class);
}
}
@Nullable
PsiPackage findPackage(@NotNull String packageName);
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaModuleReference.java
+1 -2
View File
@@ -15,7 +15,6 @@
*/
package com.intellij.psi.impl.source;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.FileIndexFacade;
@@ -89,7 +88,7 @@ public class PsiJavaModuleReference extends PsiReferenceBase.Poly<PsiJavaModuleR
}
if (scope != null) {
JavaFileManager service = ServiceManager.getService(project, JavaFileManager.class);
JavaFileManager service = JavaFileManager.SERVICE.getInstance(project);
Collection<PsiJavaModule> modules = service.findModules(reference.getCanonicalText(), scope);
if (!modules.isEmpty()) {
ResolveResult[] result = new ResolveResult[modules.size()];
java/java-tests/testSrc/com/intellij/codeInsight/daemon/ModuleRenameTest.kt
+1 -3
View File
@@ -16,7 +16,6 @@
package com.intellij.codeInsight.daemon
import com.intellij.openapi.application.runWriteAction
import com.intellij.openapi.components.ServiceManager
import com.intellij.psi.PsiDocumentManager
import com.intellij.psi.impl.file.impl.JavaFileManager
import com.intellij.psi.search.GlobalSearchScope
@@ -45,8 +44,7 @@ class ModuleRenameTest : LightCodeInsightFixtureTestCase() {
@Test fun testRename() {
myFixture.configureByText("module-info.java", "module M { requires M2; }")
val service = ServiceManager.getService(project, JavaFileManager::class.java)
val module = service.findModules("M2", GlobalSearchScope.allScope(project)).first()
val module = JavaFileManager.SERVICE.getInstance(project).findModules("M2", GlobalSearchScope.allScope(project)).first()
runWriteAction {
RenameProcessor(project, module, "M2.bis", false, false).run()
PsiDocumentManager.getInstance(project).commitAllDocuments()