cleanup: remove deprecated API which is scheduled for removal in 2021.2 (IDEA-262168)

GitOrigin-RevId: 6d99af8b15c74bfeca8b856e2314d3773228ac4d

json/src/com/jetbrains/jsonSchema/JsonSchemaFileType.java

@@ -1,58 +0,0 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.jsonSchema;
-
-import com.intellij.icons.AllIcons;
-import com.intellij.json.JsonBundle;
-import com.intellij.json.JsonLanguage;
-import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.fileTypes.ex.FileTypeIdentifiableByVirtualFile;
-import com.intellij.openapi.vfs.VirtualFile;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;
-
-/**
- * To make plugin github.com/BlueBoxWare/LibGDXPlugin happy
- * @author Irina.Chernushina on 4/1/2016.
- * @deprecated This file type is no longer registered
- */
-@Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.2")
-public final class JsonSchemaFileType extends LanguageFileType implements FileTypeIdentifiableByVirtualFile {
-  public static final JsonSchemaFileType INSTANCE = new JsonSchemaFileType();
-
-  private JsonSchemaFileType() {
-    super(JsonLanguage.INSTANCE);
-  }
-
-  @NotNull
-  @Override
-  public String getName() {
-    return "JSON Schema";
-  }
-
-  @NotNull
-  @Override
-  public String getDescription() {
-    return JsonBundle.message("filetype.json.schema.description");
-  }
-
-  @NotNull
-  @Override
-  public String getDefaultExtension() {
-    return "json";
-  }
-
-  @Nullable
-  @Override
-  public Icon getIcon() {
-    return AllIcons.FileTypes.JsonSchema;
-  }
-
-  @Override
-  public boolean isMyFileType(@NotNull VirtualFile file) {
-    return false;
-  }
-}

plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java

@@ -43,15 +43,6 @@ public class MergeChangeCollector {
     myRepository = repository;
   }
 
-  /**
-   * @deprecated use constructor with GitRepository
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2020.3")
-  public MergeChangeCollector(@NotNull Project project, @NotNull VirtualFile root, @NotNull GitRevisionNumber start) {
-    this(project, Objects.requireNonNull(GitUtil.getRepositoryManager(project).getRepositoryForRoot(root)), start);
-  }
-
   /**
    * Collects changed files during or after merge operation to the supplied container.
    */

plugins/gradle/src/org/jetbrains/plugins/gradle/service/GradleInstallationManager.java

@@ -9,7 +9,6 @@ import com.intellij.openapi.externalSystem.ExternalSystemModulePropertyManager;
 import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskId;
 import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskNotificationListenerAdapter;
 import com.intellij.openapi.externalSystem.service.execution.ExternalSystemExecutionAware;
-import com.intellij.openapi.externalSystem.service.execution.ExternalSystemJdkProvider;
 import com.intellij.openapi.externalSystem.service.execution.ExternalSystemJdkUtil;
 import com.intellij.openapi.externalSystem.service.notification.ExternalSystemProgressNotificationManager;
 import com.intellij.openapi.module.Module;
@@ -35,9 +34,9 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.gradle.execution.target.GradleTargetUtil;
 import org.jetbrains.plugins.gradle.service.execution.BuildLayoutParameters;
+import org.jetbrains.plugins.gradle.service.execution.GradleExecutionAware;
 import org.jetbrains.plugins.gradle.service.execution.LocalBuildLayoutParameters;
 import org.jetbrains.plugins.gradle.service.execution.LocalGradleExecutionAware;
-import org.jetbrains.plugins.gradle.service.execution.GradleExecutionAware;
 import org.jetbrains.plugins.gradle.settings.DistributionType;
 import org.jetbrains.plugins.gradle.settings.GradleProjectSettings;
 import org.jetbrains.plugins.gradle.settings.GradleSettings;
@@ -204,19 +203,6 @@ public class GradleInstallationManager implements Disposable {
     return gradleHome != null ? new File(gradleHome) : null;
   }
 
