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

java: util method shouldn't pretend it recognizes all .class file versions

Browse Source
This commit is contained in:
Roman Shevchenko
2015-05-05 21:17:47 +02:00
parent 6e03229865
commit 5e0e849741
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/codeInsight/daemon/impl/AttachSourcesNotificationProvider.java
+4 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 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,10 @@ public class AttachSourcesNotificationProvider extends EditorNotifications.Provi
if (stream.readInt() == 0xCAFEBABE) {
int minor = stream.readUnsignedShort();
int major = stream.readUnsignedShort();
StringBuilder info = new StringBuilder().append("bytecode version: ").append(major).append('.').append(minor);
LanguageLevel level = ClsParsingUtil.getLanguageLevelByVersion(major);
return "bytecode version: " + major + "." + minor + " (" + level.getName() + ")";
if (level != null) info.append(" (").append(level.getName()).append(')');
return info.toString();
}
}
finally {
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java
+2 -1
View File
@@ -189,6 +189,7 @@ public class ClsParsingUtil {
return StringUtil.isJavaIdentifier(identifier) && !JavaLexer.isKeyword(identifier, level);
}
@Nullable
public static LanguageLevel getLanguageLevelByVersion(int major) {
switch (major) {
case Opcodes.V1_1:
@@ -213,7 +214,7 @@ public class ClsParsingUtil {
return LanguageLevel.JDK_1_8;
default:
return LanguageLevel.HIGHEST;
return null;
}
}
}
java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
+1
View File
@@ -96,6 +96,7 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
myResult = new PsiClassStubImpl(JavaStubElementTypes.CLASS, myParent, fqn, shortName, null, stubFlags);
LanguageLevel languageLevel = ClsParsingUtil.getLanguageLevelByVersion(version);
if (languageLevel == null) languageLevel = LanguageLevel.HIGHEST;
((PsiClassStubImpl)myResult).setLanguageLevel(languageLevel);
myModList = new PsiModifierListStubImpl(myResult, packClassFlags(flags));