From 6ecc8cd7b0c796046e6f66112990ff30c33877af Mon Sep 17 00:00:00 2001 From: Tomasz Pasternak Date: Fri, 30 Aug 2024 12:30:09 +0200 Subject: [PATCH] chore: drop 213: Remove unused Scala compatibility methods (#6688) --- .../producers/ScalaBinaryContextProvider.java | 9 +++-- .../idea/sdkcompat/scala/ScalaCompat.java | 22 ----------- .../idea/sdkcompat/scala/ScalaCompat.java | 22 ----------- .../idea/sdkcompat/scala/ScalaCompat.java | 22 ----------- .../idea/sdkcompat/scala/ScalaCompat.java | 22 ----------- .../idea/sdkcompat/scala/ScalaCompat.java | 22 ----------- .../idea/sdkcompat/scala/ScalaCompat.java | 22 ----------- .../idea/sdkcompat/scala/ScalaCompat.java | 38 ------------------- .../idea/sdkcompat/scala/ScalaCompat.java | 38 ------------------- 9 files changed, 5 insertions(+), 212 deletions(-) delete mode 100644 sdkcompat/v221/com/google/idea/sdkcompat/scala/ScalaCompat.java delete mode 100644 sdkcompat/v222/com/google/idea/sdkcompat/scala/ScalaCompat.java delete mode 100644 sdkcompat/v223/com/google/idea/sdkcompat/scala/ScalaCompat.java delete mode 100644 sdkcompat/v231/com/google/idea/sdkcompat/scala/ScalaCompat.java delete mode 100644 sdkcompat/v232/com/google/idea/sdkcompat/scala/ScalaCompat.java delete mode 100644 sdkcompat/v233/com/google/idea/sdkcompat/scala/ScalaCompat.java delete mode 100644 sdkcompat/v241/com/google/idea/sdkcompat/scala/ScalaCompat.java delete mode 100644 sdkcompat/v242/com/google/idea/sdkcompat/scala/ScalaCompat.java diff --git a/scala/src/com/google/idea/blaze/scala/run/producers/ScalaBinaryContextProvider.java b/scala/src/com/google/idea/blaze/scala/run/producers/ScalaBinaryContextProvider.java index eb594561388..9cde5f7914b 100644 --- a/scala/src/com/google/idea/blaze/scala/run/producers/ScalaBinaryContextProvider.java +++ b/scala/src/com/google/idea/blaze/scala/run/producers/ScalaBinaryContextProvider.java @@ -25,7 +25,6 @@ import com.google.idea.blaze.base.run.testmap.FilteredTargetMap; import com.google.idea.blaze.base.sync.SyncCache; import com.google.idea.blaze.java.run.RunUtil; -import com.google.idea.sdkcompat.scala.ScalaCompat; import com.intellij.execution.JavaExecutionUtil; import com.intellij.execution.Location; import com.intellij.execution.actions.ConfigurationContext; @@ -36,8 +35,10 @@ import java.io.File; import java.util.Collection; import javax.annotation.Nullable; + import org.jetbrains.plugins.scala.lang.psi.api.ScalaFile; import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.ScObject; +import org.jetbrains.plugins.scala.util.ScalaMainMethodUtil; import scala.Option; /** Creates run configurations for Scala main classes sourced by scala_binary targets. */ @@ -56,7 +57,7 @@ public BinaryRunContext getRunContext(ConfigurationContext context) { if (target == null) { return null; } - Option mainMethod = ScalaCompat.findMainMethod(mainObject); + Option mainMethod = ScalaMainMethodUtil.findScala2MainMethod(mainObject); PsiElement sourceElement = mainMethod.getOrElse(() -> mainObject); return BinaryRunContext.create(sourceElement, target.toTargetInfo()); } @@ -86,7 +87,7 @@ private static ScObject getMainObjectFromElement(PsiElement element) { for (; element != null; element = element.getParent()) { if (element instanceof ScObject) { ScObject obj = (ScObject) element; - if (ScalaCompat.hasMainMethod(obj)) { + if (ScalaMainMethodUtil.hasScala2MainMethod(obj)) { return obj; } } else if (element instanceof ScalaFile) { @@ -103,7 +104,7 @@ private static ScObject getMainObjectFromFile(ScalaFile file) { continue; } ScObject obj = (ScObject) aClass; - if (ScalaCompat.hasMainMethod(obj)) { + if (ScalaMainMethodUtil.hasScala2MainMethod(obj)) { // Potentially multiple matches, we'll pick the first one. // TODO: prefer class with same name as file? // TODO: skip if not main_class of a rule. diff --git a/sdkcompat/v221/com/google/idea/sdkcompat/scala/ScalaCompat.java b/sdkcompat/v221/com/google/idea/sdkcompat/scala/ScalaCompat.java deleted file mode 100644 index da728e079f6..00000000000 --- a/sdkcompat/v221/com/google/idea/sdkcompat/scala/ScalaCompat.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.google.idea.sdkcompat.scala; - -import com.intellij.psi.PsiMethod; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.ScObject; -import org.jetbrains.plugins.scala.util.ScalaMainMethodUtil; -import scala.Option; - -/** Provides SDK compatibility shims for Scala classes, available to IntelliJ CE & UE. */ -public class ScalaCompat { - private ScalaCompat() {} - - /** #api213: Inline the call. Method location and signature changed in 2021.2 */ - public static Option findMainMethod(@NotNull ScObject obj) { - return ScalaMainMethodUtil.findScala2MainMethod(obj); - } - - /** #api213: Inline the call. Method location and signature changed in 2021.2 */ - public static boolean hasMainMethod(@NotNull ScObject obj) { - return ScalaMainMethodUtil.hasScala2MainMethod(obj); - } -} diff --git a/sdkcompat/v222/com/google/idea/sdkcompat/scala/ScalaCompat.java b/sdkcompat/v222/com/google/idea/sdkcompat/scala/ScalaCompat.java deleted file mode 100644 index da728e079f6..00000000000 --- a/sdkcompat/v222/com/google/idea/sdkcompat/scala/ScalaCompat.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.google.idea.sdkcompat.scala; - -import com.intellij.psi.PsiMethod; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.ScObject; -import org.jetbrains.plugins.scala.util.ScalaMainMethodUtil; -import scala.Option; - -/** Provides SDK compatibility shims for Scala classes, available to IntelliJ CE & UE. */ -public class ScalaCompat { - private ScalaCompat() {} - - /** #api213: Inline the call. Method location and signature changed in 2021.2 */ - public static Option findMainMethod(@NotNull ScObject obj) { - return ScalaMainMethodUtil.findScala2MainMethod(obj); - } - - /** #api213: Inline the call. Method location and signature changed in 2021.2 */ - public static boolean hasMainMethod(@NotNull ScObject obj) { - return ScalaMainMethodUtil.hasScala2MainMethod(obj); - } -} diff --git a/sdkcompat/v223/com/google/idea/sdkcompat/scala/ScalaCompat.java b/sdkcompat/v223/com/google/idea/sdkcompat/scala/ScalaCompat.java deleted file mode 100644 index da728e079f6..00000000000 --- a/sdkcompat/v223/com/google/idea/sdkcompat/scala/ScalaCompat.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.google.idea.sdkcompat.scala; - -import com.intellij.psi.PsiMethod; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.ScObject; -import org.jetbrains.plugins.scala.util.ScalaMainMethodUtil; -import scala.Option; - -/** Provides SDK compatibility shims for Scala classes, available to IntelliJ CE & UE. */ -public class ScalaCompat { - private ScalaCompat() {} - - /** #api213: Inline the call. Method location and signature changed in 2021.2 */ - public static Option findMainMethod(@NotNull ScObject obj) { - return ScalaMainMethodUtil.findScala2MainMethod(obj); - } - - /** #api213: Inline the call. Method location and signature changed in 2021.2 */ - public static boolean hasMainMethod(@NotNull ScObject obj) { - return ScalaMainMethodUtil.hasScala2MainMethod(obj); - } -} diff --git a/sdkcompat/v231/com/google/idea/sdkcompat/scala/ScalaCompat.java b/sdkcompat/v231/com/google/idea/sdkcompat/scala/ScalaCompat.java deleted file mode 100644 index da728e079f6..00000000000 --- a/sdkcompat/v231/com/google/idea/sdkcompat/scala/ScalaCompat.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.google.idea.sdkcompat.scala; - -import com.intellij.psi.PsiMethod; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.ScObject; -import org.jetbrains.plugins.scala.util.ScalaMainMethodUtil; -import scala.Option; - -/** Provides SDK compatibility shims for Scala classes, available to IntelliJ CE & UE. */ -public class ScalaCompat { - private ScalaCompat() {} - - /** #api213: Inline the call. Method location and signature changed in 2021.2 */ - public static Option findMainMethod(@NotNull ScObject obj) { - return ScalaMainMethodUtil.findScala2MainMethod(obj); - } - - /** #api213: Inline the call. Method location and signature changed in 2021.2 */ - public static boolean hasMainMethod(@NotNull ScObject obj) { - return ScalaMainMethodUtil.hasScala2MainMethod(obj); - } -} diff --git a/sdkcompat/v232/com/google/idea/sdkcompat/scala/ScalaCompat.java b/sdkcompat/v232/com/google/idea/sdkcompat/scala/ScalaCompat.java deleted file mode 100644 index da728e079f6..00000000000 --- a/sdkcompat/v232/com/google/idea/sdkcompat/scala/ScalaCompat.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.google.idea.sdkcompat.scala; - -import com.intellij.psi.PsiMethod; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.ScObject; -import org.jetbrains.plugins.scala.util.ScalaMainMethodUtil; -import scala.Option; - -/** Provides SDK compatibility shims for Scala classes, available to IntelliJ CE & UE. */ -public class ScalaCompat { - private ScalaCompat() {} - - /** #api213: Inline the call. Method location and signature changed in 2021.2 */ - public static Option findMainMethod(@NotNull ScObject obj) { - return ScalaMainMethodUtil.findScala2MainMethod(obj); - } - - /** #api213: Inline the call. Method location and signature changed in 2021.2 */ - public static boolean hasMainMethod(@NotNull ScObject obj) { - return ScalaMainMethodUtil.hasScala2MainMethod(obj); - } -} diff --git a/sdkcompat/v233/com/google/idea/sdkcompat/scala/ScalaCompat.java b/sdkcompat/v233/com/google/idea/sdkcompat/scala/ScalaCompat.java deleted file mode 100644 index da728e079f6..00000000000 --- a/sdkcompat/v233/com/google/idea/sdkcompat/scala/ScalaCompat.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.google.idea.sdkcompat.scala; - -import com.intellij.psi.PsiMethod; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.ScObject; -import org.jetbrains.plugins.scala.util.ScalaMainMethodUtil; -import scala.Option; - -/** Provides SDK compatibility shims for Scala classes, available to IntelliJ CE & UE. */ -public class ScalaCompat { - private ScalaCompat() {} - - /** #api213: Inline the call. Method location and signature changed in 2021.2 */ - public static Option findMainMethod(@NotNull ScObject obj) { - return ScalaMainMethodUtil.findScala2MainMethod(obj); - } - - /** #api213: Inline the call. Method location and signature changed in 2021.2 */ - public static boolean hasMainMethod(@NotNull ScObject obj) { - return ScalaMainMethodUtil.hasScala2MainMethod(obj); - } -} diff --git a/sdkcompat/v241/com/google/idea/sdkcompat/scala/ScalaCompat.java b/sdkcompat/v241/com/google/idea/sdkcompat/scala/ScalaCompat.java deleted file mode 100644 index 86205a3000f..00000000000 --- a/sdkcompat/v241/com/google/idea/sdkcompat/scala/ScalaCompat.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2024 The Bazel Authors. All rights reserved. - * - * 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.google.idea.sdkcompat.scala; - -import com.intellij.psi.PsiMethod; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.ScObject; -import org.jetbrains.plugins.scala.util.ScalaMainMethodUtil; -import scala.Option; - -/** Provides SDK compatibility shims for Scala classes, available to IntelliJ CE & UE. */ -public class ScalaCompat { - private ScalaCompat() {} - - /** #api213: Inline the call. Method location and signature changed in 2021.2 */ - public static Option findMainMethod(@NotNull ScObject obj) { - return ScalaMainMethodUtil.findScala2MainMethod(obj); - } - - /** #api213: Inline the call. Method location and signature changed in 2021.2 */ - public static boolean hasMainMethod(@NotNull ScObject obj) { - return ScalaMainMethodUtil.hasScala2MainMethod(obj); - } -} diff --git a/sdkcompat/v242/com/google/idea/sdkcompat/scala/ScalaCompat.java b/sdkcompat/v242/com/google/idea/sdkcompat/scala/ScalaCompat.java deleted file mode 100644 index 86205a3000f..00000000000 --- a/sdkcompat/v242/com/google/idea/sdkcompat/scala/ScalaCompat.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2024 The Bazel Authors. All rights reserved. - * - * 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.google.idea.sdkcompat.scala; - -import com.intellij.psi.PsiMethod; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.ScObject; -import org.jetbrains.plugins.scala.util.ScalaMainMethodUtil; -import scala.Option; - -/** Provides SDK compatibility shims for Scala classes, available to IntelliJ CE & UE. */ -public class ScalaCompat { - private ScalaCompat() {} - - /** #api213: Inline the call. Method location and signature changed in 2021.2 */ - public static Option findMainMethod(@NotNull ScObject obj) { - return ScalaMainMethodUtil.findScala2MainMethod(obj); - } - - /** #api213: Inline the call. Method location and signature changed in 2021.2 */ - public static boolean hasMainMethod(@NotNull ScObject obj) { - return ScalaMainMethodUtil.hasScala2MainMethod(obj); - } -}