-  /**
-   * @deprecated use {@link GradleInstallationManager#getGradleJvmPath(Project, String)} instead
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.2")
-  public @Nullable Sdk getGradleJdk(@Nullable Project project, @NotNull String linkedProjectPath) {
-    if (project == null) return null;
-    String homePath = getGradleJvmPath(project, linkedProjectPath);
-    if (homePath == null) return null;
-    ExternalSystemJdkProvider jdkProvider = ExternalSystemJdkProvider.getInstance();
-    return jdkProvider.createJdk(null, homePath);
-  }
-
   public @Nullable String getGradleJvmPath(@NotNull Project project, @NotNull String linkedProjectPath) {
     final GradleProjectSettings settings = GradleSettings.getInstance(project).getLinkedProjectSettings(linkedProjectPath);
     if (settings == null) return getAvailableJavaHome(project);

plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyFileType.java

@@ -6,26 +6,14 @@ import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.util.containers.ContainerUtil;
 import icons.JetgroovyIcons;
-import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashSet;
-import java.util.List;
 
 public final class GroovyFileType extends LanguageFileType {
-
-  /**
-   * @deprecated implement {@link GroovyEnabledFileType} in the FileType,
-   * or extend {@link LanguageFileType} and specify {@link GroovyLanguage#INSTANCE}
-   */
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  @ScheduledForRemoval(inVersion = "2021.1")
-  @Deprecated
-  public static final List<FileType> GROOVY_FILE_TYPES = new ArrayList<>();
   public static final @NotNull GroovyFileType GROOVY_FILE_TYPE = new GroovyFileType();
   @NonNls public static final String DEFAULT_EXTENSION = "groovy";
 
