From c087d604374efbd729e4ed09697cc9c78fe85a60 Mon Sep 17 00:00:00 2001 From: Semyon Proshev Date: Tue, 8 Oct 2019 19:05:13 +0300 Subject: [PATCH] No more warnings about setting `null` as a version string for sdk used in tests GitOrigin-RevId: 8212a7e6c69c3a8e7a358f715d5fcc4cd6dbcd49 --- .../test/com/jetbrains/python/PythonMockSdk.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/python/python-psi-impl/test/com/jetbrains/python/PythonMockSdk.java b/python/python-psi-impl/test/com/jetbrains/python/PythonMockSdk.java index 347bccc7f244..ab3f85ba54fa 100644 --- a/python/python-psi-impl/test/com/jetbrains/python/PythonMockSdk.java +++ b/python/python-psi-impl/test/com/jetbrains/python/PythonMockSdk.java @@ -66,7 +66,7 @@ public class PythonMockSdk { roots.putValues(classes, Arrays.asList(additionalRoots)); - MockSdk sdk = new MockSdk(MOCK_SDK_NAME + " " + version, sdkHome, "Python " + version + " Mock SDK", roots, new PyMockSdkType()); + MockSdk sdk = new MockSdk(MOCK_SDK_NAME + " " + version, sdkHome, "Python " + version + " Mock SDK", roots, new PyMockSdkType(version)); // com.jetbrains.python.psi.resolve.PythonSdkPathCache.getInstance() corrupts SDK, so have to clone return sdk.clone(); @@ -74,8 +74,12 @@ public class PythonMockSdk { private static class PyMockSdkType extends SdkType { - public PyMockSdkType() { + @NotNull + private final String myVersionString; + + private PyMockSdkType(@NotNull String string) { super(PyNames.PYTHON_SDK_ID_NAME); + myVersionString = string; } @Nullable @@ -111,5 +115,11 @@ public class PythonMockSdk { public void saveAdditionalData(@NotNull SdkAdditionalData additionalData, @NotNull Element additional) { } + + @Nullable + @Override + public String getVersionString(String sdkHome) { + return myVersionString; + } } }