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

IDEA-166402 incorrect warning

Browse Source 
Corrected java version parsing pattern
This commit is contained in:
Alexey Ushakov
2017-01-11 16:44:00 +03:00
parent 26a7739891
commit 042d942131
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/util/JdkBundle.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class JdkBundle {
@NotNull
private static final Pattern[] VERSION_UPDATE_PATTERNS = {
Pattern.compile("^java version \"([\\d]+\\.[\\d]+\\.[\\d]+)_([\\d]+)\".*", Pattern.MULTILINE),
Pattern.compile("^java version \"([\\d]+\\.[\\d]+\\.[\\d]+)_([\\d]+).*\".*", Pattern.MULTILINE),
Pattern.compile("^openjdk version \"([\\d]+\\.[\\d]+\\.[\\d]+)_([\\d]+).*\".*", Pattern.MULTILINE),
Pattern.compile("^[a-zA-Z() \"\\d]*([\\d]+\\.[\\d]+\\.?[\\d]*).*", Pattern.MULTILINE)
};
platform/util/testSrc/com/intellij/util/VersionUtilTest.java
+2 -1
View File
@@ -15,7 +15,7 @@ public class VersionUtilTest extends TestCase {
Pattern.compile("^[a-zA-Z() \\d]*([\\d]+\\.[\\d]+\\.?[\\d]*).*", Pattern.MULTILINE)
};
private static final Pattern[] VERSION_UPDATE_PATTERNS = {
Pattern.compile("^java version \"([\\d]+\\.[\\d]+\\.[\\d]+)_([\\d]+)\".*", Pattern.MULTILINE),
Pattern.compile("^java version \"([\\d]+\\.[\\d]+\\.[\\d]+)_([\\d]+).*\".*", Pattern.MULTILINE),
Pattern.compile("^openjdk version \"([\\d]+\\.[\\d]+\\.[\\d]+)_([\\d]+).*\".*", Pattern.MULTILINE),
Pattern.compile("^[a-zA-Z() \"\\d]*([\\d]+\\.[\\d]+\\.?[\\d]*).*", Pattern.MULTILINE)
};
@@ -39,6 +39,7 @@ public class VersionUtilTest extends TestCase {
{"java version \"1.6.0\"", new Version(1, 6, 0), new Integer(0)},
{"java version \"1.6.0_36\"", new Version(1, 6, 0), new Integer(36)},
{"java version \"1.7.0_85\"", new Version(1, 7, 0), new Integer(85)},
{"java version \"1.8.0_122-ea\"", new Version(1, 8, 0), new Integer(122)},
{"openjdk version \"1.8.0_45-internal\"", new Version(1, 8, 0), new Integer(45)},
{"openjdk version \"1.8.1_60-release\"", new Version(1, 8, 1), new Integer(60)}
};