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

Drop methods planned for removal in 2020.1

Browse Source 
GitOrigin-RevId: e674acb5f6181ad68616c88f41355dedf232451d
This commit is contained in:
Semyon Proshev
2019-11-11 16:48:35 +03:00
committed by intellij-monorepo-bot
parent eba7eea60c
commit 38d93fb370
3 changed files with 3 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java
View File

@@ -39,13 +39,12 @@ import com.intellij.util.ArrayUtil;
import com.intellij.util.Consumer;
import com.intellij.util.NullableConsumer;
import com.intellij.util.text.UniqueNameGenerator;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.awt.*;
import java.util.*;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -176,21 +175,6 @@ public class SdkConfigurationUtil {
return sdk;
}
/**
* @deprecated Use {@link SdkConfigurationUtil#createSdk(Collection, VirtualFile, SdkType, SdkAdditionalData, String)} instead.
* This method will be removed in 2020.1.
*/
@NotNull
@Deprecated
@ApiStatus.ScheduledForRemoval(inVersion = "2020.1")
public static ProjectJdkImpl createSdk(@NotNull Sdk[] allSdks,
@NotNull VirtualFile homeDir,
@NotNull SdkType sdkType,
@Nullable SdkAdditionalData additionalData,
@Nullable String customSdkSuggestedName) {
return createSdk(Arrays.asList(allSdks), homeDir, sdkType, additionalData, customSdkSuggestedName);
}
@NotNull
public static ProjectJdkImpl createSdk(@NotNull Collection<? extends Sdk> allSdks,
@NotNull VirtualFile homeDir,

12
python/python-psi-api/src/com/jetbrains/python/psi/PyElementGenerator.java
View File

@@ -21,7 +21,6 @@ import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -61,17 +60,8 @@ public abstract class PyElementGenerator {
public abstract PyBinaryExpression createBinaryExpression(String s, PyExpression expr, PyExpression listLiteral);
/**
* @param text the text to create an expression from
* @return the expression
* @deprecated use the overload with language level specified
*/
@Deprecated
@ApiStatus.ScheduledForRemoval(inVersion = "2020.1")
public abstract PyExpression createExpressionFromText(String text);
@NotNull
public abstract PyExpression createExpressionFromText(final LanguageLevel languageLevel, String text) throws IncorrectOperationException;
public abstract PyExpression createExpressionFromText(@NotNull LanguageLevel languageLevel, @NotNull String text) throws IncorrectOperationException;
/**
* Adds elements to list inserting required commas.

7
python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyElementGeneratorImpl.java
View File

@@ -268,14 +268,9 @@ public class PyElementGeneratorImpl extends PyElementGenerator {
return binExpr;
}
@Override
public PyExpression createExpressionFromText(final String text) {
return createExpressionFromText(LanguageLevel.getDefault(), text);
}
@Override
@NotNull
public PyExpression createExpressionFromText(final LanguageLevel languageLevel, final String text) {
public PyExpression createExpressionFromText(@NotNull LanguageLevel languageLevel, @NotNull String text) {
final PsiFile dummyFile = createDummyFile(languageLevel, text);
final PsiElement element = dummyFile.getFirstChild();
if (element instanceof PyExpressionStatement) {