From 429be586851714870a11607cc01ea93341a2d685 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Thu, 24 Apr 2014 17:13:30 +0400 Subject: [PATCH] Rename JetCodeFragmentImpl to JetCodeFragment --- .../{JetCodeFragmentImpl.java => JetCodeFragment.java} | 8 ++++---- .../jet/lang/psi/JetExpressionCodeFragmentImpl.kt | 2 +- .../jetbrains/jet/lang/psi/JetTypeCodeFragmentImpl.java | 2 +- .../jet/plugin/caches/resolve/KotlinCacheService.kt | 4 ++-- .../jet/plugin/highlighter/DebugInfoAnnotator.java | 4 ++-- .../jetbrains/jet/plugin/highlighter/JetPsiChecker.java | 8 ++++---- .../jetbrains/jet/plugin/quickfix/ImportInsertHelper.java | 2 +- .../plugin/quickfix/JetSingleIntentionActionFactory.java | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) rename compiler/frontend/src/org/jetbrains/jet/lang/psi/{JetCodeFragmentImpl.java => JetCodeFragment.java} (89%) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragmentImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragment.java similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragmentImpl.java rename to compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragment.java index 51b9675e2c1..d4a90c35102 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragmentImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragment.java @@ -27,13 +27,13 @@ import com.intellij.testFramework.LightVirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.plugin.JetFileType; -public abstract class JetCodeFragmentImpl extends JetFile implements PsiCodeFragment { +public abstract class JetCodeFragment extends JetFile implements PsiCodeFragment { private final Project project; protected PsiElement context; private GlobalSearchScope resolveScope; - public JetCodeFragmentImpl(Project project, String name, CharSequence text, IElementType elementType, PsiElement context) { + public JetCodeFragment(Project project, String name, CharSequence text, IElementType elementType, PsiElement context) { super(((PsiManagerEx) PsiManager.getInstance(project)).getFileManager().createFileViewProvider( new LightVirtualFile(name, JetFileType.INSTANCE, text), true), false); ((SingleRootFileViewProvider)getViewProvider()).forceCachedPsi(this); @@ -75,8 +75,8 @@ public abstract class JetCodeFragmentImpl extends JetFile implements PsiCodeFrag } @Override - protected JetCodeFragmentImpl clone() { - JetCodeFragmentImpl clone = (JetCodeFragmentImpl)cloneImpl((FileElement)calcTreeElement().clone()); + protected JetCodeFragment clone() { + JetCodeFragment clone = (JetCodeFragment)cloneImpl((FileElement)calcTreeElement().clone()); clone.myOriginalFile = this; FileManager fileManager = ((PsiManagerEx) PsiManager.getInstance(project)).getFileManager(); SingleRootFileViewProvider cloneViewProvider = (SingleRootFileViewProvider)fileManager.createFileViewProvider(new LightVirtualFile( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionCodeFragmentImpl.kt b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionCodeFragmentImpl.kt index a5f61546c80..51be7f37955 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionCodeFragmentImpl.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionCodeFragmentImpl.kt @@ -28,7 +28,7 @@ class JetExpressionCodeFragmentImpl( name: String, text: CharSequence, context: PsiElement? -) : JetCodeFragmentImpl(project, name, text, JetNodeTypes.EXPRESSION_CODE_FRAGMENT, context), JetExpressionCodeFragment { +) : JetCodeFragment(project, name, text, JetNodeTypes.EXPRESSION_CODE_FRAGMENT, context), JetExpressionCodeFragment { private var _thisType: PsiType? = null private var _superType: PsiType? = null diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragmentImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragmentImpl.java index 391ba3c916e..4761f211c83 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragmentImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragmentImpl.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lexer.JetTokens; -public class JetTypeCodeFragmentImpl extends JetCodeFragmentImpl implements JetTypeCodeFragment { +public class JetTypeCodeFragmentImpl extends JetCodeFragment implements JetTypeCodeFragment { public JetTypeCodeFragmentImpl(Project project, String name, CharSequence text, PsiElement context) { super(project, name, text, JetNodeTypes.TYPE_CODE_FRAGMENT, context); } diff --git a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt index bfcb8d3e011..fd097ddb5ea 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt +++ b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt @@ -35,7 +35,7 @@ import org.jetbrains.jet.plugin.project.ResolveSessionForBodies import org.jetbrains.jet.plugin.project.TargetPlatformDetector import java.util.HashSet import org.jetbrains.jet.analyzer.AnalyzerFacade -import org.jetbrains.jet.lang.psi.JetCodeFragmentImpl +import org.jetbrains.jet.lang.psi.JetCodeFragment private val LOG = Logger.getInstance(javaClass()) @@ -138,7 +138,7 @@ class KotlinCacheService(val project: Project) { if (elements.isEmpty()) return AnalyzeExhaust.EMPTY val firstFile = elements.first().getContainingJetFile() - if (elements.size == 1 && (!isFileInScope(firstFile) && firstFile !is JetCodeFragmentImpl)) { + if (elements.size == 1 && (!isFileInScope(firstFile) && firstFile !is JetCodeFragment)) { return getCacheForSyntheticFile(firstFile).getAnalysisResultsForElements(elements) } diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java index 9a6cf2c7161..1b2698b6096 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java @@ -23,7 +23,7 @@ import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.checkers.DebugInfoUtil; -import org.jetbrains.jet.lang.psi.JetCodeFragmentImpl; +import org.jetbrains.jet.lang.psi.JetCodeFragment; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingContext; @@ -47,7 +47,7 @@ public class DebugInfoAnnotator implements Annotator { return; } - if (element instanceof JetFile && !(element instanceof JetCodeFragmentImpl)) { + if (element instanceof JetFile && !(element instanceof JetCodeFragment)) { JetFile file = (JetFile) element; try { BindingContext bindingContext = ResolvePackage.getBindingContext(file); diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java index 750a6bb13e1..5962440cde7 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java @@ -40,7 +40,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.diagnostics.Severity; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; -import org.jetbrains.jet.lang.psi.JetCodeFragmentImpl; +import org.jetbrains.jet.lang.psi.JetCodeFragment; import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetReferenceExpression; @@ -93,7 +93,7 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension { @Override public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) { - if (!(JetPluginUtil.isInSource(element) || element.getContainingFile() instanceof JetCodeFragmentImpl) + if (!(JetPluginUtil.isInSource(element) || element.getContainingFile() instanceof JetCodeFragment) || JetPluginUtil.isKtFileInGradleProjectInWrongFolder(element)) { return; } @@ -105,7 +105,7 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension { JetFile file = (JetFile) element.getContainingFile(); BindingContext bindingContext; - if (file instanceof JetCodeFragmentImpl) { + if (file instanceof JetCodeFragment) { if (element instanceof JetElement) { ResolveSessionForBodies resolveSession = ResolvePackage.getLazyResolveSession((JetElement) element); bindingContext = resolveSession.resolveToElement((JetElement) element); @@ -129,7 +129,7 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension { element.accept(visitor); } - if (JetPluginUtil.isInSource(element, /* includeLibrarySources = */ false) || file instanceof JetCodeFragmentImpl) { + if (JetPluginUtil.isInSource(element, /* includeLibrarySources = */ false) || file instanceof JetCodeFragment) { ElementAnnotator elementAnnotator = new ElementAnnotator(element, holder); for (Diagnostic diagnostic : bindingContext.getDiagnostics().forElement(element)) { elementAnnotator.registerDiagnosticAnnotations(diagnostic); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java index fca746323d6..5fe5b0277f2 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java @@ -96,7 +96,7 @@ public class ImportInsertHelper { } public static void writeImportToFile(@NotNull ImportPath importPath, @NotNull JetFile file) { - if (file instanceof JetCodeFragmentImpl) { + if (file instanceof JetCodeFragment) { // TODO Insert import doesn't work for codeFragments yet return; } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/JetSingleIntentionActionFactory.java b/idea/src/org/jetbrains/jet/plugin/quickfix/JetSingleIntentionActionFactory.java index 8736ed05c56..05105a27406 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/JetSingleIntentionActionFactory.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/JetSingleIntentionActionFactory.java @@ -20,7 +20,7 @@ import com.intellij.codeInsight.intention.IntentionAction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.psi.JetCodeFragmentImpl; +import org.jetbrains.jet.lang.psi.JetCodeFragment; import java.util.LinkedList; import java.util.List; @@ -35,7 +35,7 @@ public abstract class JetSingleIntentionActionFactory implements JetIntentionAct public final List createActions(Diagnostic diagnostic) { List intentionActionList = new LinkedList(); - if (diagnostic.getPsiElement().getContainingFile() instanceof JetCodeFragmentImpl) { + if (diagnostic.getPsiElement().getContainingFile() instanceof JetCodeFragment) { return intentionActionList; }