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

access JavaLanguage.INSTANCE directly wherever possible

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-09-20 12:54:59 +02:00
parent abbb1d053a
commit fb34c20e7a
25 changed files with 64 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+2 -1
View File
@@ -30,6 +30,7 @@ import com.intellij.codeInsight.quickfix.ChangeVariableTypeQuickFixProvider;
import com.intellij.codeInsight.quickfix.UnresolvedReferenceQuickFixProvider;
import com.intellij.lang.StdLanguages;
import com.intellij.lang.findUsages.LanguageFindUsages;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
@@ -1313,7 +1314,7 @@ public class HighlightUtil {
}
static String buildProblemWithStaticDescription(PsiElement refElement) {
String type = LanguageFindUsages.INSTANCE.forLanguage(StdLanguages.JAVA).getType(refElement);
String type = LanguageFindUsages.INSTANCE.forLanguage(JavaLanguage.INSTANCE).getType(refElement);
String name = HighlightMessageUtil.getSymbolName(refElement, PsiSubstitutor.EMPTY);
return JavaErrorMessages.message("non.static.symbol.referenced.from.static.context", type, name);
}
java/java-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java
+2 -1
View File
@@ -17,6 +17,7 @@ package com.intellij.psi.impl.compiled;
import com.intellij.lang.ASTNode;
import com.intellij.lang.Language;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.util.Key;
@@ -42,7 +43,7 @@ public abstract class ClsElementImpl extends PsiElementBase implements PsiCompil
@NotNull
public Language getLanguage() {
return StdFileTypes.JAVA.getLanguage();
return JavaLanguage.INSTANCE;
}
public PsiManager getManager() {
java/java-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
+2 -2
View File
@@ -18,7 +18,7 @@ package com.intellij.psi.impl.compiled;
import com.intellij.ide.caches.FileContent;
import com.intellij.lang.ASTNode;
import com.intellij.lang.FileASTNode;
import com.intellij.lang.StdLanguages;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
@@ -288,7 +288,7 @@ public class ClsFileImpl extends ClsRepositoryPsiElement<PsiClassHolderFileStub>
String fileName = (classes.length > 0 ? classes[0].getName(): virtualFile.getNameWithoutExtension()) + "." + ext;
PsiManager manager = getManager();
PsiFile mirror = PsiFileFactory.getInstance(manager.getProject()).createFileFromText(fileName, StdLanguages.JAVA, text, false, false);
PsiFile mirror = PsiFileFactory.getInstance(manager.getProject()).createFileFromText(fileName, JavaLanguage.INSTANCE, text, false, false);
final ASTNode mirrorTreeElement = SourceTreeToPsiMap.psiElementToTree(mirror);
//IMPORTANT: do not take lock too early - FileDocumentManager.getInstance().saveToString() can run write action...
java/java-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java
+2 -2
View File
@@ -21,10 +21,10 @@ import com.intellij.ide.projectView.impl.PackageViewPane;
import com.intellij.ide.projectView.impl.ProjectRootsUtil;
import com.intellij.ide.projectView.impl.nodes.PackageElement;
import com.intellij.lang.Language;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.undo.GlobalUndoableAction;
import com.intellij.openapi.command.undo.UndoManager;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.roots.*;
@@ -174,7 +174,7 @@ public class PsiPackageImpl extends PsiPackageBase implements PsiPackage, Querya
@NotNull
public Language getLanguage() {
return StdFileTypes.JAVA.getLanguage();
return JavaLanguage.INSTANCE;
}
public boolean isValid() {
java/java-impl/src/com/intellij/psi/impl/light/LightClassReference.java
+4 -4
View File
@@ -15,8 +15,8 @@
*/
package com.intellij.psi.impl.light;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.psi.*;
import com.intellij.psi.infos.CandidateInfo;
import com.intellij.psi.scope.PsiScopeProcessor;
@@ -36,7 +36,7 @@ public class LightClassReference extends LightElement implements PsiJavaCodeRefe
private LightReferenceParameterList myParameterList;
private LightClassReference(@NotNull PsiManager manager, @NotNull @NonNls String text, @NotNull @NonNls String className, PsiSubstitutor substitutor, @NotNull GlobalSearchScope resolveScope) {
super(manager, StdFileTypes.JAVA.getLanguage());
super(manager, JavaLanguage.INSTANCE);
myText = text;
myClassName = className;
myResolveScope = resolveScope;
@@ -51,7 +51,7 @@ public class LightClassReference extends LightElement implements PsiJavaCodeRefe
}
public LightClassReference(@NotNull PsiManager manager, @NotNull @NonNls String text, @NotNull @NonNls String className, PsiSubstitutor substitutor, PsiElement context) {
super(manager, StdFileTypes.JAVA.getLanguage());
super(manager, JavaLanguage.INSTANCE);
myText = text;
myClassName = className;
mySubstitutor = substitutor;
@@ -66,7 +66,7 @@ public class LightClassReference extends LightElement implements PsiJavaCodeRefe
}
public LightClassReference(@NotNull PsiManager manager, @NotNull @NonNls String text, @NotNull PsiClass refClass, PsiSubstitutor substitutor) {
super(manager, StdFileTypes.JAVA.getLanguage());
super(manager, JavaLanguage.INSTANCE);
myText = text;
myRefClass = refClass;
java/java-impl/src/com/intellij/psi/impl/light/LightEmptyImplementsList.java
+2 -2
View File
@@ -15,7 +15,7 @@
*/
package com.intellij.psi.impl.light;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.psi.*;
import org.jetbrains.annotations.NotNull;
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
*/
public class LightEmptyImplementsList extends LightElement implements PsiReferenceList {
public LightEmptyImplementsList(PsiManager manager) {
super(manager, StdFileTypes.JAVA.getLanguage());
super(manager, JavaLanguage.INSTANCE);
}
public String toString() {
java/java-impl/src/com/intellij/psi/impl/light/LightIdentifier.java
+2 -2
View File
@@ -15,9 +15,9 @@
*/
package com.intellij.psi.impl.light;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import org.jetbrains.annotations.NotNull;
/**
@@ -27,7 +27,7 @@ public class LightIdentifier extends LightElement implements PsiIdentifier, PsiJ
private final String myText;
public LightIdentifier(PsiManager manager, String text) {
super(manager, StdFileTypes.JAVA.getLanguage());
super(manager, JavaLanguage.INSTANCE);
myText = text;
}
java/java-impl/src/com/intellij/psi/impl/light/LightKeyword.java
+2 -2
View File
@@ -15,9 +15,9 @@
*/
package com.intellij.psi.impl.light;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.lexer.JavaLexer;
import com.intellij.lexer.Lexer;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType;
@@ -30,7 +30,7 @@ public class LightKeyword extends LightElement implements PsiKeyword, PsiJavaTok
private final String myText;
public LightKeyword(PsiManager manager, String text) {
super(manager, StdFileTypes.JAVA.getLanguage());
super(manager, JavaLanguage.INSTANCE);
myText = text;
}
java/java-impl/src/com/intellij/psi/impl/light/LightMemberReference.java
+2 -2
View File
@@ -15,8 +15,8 @@
*/
package com.intellij.psi.impl.light;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.psi.*;
import com.intellij.psi.infos.CandidateInfo;
import com.intellij.psi.scope.PsiScopeProcessor;
@@ -30,7 +30,7 @@ public class LightMemberReference extends LightElement implements PsiJavaCodeRef
private LightReferenceParameterList myParameterList;
public LightMemberReference(PsiManager manager, PsiMember refClass, PsiSubstitutor substitutor) {
super(manager, StdFileTypes.JAVA.getLanguage());
super(manager, JavaLanguage.INSTANCE);
myRefMember = refClass;
mySubstitutor = substitutor;
java/java-impl/src/com/intellij/psi/impl/light/LightMethod.java
+2 -2
View File
@@ -15,7 +15,7 @@
*/
package com.intellij.psi.impl.light;
import com.intellij.lang.StdLanguages;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.navigation.ItemPresentation;
import com.intellij.psi.*;
import com.intellij.psi.impl.ElementPresentationUtil;
@@ -46,7 +46,7 @@ public class LightMethod extends LightElement implements PsiMethod {
}
public LightMethod(PsiManager manager, PsiMethod method, PsiClass containingClass) {
super(manager, StdLanguages.JAVA);
super(manager, JavaLanguage.INSTANCE);
myMethod = method;
myContainingClass = containingClass;
}
java/java-impl/src/com/intellij/psi/impl/light/LightPackageReference.java
+3 -3
View File
@@ -15,8 +15,8 @@
*/
package com.intellij.psi.impl.light;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.psi.*;
import com.intellij.psi.infos.CandidateInfo;
import com.intellij.psi.scope.PsiScopeProcessor;
@@ -28,13 +28,13 @@ public class LightPackageReference extends LightElement implements PsiJavaCodeRe
private final PsiPackage myRefPackage;
public LightPackageReference(PsiManager manager, PsiPackage refPackage) {
super(manager, StdFileTypes.JAVA.getLanguage());
super(manager, JavaLanguage.INSTANCE);
myPackageName = null;
myRefPackage = refPackage;
}
public LightPackageReference(PsiManager manager, String packageName) {
super(manager, StdFileTypes.JAVA.getLanguage());
super(manager, JavaLanguage.INSTANCE);
myPackageName = packageName;
myRefPackage = null;
}
java/java-impl/src/com/intellij/psi/impl/light/LightReferenceParameterList.java
+2 -2
View File
@@ -15,9 +15,9 @@
*/
package com.intellij.psi.impl.light;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.psi.*;
import com.intellij.psi.impl.PsiImplUtil;
import com.intellij.openapi.fileTypes.StdFileTypes;
import org.jetbrains.annotations.NotNull;
/**
@@ -28,7 +28,7 @@ public class LightReferenceParameterList extends LightElement implements PsiRefe
private final String myText;
public LightReferenceParameterList(PsiManager manager, PsiTypeElement[] referenceElements) {
super(manager, StdFileTypes.JAVA.getLanguage());
super(manager, JavaLanguage.INSTANCE);
myTypeElements = referenceElements;
myText = calculateText();
}
java/java-impl/src/com/intellij/psi/impl/light/LightTypeElement.java
+2 -2
View File
@@ -15,7 +15,7 @@
*/
package com.intellij.psi.impl.light;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.IncorrectOperationException;
@@ -29,7 +29,7 @@ public class LightTypeElement extends LightElement implements PsiTypeElement {
private final PsiType myType;
public LightTypeElement(PsiManager manager, PsiType type) {
super(manager, StdFileTypes.JAVA.getLanguage());
super(manager, JavaLanguage.INSTANCE);
type = PsiUtil.convertAnonymousToBaseType(type);
myType = type;
}
java/java-impl/src/com/intellij/psi/impl/light/LightVariableBase.java
+2 -2
View File
@@ -16,7 +16,7 @@
package com.intellij.psi.impl.light;
import com.intellij.lang.Language;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.impl.ElementPresentationUtil;
@@ -39,7 +39,7 @@ public abstract class LightVariableBase extends LightElement implements PsiVaria
protected boolean myWritable;
public LightVariableBase(PsiManager manager, PsiIdentifier nameIdentifier, PsiType type, boolean writable, PsiElement scope) {
this(manager, nameIdentifier, StdFileTypes.JAVA.getLanguage(), type, writable, scope);
this(manager, nameIdentifier, JavaLanguage.INSTANCE, type, writable, scope);
}
public LightVariableBase(PsiManager manager, PsiIdentifier nameIdentifier, Language language, PsiType type, boolean writable, PsiElement scope) {
java/java-impl/src/com/intellij/psi/impl/migration/MigrationClassImpl.java
+2 -2
View File
@@ -15,8 +15,8 @@
*/
package com.intellij.psi.impl.migration;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.psi.*;
import com.intellij.psi.impl.InheritanceImplUtil;
import com.intellij.psi.impl.PsiClassImplUtil;
@@ -43,7 +43,7 @@ public class MigrationClassImpl extends LightElement implements PsiClass{
private final PsiMigrationImpl myMigration;
MigrationClassImpl(PsiMigrationImpl migration, String qualifiedName) {
super(migration.getManager(), StdFileTypes.JAVA.getLanguage());
super(migration.getManager(), JavaLanguage.INSTANCE);
myMigration = migration;
myQualifiedName = qualifiedName;
myName = PsiNameHelper.getShortClassName(myQualifiedName);
java/java-impl/src/com/intellij/psi/impl/source/JavaDummyHolder.java
+7 -7
View File
@@ -15,7 +15,7 @@
*/
package com.intellij.psi.impl.source;
import com.intellij.lang.StdLanguages;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.resolve.JavaResolveUtil;
import com.intellij.psi.impl.source.tree.TreeElement;
@@ -35,27 +35,27 @@ public class JavaDummyHolder extends DummyHolder implements PsiImportHolder {
private Map<String, PsiClass> myPseudoImports = EMPTY;
public JavaDummyHolder(@NotNull PsiManager manager, TreeElement contentElement, PsiElement context) {
super(manager, contentElement, context, null, null, StdLanguages.JAVA);
super(manager, contentElement, context, null, null, JavaLanguage.INSTANCE);
}
public JavaDummyHolder(@NotNull PsiManager manager, CharTable table, boolean validity) {
super(manager, null, null, table, Boolean.valueOf(validity), StdLanguages.JAVA);
super(manager, null, null, table, Boolean.valueOf(validity), JavaLanguage.INSTANCE);
}
public JavaDummyHolder(@NotNull PsiManager manager, PsiElement context) {
super(manager, null, context, null, null, StdLanguages.JAVA);
super(manager, null, context, null, null, JavaLanguage.INSTANCE);
}
public JavaDummyHolder(@NotNull PsiManager manager, TreeElement contentElement, PsiElement context, CharTable table) {
super(manager, contentElement, context, table, null, StdLanguages.JAVA);
super(manager, contentElement, context, table, null, JavaLanguage.INSTANCE);
}
public JavaDummyHolder(@NotNull PsiManager manager, PsiElement context, CharTable table) {
super(manager, null, context, table, null, StdLanguages.JAVA);
super(manager, null, context, table, null, JavaLanguage.INSTANCE);
}
public JavaDummyHolder(@NotNull PsiManager manager, final CharTable table) {
super(manager, null, null, table, null, StdLanguages.JAVA);
super(manager, null, null, table, null, JavaLanguage.INSTANCE);
}
public boolean importClass(PsiClass aClass) {
java/java-impl/src/com/intellij/psi/impl/source/JavaStubPsiElement.java
+2 -2
View File
@@ -23,7 +23,7 @@ import com.intellij.extapi.psi.StubBasedPsiElementBase;
import com.intellij.ide.util.EditSourceUtil;
import com.intellij.lang.ASTNode;
import com.intellij.lang.Language;
import com.intellij.lang.StdLanguages;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.pom.Navigatable;
import com.intellij.psi.PsiElement;
@@ -54,7 +54,7 @@ public abstract class JavaStubPsiElement<T extends StubElement> extends StubBase
@NotNull
public Language getLanguage() {
return StdLanguages.JAVA;
return JavaLanguage.INSTANCE;
}
public PsiElement getParent() {
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
+3 -3
View File
@@ -16,7 +16,7 @@
package com.intellij.psi.impl.source.codeStyle;
import com.intellij.lang.ASTNode;
import com.intellij.lang.StdLanguages;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.util.Comparing;
@@ -675,7 +675,7 @@ public class ImportHelper{
if (jspFile != null) {
PsiFile[] files = ArrayUtil.mergeArrays(JspSpiUtil.getIncludingFiles(jspFile), JspSpiUtil.getIncludedFiles(jspFile));
for (PsiFile includingFile : files) {
final PsiFile javaRoot = includingFile.getViewProvider().getPsi(StdLanguages.JAVA);
final PsiFile javaRoot = includingFile.getViewProvider().getPsi(JavaLanguage.INSTANCE);
if (javaRoot instanceof PsiJavaFile && file != javaRoot) {
collectNamesToImport(names, comments, (PsiJavaFile)javaRoot, jspFile);
}
@@ -810,7 +810,7 @@ public class ImportHelper{
}
// do not optimize unresolved imports for things like JSP (IDEA-41814)
if (file.getViewProvider().getLanguages().size() > 1 && file.getViewProvider().getBaseLanguage() != StdLanguages.JAVA) {
if (file.getViewProvider().getLanguages().size() > 1 && file.getViewProvider().getBaseLanguage() != JavaLanguage.INSTANCE) {
namesToImport.addAll(unresolvedOnDemand);
namesToImport.addAll(unresolvedNames.values());
return;
java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java
+2 -2
View File
@@ -25,7 +25,7 @@ import com.intellij.codeInsight.daemon.impl.quickfix.QuickFixActionRegistrarImpl
import com.intellij.codeInsight.daemon.quickFix.CreateClassOrPackageFix;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.LocalQuickFixProvider;
import com.intellij.lang.StdLanguages;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil;
@@ -392,7 +392,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer
if (containingFile instanceof PsiJavaFile) {
if (containingFile instanceof JspFile) {
containingFile = containingFile.getViewProvider().getPsi(StdLanguages.JAVA);
containingFile = containingFile.getViewProvider().getPsi(JavaLanguage.INSTANCE);
if (containingFile == null) return JavaResolveResult.EMPTY;
}
java/java-impl/src/com/intellij/psi/impl/source/tree/JavaDocElementType.java
+3 -3
View File
@@ -16,7 +16,7 @@
package com.intellij.psi.impl.source.tree;
import com.intellij.lang.ASTNode;
import com.intellij.lang.StdLanguages;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.lexer.JavaLexer;
import com.intellij.openapi.project.Project;
import com.intellij.pom.java.LanguageLevel;
@@ -55,7 +55,7 @@ public interface JavaDocElementType {
class JavaDocLazyElementType extends ILazyParseableElementType {
private JavaDocLazyElementType(@NonNls final String debugName) {
super(debugName, StdLanguages.JAVA);
super(debugName, JavaLanguage.INSTANCE);
}
@Override
@@ -95,7 +95,7 @@ public interface JavaDocElementType {
}
};
ILazyParseableElementType DOC_COMMENT = new IReparseableElementType("DOC_COMMENT", StdLanguages.JAVA) {
ILazyParseableElementType DOC_COMMENT = new IReparseableElementType("DOC_COMMENT", JavaLanguage.INSTANCE) {
@Override
public ASTNode createNode(final CharSequence text) {
return new PsiDocCommentImpl(text);
java/java-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java
+7 -6
View File
@@ -16,6 +16,7 @@
package com.intellij.psi.impl.source.tree;
import com.intellij.lang.*;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.lang.java.parser.ExpressionParser;
import com.intellij.lang.java.parser.JavaParserUtil;
import com.intellij.lang.java.parser.ReferenceParser;
@@ -138,7 +139,7 @@ public interface JavaElementType {
class ICodeBlockElementType extends IErrorCounterReparseableElementType implements ICompositeElementType, ILightLazyParseableElementType {
private ICodeBlockElementType() {
super("CODE_BLOCK", StdLanguages.JAVA);
super("CODE_BLOCK", JavaLanguage.INSTANCE);
}
@Override
@@ -191,7 +192,7 @@ public interface JavaElementType {
}
ILazyParseableElementType CODE_BLOCK = new ICodeBlockElementType();
IElementType STATEMENTS = new ICodeFragmentElementType("STATEMENTS", StdLanguages.JAVA) {
IElementType STATEMENTS = new ICodeFragmentElementType("STATEMENTS", JavaLanguage.INSTANCE) {
@Nullable
@Override
public ASTNode parseContents(final ASTNode chameleon) {
@@ -204,7 +205,7 @@ public interface JavaElementType {
}
};
IElementType EXPRESSION_TEXT = new ICodeFragmentElementType("EXPRESSION_TEXT", StdLanguages.JAVA) {
IElementType EXPRESSION_TEXT = new ICodeFragmentElementType("EXPRESSION_TEXT", JavaLanguage.INSTANCE) {
@Nullable
@Override
public ASTNode parseContents(final ASTNode chameleon) {
@@ -217,7 +218,7 @@ public interface JavaElementType {
}
};
IElementType REFERENCE_TEXT = new ICodeFragmentElementType("REFERENCE_TEXT", StdLanguages.JAVA) {
IElementType REFERENCE_TEXT = new ICodeFragmentElementType("REFERENCE_TEXT", JavaLanguage.INSTANCE) {
@Nullable
@Override
public ASTNode parseContents(final ASTNode chameleon) {
@@ -230,7 +231,7 @@ public interface JavaElementType {
}
};
IElementType TYPE_TEXT = new ICodeFragmentElementType("TYPE_TEXT", StdLanguages.JAVA) {
IElementType TYPE_TEXT = new ICodeFragmentElementType("TYPE_TEXT", JavaLanguage.INSTANCE) {
@Nullable
@Override
public ASTNode parseContents(final ASTNode chameleon) {
@@ -246,7 +247,7 @@ public interface JavaElementType {
class JavaDummyElementType extends ILazyParseableElementType implements ICompositeElementType {
private JavaDummyElementType() {
super("DUMMY_ELEMENT", StdLanguages.JAVA);
super("DUMMY_ELEMENT", JavaLanguage.INSTANCE);
}
@NotNull
java/java-impl/src/com/intellij/refactoring/actions/TypeCookAction.java
+2 -2
View File
@@ -17,9 +17,9 @@ package com.intellij.refactoring.actions;
import com.intellij.ide.DataManager;
import com.intellij.lang.Language;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.refactoring.RefactoringActionHandler;
@@ -32,7 +32,7 @@ public class TypeCookAction extends BaseRefactoringAction {
}
public boolean isAvailableForLanguage(Language language) {
return language.equals(StdFileTypes.JAVA.getLanguage());
return language.equals(JavaLanguage.INSTANCE);
}
public boolean isEnabledOnElements(PsiElement[] elements) {
java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
+2 -2
View File
@@ -19,7 +19,7 @@ import com.intellij.codeInsight.ExpectedTypeInfo;
import com.intellij.codeInsight.ExpectedTypesProvider;
import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil;
import com.intellij.codeInsight.highlighting.HighlightManager;
import com.intellij.lang.StdLanguages;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.RangeMarker;
@@ -620,7 +620,7 @@ public class RefactoringUtil {
public static boolean isMethodUsage(PsiElement element) {
if (element instanceof PsiEnumConstant) {
return StdLanguages.JAVA.equals(element.getLanguage());
return JavaLanguage.INSTANCE.equals(element.getLanguage());
}
if (!(element instanceof PsiJavaCodeReferenceElement)) return false;
PsiElement parent = element.getParent();
java/openapi/src/com/intellij/lang/StdLanguages.java
+1
View File
@@ -25,6 +25,7 @@ import com.intellij.openapi.fileTypes.FileTypes;
public class StdLanguages {
/**
* The definition for the Java language.
* @deprecated use JavaLanguage.INSTANCE instead
*/
public static Language JAVA = StdFileTypes.JAVA.getLanguage();
java/openapi/src/com/intellij/psi/tree/java/IJavaDocElementType.java
+2 -2
View File
@@ -15,12 +15,12 @@
*/
package com.intellij.psi.tree.java;
import com.intellij.lang.StdLanguages;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NonNls;
public class IJavaDocElementType extends IElementType {
public IJavaDocElementType(@NonNls final String debugName) {
super(debugName, StdLanguages.JAVA);
super(debugName, JavaLanguage.INSTANCE);
}
}