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 (formatting)

Browse Source
This commit is contained in:
Roman Shevchenko
2013-05-20 18:06:07 +02:00
parent 75bbbeff66
commit 564eba9037
5 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
+19 -11
View File
@@ -839,21 +839,29 @@ public final class PsiUtil extends PsiUtilCore {
@NotNull
public static LanguageLevel getLanguageLevel(@NotNull PsiElement element) {
if (element instanceof PsiDirectory) return JavaDirectoryService.getInstance().getLanguageLevel((PsiDirectory)element);
final PsiFile file = element.getContainingFile();
if (file == null) {
LanguageLevelProjectExtension instance = LanguageLevelProjectExtension.getInstance(element.getProject());
return instance == null ? LanguageLevel.HIGHEST : instance.getLanguageLevel();
if (element instanceof PsiDirectory) {
return JavaDirectoryService.getInstance().getLanguageLevel((PsiDirectory)element);
}
if (!(file instanceof PsiJavaFile)) {
final PsiElement context = file.getContext();
if (context != null) return getLanguageLevel(context);
LanguageLevelProjectExtension instance = LanguageLevelProjectExtension.getInstance(file.getProject());
return instance == null ? LanguageLevel.HIGHEST : instance.getLanguageLevel();
PsiFile file = element.getContainingFile();
if (file instanceof PsiJavaFile) {
return ((PsiJavaFile)file).getLanguageLevel();
}
return ((PsiJavaFile)file).getLanguageLevel();
if (file != null) {
PsiElement context = file.getContext();
if (context != null) {
return getLanguageLevel(context);
}
}
return getLanguageLevel(element.getProject());
}
@NotNull
public static LanguageLevel getLanguageLevel(@NotNull Project project) {
LanguageLevelProjectExtension instance = LanguageLevelProjectExtension.getInstance(project);
return instance != null ? instance.getLanguageLevel() : LanguageLevel.HIGHEST;
}
public static boolean isInstantiatable(@NotNull PsiClass clazz) {
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassStubImpl.java
+3 -7
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
* Copyright 2000-2013 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.
@@ -185,8 +185,7 @@ public class PsiClassStubImpl<T extends PsiClass> extends StubBase<T> implements
@SuppressWarnings({"HardCodedStringLiteral"})
public String toString() {
StringBuilder builder = new StringBuilder();
builder.
append("PsiClassStub[");
builder.append("PsiClassStub[");
if (isInterface()) {
builder.append("interface ");
@@ -216,15 +215,12 @@ public class PsiClassStubImpl<T extends PsiClass> extends StubBase<T> implements
builder.append("deprecatedA ");
}
builder.
append("name=").append(getName()).
append(" fqn=").append(getQualifiedName());
builder.append("name=").append(getName()).append(" fqn=").append(getQualifiedName());
if (getBaseClassReferenceText() != null) {
builder.append(" baseref=").append(getBaseClassReferenceText());
}
if (isAnonymousInQualifiedNew()) {
builder.append(" inqualifnew");
}
java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java
+2 -4
View File
@@ -92,8 +92,7 @@ public class JavaFileElementType extends ILightStubFileElementType<PsiJavaFileSt
}
@Override
public void serialize(@NotNull final PsiJavaFileStub stub, @NotNull final StubOutputStream dataStream)
throws IOException {
public void serialize(@NotNull final PsiJavaFileStub stub, @NotNull final StubOutputStream dataStream) throws IOException {
dataStream.writeBoolean(stub.isCompiled());
dataStream.writeName(stub.getPackageName());
}
@@ -107,6 +106,5 @@ public class JavaFileElementType extends ILightStubFileElementType<PsiJavaFileSt
}
@Override
public void indexStub(@NotNull final PsiJavaFileStub stub, @NotNull final IndexSink sink) {
}
public void indexStub(@NotNull final PsiJavaFileStub stub, @NotNull final IndexSink sink) { }
}
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java
+13 -9
View File
@@ -445,19 +445,22 @@ public abstract class PsiJavaFileBaseImpl extends PsiFileImpl implements PsiJava
}
private LanguageLevel getLanguageLevelInner() {
if (myOriginalFile instanceof PsiJavaFile) return ((PsiJavaFile)myOriginalFile).getLanguageLevel();
final LanguageLevel forcedLanguageLevel = getUserData(PsiUtil.FILE_LANGUAGE_LEVEL_KEY);
if (forcedLanguageLevel != null) return forcedLanguageLevel;
VirtualFile virtualFile = getVirtualFile();
if (virtualFile == null) {
virtualFile = getUserData(IndexingDataKeys.VIRTUAL_FILE);
if (myOriginalFile instanceof PsiJavaFile) {
return ((PsiJavaFile)myOriginalFile).getLanguageLevel();
}
LanguageLevel forcedLanguageLevel = getUserData(PsiUtil.FILE_LANGUAGE_LEVEL_KEY);
if (forcedLanguageLevel != null) return forcedLanguageLevel;
VirtualFile virtualFile = getVirtualFile();
if (virtualFile == null) virtualFile = getUserData(IndexingDataKeys.VIRTUAL_FILE);
final Project project = getProject();
if (virtualFile == null) {
final PsiFile originalFile = getOriginalFile();
if (originalFile instanceof PsiJavaFile && originalFile != this) return ((PsiJavaFile)originalFile).getLanguageLevel();
if (originalFile instanceof PsiJavaFile && originalFile != this) {
return ((PsiJavaFile)originalFile).getLanguageLevel();
}
return LanguageLevelProjectExtension.getInstance(project).getLanguageLevel();
}
@@ -471,7 +474,8 @@ public abstract class PsiJavaFileBaseImpl extends PsiFileImpl implements PsiJava
if (classesLanguageLevel != null) {
return classesLanguageLevel;
}
return LanguageLevelProjectExtension.getInstance(project).getLanguageLevel();
return PsiUtil.getLanguageLevel(project);
}
private static class MyCacheBuilder implements CachedValueProvider<MostlySingularMultiMap<String, SymbolCollectingProcessor.ResultWithContext>> {
platform/core-impl/src/com/intellij/psi/impl/PsiFileFactoryImpl.java
+2 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2013 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.
@@ -61,8 +61,7 @@ public class PsiFileFactoryImpl extends PsiFileFactory {
}
@Override
public PsiFile createFileFromText(@NotNull String name, @NotNull Language language, @NotNull CharSequence text, boolean physical,
final boolean markAsCopy) {
public PsiFile createFileFromText(@NotNull String name, @NotNull Language language, @NotNull CharSequence text, boolean physical, boolean markAsCopy) {
return createFileFromText(name, language, text, physical, markAsCopy, false);
}