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

SemVer: keep old variant. PackageJsonUtil, versionIsGreaterOrEqualMajor: use in-place simple method to get the major version

Browse Source
This commit is contained in:
irengrig
2017-03-09 13:17:25 +01:00
parent b42ac25804
commit 326cf9629f
2 changed files with 25 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/util/text/SemVer.java
+25 -2
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.util.text;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -87,13 +88,35 @@ public class SemVer implements Comparable<SemVer> {
@Nullable
public static SemVer parseFromText(@NotNull String text) {
return SemVerMatcher.parseFromText(text);
int majorEndInd = text.indexOf('.');
if (majorEndInd < 0) {
return null;
}
int major = StringUtil.parseInt(text.substring(0, majorEndInd), -1);
int minorEndInd = text.indexOf('.', majorEndInd + 1);
if (minorEndInd < 0) {
return null;
}
int minor = StringUtil.parseInt(text.substring(majorEndInd + 1, minorEndInd), -1);
final String patchStr;
int dashInd = text.indexOf('-', minorEndInd + 1);
if (dashInd >= 0) {
patchStr = text.substring(minorEndInd + 1, dashInd);
}
else {
patchStr = text.substring(minorEndInd + 1);
}
int patch = StringUtil.parseInt(patchStr, -1);
if (major >= 0 && minor >= 0 && patch >= 0) {
return new SemVer(text, major, minor, patch);
}
return null;
}
@NotNull
public static SemVer parseFromTextNonNullize(@Nullable final String text) {
if (text == null) return UNKNOWN;
final SemVer ver = SemVerMatcher.parseFromText(text);
final SemVer ver = parseFromText(text);
return ver == null ? UNKNOWN : ver;
}
platform/util/src/com/intellij/util/text/SemVerMatcher.java
-61
View File
@@ -1,61 +0,0 @@
/*
* Copyright 2000-2017 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.util.text;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* @author Irina.Chernushina on 3/9/2017.
*/
public class SemVerMatcher {
@Nullable
public static SemVer parseFromText(@NotNull String text) {
return parseFromText(text, false);
}
@Nullable
public static SemVer parseFromText(@NotNull String text, final boolean allowPartial) {
int majorEndInd = text.indexOf('.');
if (majorEndInd < 0) {
if (!allowPartial) return null;
final int major = StringUtil.parseInt(text, -1);
return major < 0 ? null : new SemVer(text, major, 0, 0);
}
int major = StringUtil.parseInt(text.substring(0, majorEndInd), -1);
int minorEndInd = text.indexOf('.', majorEndInd + 1);
if (minorEndInd < 0) {
if (!allowPartial) return null;
final int minor = StringUtil.parseInt(text.substring(majorEndInd + 1), -1);
return new SemVer(text, major, minor < 0 ? 0 : minor, 0);
}
int minor = StringUtil.parseInt(text.substring(majorEndInd + 1, minorEndInd), -1);
final String patchStr;
int dashInd = text.indexOf('-', minorEndInd + 1);
if (dashInd >= 0) {
patchStr = text.substring(minorEndInd + 1, dashInd);
}
else {
patchStr = text.substring(minorEndInd + 1);
}
int patch = StringUtil.parseInt(patchStr, -1);
if (major >= 0 && minor >= 0 && patch >= 0) {
return new SemVer(text, major, minor, patch);
}
return null;
}
}