From c2a144b7bb4fcf88aa1c3e56ed67059681dde39e Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 20 May 2016 18:04:01 +0200 Subject: [PATCH] [java] correct Java version in .class file editor notification (IDEA-156371) --- .../daemon/impl/AttachSourcesNotificationProvider.java | 4 +++- .../src/com/intellij/psi/impl/compiled/ClsParsingUtil.java | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/java/idea-ui/src/com/intellij/codeInsight/daemon/impl/AttachSourcesNotificationProvider.java b/java/idea-ui/src/com/intellij/codeInsight/daemon/impl/AttachSourcesNotificationProvider.java index 847c661ec0d2..b5edd0ad1fb3 100644 --- a/java/idea-ui/src/com/intellij/codeInsight/daemon/impl/AttachSourcesNotificationProvider.java +++ b/java/idea-ui/src/com/intellij/codeInsight/daemon/impl/AttachSourcesNotificationProvider.java @@ -175,7 +175,9 @@ public class AttachSourcesNotificationProvider extends EditorNotifications.Provi int major = stream.readUnsignedShort(); StringBuilder info = new StringBuilder().append("bytecode version: ").append(major).append('.').append(minor); LanguageLevel level = ClsParsingUtil.getLanguageLevelByVersion(major); - if (level != null) info.append(" (").append(level.getName()).append(')'); + if (level != null) { + info.append(" (").append(level == LanguageLevel.JDK_1_3 ? level.getName() + " or older" : level.getName()).append(')'); + } return info.toString(); } } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java index a46ec69d47af..900e0a056fbf 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java @@ -200,6 +200,9 @@ public class ClsParsingUtil { case Opcodes.V1_8: return LanguageLevel.JDK_1_8; + case Opcodes.V1_8 + 1: + return LanguageLevel.JDK_1_9; + default: return null; }