azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename JetCodeFragmentImpl to JetCodeFragment

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-04-24 17:13:30 +04:00
parent 0004948023
commit 429be58685
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragmentImpl.java → compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragment.java
+4 -4
View File
@@ -27,13 +27,13 @@ import com.intellij.testFramework.LightVirtualFile;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.JetFileType; 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; private final Project project;
protected PsiElement context; protected PsiElement context;
private GlobalSearchScope resolveScope; 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( super(((PsiManagerEx) PsiManager.getInstance(project)).getFileManager().createFileViewProvider(
new LightVirtualFile(name, JetFileType.INSTANCE, text), true), false); new LightVirtualFile(name, JetFileType.INSTANCE, text), true), false);
((SingleRootFileViewProvider)getViewProvider()).forceCachedPsi(this); ((SingleRootFileViewProvider)getViewProvider()).forceCachedPsi(this);
@@ -75,8 +75,8 @@ public abstract class JetCodeFragmentImpl extends JetFile implements PsiCodeFrag
} }
@Override @Override
protected JetCodeFragmentImpl clone() { protected JetCodeFragment clone() {
JetCodeFragmentImpl clone = (JetCodeFragmentImpl)cloneImpl((FileElement)calcTreeElement().clone()); JetCodeFragment clone = (JetCodeFragment)cloneImpl((FileElement)calcTreeElement().clone());
clone.myOriginalFile = this; clone.myOriginalFile = this;
FileManager fileManager = ((PsiManagerEx) PsiManager.getInstance(project)).getFileManager(); FileManager fileManager = ((PsiManagerEx) PsiManager.getInstance(project)).getFileManager();
SingleRootFileViewProvider cloneViewProvider = (SingleRootFileViewProvider)fileManager.createFileViewProvider(new LightVirtualFile( SingleRootFileViewProvider cloneViewProvider = (SingleRootFileViewProvider)fileManager.createFileViewProvider(new LightVirtualFile(
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionCodeFragmentImpl.kt
+1 -1
View File
@@ -28,7 +28,7 @@ class JetExpressionCodeFragmentImpl(
name: String, name: String,
text: CharSequence, text: CharSequence,
context: PsiElement? 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 _thisType: PsiType? = null
private var _superType: PsiType? = null private var _superType: PsiType? = null
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragmentImpl.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens; 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) { public JetTypeCodeFragmentImpl(Project project, String name, CharSequence text, PsiElement context) {
super(project, name, text, JetNodeTypes.TYPE_CODE_FRAGMENT, context); super(project, name, text, JetNodeTypes.TYPE_CODE_FRAGMENT, context);
} }
idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt
+2 -2
View File
@@ -35,7 +35,7 @@ import org.jetbrains.jet.plugin.project.ResolveSessionForBodies
import org.jetbrains.jet.plugin.project.TargetPlatformDetector import org.jetbrains.jet.plugin.project.TargetPlatformDetector
import java.util.HashSet import java.util.HashSet
import org.jetbrains.jet.analyzer.AnalyzerFacade 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<KotlinCacheService>()) private val LOG = Logger.getInstance(javaClass<KotlinCacheService>())
@@ -138,7 +138,7 @@ class KotlinCacheService(val project: Project) {
if (elements.isEmpty()) return AnalyzeExhaust.EMPTY if (elements.isEmpty()) return AnalyzeExhaust.EMPTY
val firstFile = elements.first().getContainingJetFile() 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) return getCacheForSyntheticFile(firstFile).getAnalysisResultsForElements(elements)
} }
idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java
+2 -2
View File
@@ -23,7 +23,7 @@ import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.checkers.DebugInfoUtil; 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.JetFile;
import org.jetbrains.jet.lang.psi.JetReferenceExpression; import org.jetbrains.jet.lang.psi.JetReferenceExpression;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
@@ -47,7 +47,7 @@ public class DebugInfoAnnotator implements Annotator {
return; return;
} }
if (element instanceof JetFile && !(element instanceof JetCodeFragmentImpl)) { if (element instanceof JetFile && !(element instanceof JetCodeFragment)) {
JetFile file = (JetFile) element; JetFile file = (JetFile) element;
try { try {
BindingContext bindingContext = ResolvePackage.getBindingContext(file); BindingContext bindingContext = ResolvePackage.getBindingContext(file);
idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
+4 -4
View File
@@ -40,7 +40,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.diagnostics.Errors;
import org.jetbrains.jet.lang.diagnostics.Severity; import org.jetbrains.jet.lang.diagnostics.Severity;
import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; 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.JetElement;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetReferenceExpression; import org.jetbrains.jet.lang.psi.JetReferenceExpression;
@@ -93,7 +93,7 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension {
@Override @Override
public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) { 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)) { || JetPluginUtil.isKtFileInGradleProjectInWrongFolder(element)) {
return; return;
} }
@@ -105,7 +105,7 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension {
JetFile file = (JetFile) element.getContainingFile(); JetFile file = (JetFile) element.getContainingFile();
BindingContext bindingContext; BindingContext bindingContext;
if (file instanceof JetCodeFragmentImpl) { if (file instanceof JetCodeFragment) {
if (element instanceof JetElement) { if (element instanceof JetElement) {
ResolveSessionForBodies resolveSession = ResolvePackage.getLazyResolveSession((JetElement) element); ResolveSessionForBodies resolveSession = ResolvePackage.getLazyResolveSession((JetElement) element);
bindingContext = resolveSession.resolveToElement((JetElement) element); bindingContext = resolveSession.resolveToElement((JetElement) element);
@@ -129,7 +129,7 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension {
element.accept(visitor); 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); ElementAnnotator elementAnnotator = new ElementAnnotator(element, holder);
for (Diagnostic diagnostic : bindingContext.getDiagnostics().forElement(element)) { for (Diagnostic diagnostic : bindingContext.getDiagnostics().forElement(element)) {
elementAnnotator.registerDiagnosticAnnotations(diagnostic); elementAnnotator.registerDiagnosticAnnotations(diagnostic);
idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java
+1 -1
View File
@@ -96,7 +96,7 @@ public class ImportInsertHelper {
} }
public static void writeImportToFile(@NotNull ImportPath importPath, @NotNull JetFile file) { 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 // TODO Insert import doesn't work for codeFragments yet
return; return;
} }
idea/src/org/jetbrains/jet/plugin/quickfix/JetSingleIntentionActionFactory.java
+2 -2
View File
@@ -20,7 +20,7 @@ import com.intellij.codeInsight.intention.IntentionAction;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.diagnostics.Diagnostic; 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.LinkedList;
import java.util.List; import java.util.List;
@@ -35,7 +35,7 @@ public abstract class JetSingleIntentionActionFactory implements JetIntentionAct
public final List<IntentionAction> createActions(Diagnostic diagnostic) { public final List<IntentionAction> createActions(Diagnostic diagnostic) {
List<IntentionAction> intentionActionList = new LinkedList<IntentionAction>(); List<IntentionAction> intentionActionList = new LinkedList<IntentionAction>();
if (diagnostic.getPsiElement().getContainingFile() instanceof JetCodeFragmentImpl) { if (diagnostic.getPsiElement().getContainingFile() instanceof JetCodeFragment) {
return intentionActionList; return intentionActionList;
} }