@@ -64,7 +52,7 @@ public final class GroovyFileType extends LanguageFileType {
   }
 
   public static @NotNull FileType @NotNull [] getGroovyEnabledFileTypes() {
-    Collection<FileType> result = new LinkedHashSet<>(GROOVY_FILE_TYPES);
+    Collection<FileType> result = new LinkedHashSet<>();
     result.addAll(ContainerUtil.filter(
       FileTypeManager.getInstance().getRegisteredFileTypes(),
       GroovyFileType::isGroovyEnabledFileType

plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/parser/GroovyElementTypes.java

@@ -2,9 +2,7 @@
 package org.jetbrains.plugins.groovy.lang.parser;
 
 import com.intellij.psi.tree.IElementType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.plugins.groovy.lang.lexer.GroovyElementType;
-import org.jetbrains.plugins.groovy.lang.psi.stubs.elements.GrMethodElementType;
 
 import static org.jetbrains.plugins.groovy.lang.psi.GroovyElementTypes.*;
 
@@ -15,13 +13,6 @@ import static org.jetbrains.plugins.groovy.lang.psi.GroovyElementTypes.*;
  */
 public interface GroovyElementTypes extends GroovyStubElementTypes, GroovyEmptyStubElementTypes {
 
-  /**
-   * @deprecated use {@link #METHOD}
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.2")
-  GrMethodElementType METHOD_DEFINITION = METHOD;
-
   GroovyElementType LITERAL = org.jetbrains.plugins.groovy.lang.psi.GroovyElementTypes.LITERAL;
 
   GrCodeBlockElementType CLOSABLE_BLOCK = CLOSURE;

plugins/junit/src/com/intellij/execution/junit/TestMethodConfigurationProducer.java

@@ -1,37 +0,0 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.execution.junit;
-
-import com.intellij.execution.actions.ConfigurationContext;
-import com.intellij.execution.configurations.ConfigurationFactory;
-import com.intellij.execution.testframework.AbstractInClassConfigurationProducer;
-import com.intellij.openapi.util.Ref;
-import com.intellij.psi.PsiElement;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @deprecated use {@link TestInClassConfigurationProducer} instead
- */
-@ApiStatus.ScheduledForRemoval(inVersion = "2019.3")
-@Deprecated
-public class TestMethodConfigurationProducer extends AbstractInClassConfigurationProducer<JUnitConfiguration> {
-  @NotNull
-  @Override
-  public ConfigurationFactory getConfigurationFactory() {
-    return JUnitConfigurationType.getInstance().getConfigurationFactories()[0];
-  }
-
-  @SuppressWarnings("RedundantMethodOverride") // binary compatibility
-  @Override
-  protected boolean setupConfigurationFromContext(@NotNull JUnitConfiguration configuration,
-                                                  @NotNull ConfigurationContext context,
-                                                  @NotNull Ref<PsiElement> sourceElement) {
-    return super.setupConfigurationFromContext(configuration, context, sourceElement);
-  }
-
-  @SuppressWarnings("RedundantMethodOverride") // binary compatibility
-  @Override
-  public boolean isConfigurationFromContext(@NotNull JUnitConfiguration configuration, @NotNull ConfigurationContext context) {
-    return super.isConfigurationFromContext(configuration, context);
-  }
-}

plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapterLegacyImpl.java

@@ -429,15 +429,6 @@ public class MavenRootModelAdapterLegacyImpl implements MavenRootModelAdapterInt
     return result.get();
   }
 
-  /**
-   * @deprecated use {@link MavenArtifact#getLibraryName()}
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.2")
-  public static String makeLibraryName(@NotNull MavenArtifact artifact) {
-    return artifact.getLibraryName();
-  }
-
   public static boolean isMavenLibrary(@Nullable Library library) {
     return library != null && MavenArtifact.isMavenLibrary(library.getName());
   }

plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryAttachHandler.java

@@ -1,48 +0,0 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.idea.maven.utils.library;
-
-import com.intellij.jarRepository.JarRepositoryManager;
-import com.intellij.jarRepository.RemoteRepositoryDescription;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.libraries.NewLibraryConfiguration;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.idea.maven.model.MavenRepositoryInfo;
-
-import javax.swing.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * This class is deprecated and is to be removed in future releases
- * @deprecated Use {@link JarRepositoryManager} instead
- */
-@ApiStatus.ScheduledForRemoval(inVersion = "2020.3")
-@Deprecated
-public final class RepositoryAttachHandler {
-
-  @Nullable
-  public static NewLibraryConfiguration chooseLibraryAndDownload(final @NotNull Project project, final @Nullable String initialFilter, JComponent parentComponent) {
-    return JarRepositoryManager.chooseLibraryAndDownload(project, initialFilter, parentComponent);
-  }
-
-  @Nullable
-  public static NewLibraryConfiguration resolveAndDownload(final Project project,
-                                                           final String coord,
-                                                           boolean attachJavaDoc,
-                                                           boolean attachSources,
-                                                           @Nullable final String copyTo,
-                                                           List<? extends MavenRepositoryInfo> repositories) {
-    final ArrayList<RemoteRepositoryDescription> repos =
-      repositories.stream().map(info -> toRemoteRepositoryDescription(info)).collect(Collectors.toCollection(ArrayList::new));
-    return JarRepositoryManager.resolveAndDownload(project, coord, attachSources, attachJavaDoc, true, copyTo, repos);
-  }
-
-
-  @NotNull
-  private static RemoteRepositoryDescription toRemoteRepositoryDescription(MavenRepositoryInfo repo) {
-    return new RemoteRepositoryDescription(repo.getId(), repo.getName(), repo.getUrl());
-  }
-}

plugins/textmate/src/org/jetbrains/plugins/textmate/language/syntax/lexer/TextMateHighlightingLexer.java

@@ -1,13 +1,10 @@
 package org.jetbrains.plugins.textmate.language.syntax.lexer;
 
 import com.intellij.lexer.LexerBase;
-import com.intellij.openapi.util.registry.Registry;
 import com.intellij.psi.tree.IElementType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.textmate.language.TextMateLanguageDescriptor;
-import org.jetbrains.plugins.textmate.language.syntax.SyntaxNodeDescriptor;
 
 import java.util.LinkedList;
 import java.util.Queue;
@@ -25,16 +22,6 @@ public class TextMateHighlightingLexer extends LexerBase {
   private int myTokenEnd;
   private boolean myRestartable;
 
-  /**
-   * @deprecated use {@link TextMateHighlightingLexer#TextMateHighlightingLexer(TextMateLanguageDescriptor, int)} instead
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2020.3")
-  public TextMateHighlightingLexer(CharSequence scopeName, SyntaxNodeDescriptor languageRootSyntaxNode) {
-    myLexer = new TextMateLexer(new TextMateLanguageDescriptor(scopeName, languageRootSyntaxNode),
-                                Registry.get("textmate.line.highlighting.limit").asInteger());
-  }
-
   public TextMateHighlightingLexer(@NotNull TextMateLanguageDescriptor languageDescriptor, int lineLimit) {
     myLexer = new TextMateLexer(languageDescriptor, lineLimit);
   }

python/src/com/jetbrains/python/module/PyRootTypeProvider.java

@@ -29,7 +29,6 @@ import com.intellij.openapi.vfs.pointers.VirtualFilePointer;
 import com.intellij.openapi.vfs.pointers.VirtualFilePointerListener;
 import com.intellij.openapi.vfs.pointers.VirtualFilePointerManager;
 import com.intellij.util.containers.MultiMap;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -92,22 +91,11 @@ public abstract class PyRootTypeProvider {
     return getDescription();
   }
 
-  /**
-   * @deprecated Use {@link #getRootsGroupColor()}
-   */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.2")
-  @Deprecated
-  public Color getColor() {
-    throw new AbstractMethodError(getClass().getSimpleName() + " should override getRootsGroupColor()");
-  }
-
   /**
    * Returns the color of the list of paths to the corresponding directories in "Project Structure".
    */
   @NotNull
-  public Color getRootsGroupColor() {
-    return getColor();
-  }
+  public abstract Color getRootsGroupColor();
 
   /**
    * Returns an optional shortcut for the action for marking a directory with this root type in "Project Structure".

python/src/com/jetbrains/python/namespacePackages/PyNamespacePackageRootProvider.kt

@@ -69,7 +69,7 @@ class PyNamespacePackageRootProvider: PyRootTypeProvider() {
     return PyBundle.message("python.namespace.packages.description")
   }
 
-  override fun getColor(): Color {
+  override fun getRootsGroupColor(): Color {
     return EASTERN_BLUE
   }
 

xml/impl/src/com/intellij/application/options/XmlCodeStyleSettingsProvider.java

@@ -1,63 +0,0 @@
-/*
- * Copyright 2000-2014 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.application.options;
-
-import com.intellij.openapi.options.Configurable;
-import com.intellij.openapi.util.NlsContexts.ConfigurableName;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
-import com.intellij.psi.codeStyle.CodeStyleSettingsProvider;
-import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
-import com.intellij.psi.formatter.xml.XmlCodeStyleSettings;
-import com.intellij.xml.XmlBundle;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @deprecated Methods moved to {@link XmlLanguageCodeStyleSettingsProvider}
- */
-@Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.2")
-public class XmlCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
-  @Override
-  @NotNull
-  public Configurable createSettingsPage(final CodeStyleSettings settings, final CodeStyleSettings originalSettings) {
-    return new CodeStyleAbstractConfigurable(settings, originalSettings, XmlBundle.message("title.xml")){
-      @Override
-      protected CodeStyleAbstractPanel createPanel(final CodeStyleSettings settings) {
-        return new XmlCodeStyleMainPanel(getCurrentSettings(), settings);
-      }
-
-      @Override
-      public String getHelpTopic() {
-        return "reference.settingsdialog.IDE.globalcodestyle.xml";
-      }
-    };
-  }
-
-  @Override
-  public String getConfigurableDisplayName() {
-    return getConfigurableDisplayNameText();
-  }
-
-  @Override
-  public CustomCodeStyleSettings createCustomSettings(CodeStyleSettings settings) {
-    return new XmlCodeStyleSettings(settings);
-  }
-
-  public static @ConfigurableName String getConfigurableDisplayNameText() {
-    return XmlBundle.message("title.xml");
-  }
-}

xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java

@@ -305,19 +305,6 @@ public abstract class BaseHtmlLexer extends DelegateLexer {
     return null;
   }
 
-  /**
-   * This API does no longer work.
-   *
-   * @deprecated Use {@link HtmlEmbeddedContentSupport} API
-   */
-  @SuppressWarnings("unused")
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
-  protected boolean endOfTheEmbeddment(String name) {
-    logLegacyLexer();
-    return false;
-  }
-
   /**
    * This API does no longer work.
    *