Merged branch idea251.release into idea251.x

Author: builduser

README.md

@@ -113,9 +113,16 @@ UI Designer uses different border class in internal mode, see `com.intellij.uiDe
 4. **Unexpected local git changes in `uiDesigner.xml` or other files in .idea directory** \
       It may happen due to disable [internal mode](https://plugins.jetbrains.com/docs/intellij/enabling-internal.html) or by enabling it after/during setup. \
       The solution to this problem might be to revert these changes, enable [internal mode](https://plugins.jetbrains.com/docs/intellij/enabling-internal.html) (if it has not already been done) and restart IntelliJ.
-5. **The Scala plugin is not loaded when running the `scalaCommunity` Run Configuration.** Unfortunately, there can be multiple reasons for this, like an improperly packaged plugin which cannot be loaded by IDEA at runtime. \
-   Check the list of project modules in `File > Project Structure...` and make sure that they don't have a name that starts with `scala.<module name>` (e.g. `scala.structure-view`). This is a bug in the sbt import process. \
-   If there are modules like this, then remove all modules from the project (in the same Project Structure window) and reimport the project `<sbt tab> > Reload All sbt Projects`.
+5. **The Scala plugin is not loaded when running the `scalaCommunity` / `scalaUltimate` Run Configuration.**\
+  Unfortunately, there can be multiple reasons for this, like an improperly packaged plugin which cannot be loaded by IDEA at runtime. Check the list of project modules in `File > Project Structure...` and make sure that they don't have a name that starts with `scala.<module name>` (e.g. `scala.structure-view`). This is a bug in the sbt import process. If there are modules like this, then remove all modules from the project (in the same Project Structure window) and reimport the project `<sbt tab> > Reload All sbt Projects`.
+  **TLDR**:
+   1. Open `File | Project Structure`
+   2. Select "Modules"
+   3. Remove all modules except `-build` modules (they have special icon with sbt) and except root modules like (scalaCommunity or scalaUltimate)
+   4. Click "Ok"
+   5. Remove `target` directory in the project root (the one that contains `plugin/Scala` directory)
+   6. Reload the project structure
+   7. It should be fixed now! Run the main run configuration (`scalaCommunity` or `scalaUltimate`)
 
 ## Other
 ### Investigation performance issues

project/plugins.sbt

@@ -2,7 +2,7 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml"
 
 //NOTE: KEEP VERSIONS IN SYNC WITH ultimate/project/plugins.sbt
 addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.2")
-addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "4.1.3")
+addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "4.1.4")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
 addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % "3.1.4")
 addSbtPlugin("com.github.sbt.junit" % "sbt-jupiter-interface" % "0.13.3")

scala/scala-impl/resources/messages/ScalaBundle.properties

@@ -843,9 +843,6 @@ xml.delete.unmatched.tag=Delete Unmatched Tag
 xml.rename.opening.tag=Rename Opening Tag
 xml.rename.closing.tag=Rename Closing Tag
 
-### org/jetbrains/plugins/scala/components/PluginVersionVerifier.scala
-incompatible.plugin.detected=Incompatible plugin detected
-
 ### org/jetbrains/plugins/scala/components/Scala3Disclaimer.scala
 scala.3.support.is.experimental=Scala 3 support is being actively developed.<br>Please use nightly builds to benefit from the new improvements.
 configure.updates=Configure updates...

scala/scala-impl/src/org/jetbrains/plugins/scala/components/PluginVersionVerifier.scala

@@ -2,19 +2,9 @@ package org.jetbrains.plugins.scala.components
 
 import com.intellij.ide.plugins.cl.PluginClassLoader
 import com.intellij.ide.plugins.{org => _, _}
-import com.intellij.notification._
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.diagnostic.{ControlFlowException, Logger}
+import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.extensions.PluginId
-import com.intellij.util.PathUtil
-import org.jetbrains.annotations.Nls
-import org.jetbrains.plugins.scala.ScalaBundle
-import org.jetbrains.plugins.scala.extensions.{PathExt, invokeLater}
-import org.jetbrains.plugins.scala.util.ScalaNotificationGroups
-
-import java.nio.file.Paths
-import javax.swing.event.HyperlinkEvent
-import scala.annotation.nowarn
+import org.jetbrains.plugins.scala.extensions.invokeLater
 
 object ScalaPluginVersionVerifier {
 
@@ -67,78 +57,10 @@ object ScalaPluginVersionVerifier {
 class ScalaPluginVersionVerifierActivity extends RunOnceStartupActivity {
   override def doRunActivity(): Unit = {
     invokeLater {
-      ScalaPluginUpdater.upgradeRepo()
       ScalaPluginUpdater.askUpdatePluginBranchIfNeeded()
-      checkHaskForcePlugin()
       ScalaPluginUpdater.postCheckIdeaCompatibility()
-      ScalaPluginUpdater.setupReporter()
     }
   }
 
   override protected def doCleanup(): Unit = {}
-
-  private def showIncompatiblePluginNotification(@Nls message: String)(callback: String => Unit): Unit = {
-    if (ApplicationManager.getApplication.isUnitTestMode) {
-      ScalaPluginVersionVerifier.LOG.error(message)
-    } else {
-      val notification = ScalaNotificationGroups.scalaPluginVerifier.createNotification(ScalaBundle.message("incompatible.plugin.detected"), message, NotificationType.ERROR)
-      //TODO
-      notification.setListener((notification: Notification, event: HyperlinkEvent) => {
-        notification.expire()
-        val description = event.getDescription
-        callback(description)
-      }): @nowarn("cat=deprecation")
-
-      Notifications.Bus.notify(notification)
-    }
-  }
-
-  private def checkHaskForcePlugin(): Unit = {
-    val haskforceId = PluginId.findId("com.haskforce")
-    val plugin = PluginManagerCore.getPlugin(haskforceId)
-    if (plugin == null || !plugin.isEnabled)
-      return
-
-    val hasScala211 = try {
-      val scalaClass = plugin.getPluginClassLoader.loadClass("scala.Option")
-      val pathToJar = PathUtil.getJarPathForClass(scalaClass)
-      val path = Paths.get(pathToJar)
-      path.nameContains("-2.11")
-    } catch {
-      case c: ControlFlowException => throw c
-      case _: ClassNotFoundException => false
-      case e: Exception =>
-        ScalaPluginVersionVerifier.LOG.debug(e)
-        false
-    }
-    if (hasScala211) {
-      val DisableHaskForcePlugin = "Disable HaskForce Plugin"
-      val DisableScalaPlugin = "Disable Scala Plugin"
-      val Ignore = "Ignore"
-      val message =
-        s"""Plugin ${plugin.getName} of version ${plugin.getVersion} is
-           |incompatible with Scala Plugin for IDEA 2017.3
-           |${hyperlink(DisableHaskForcePlugin)}
-           |${hyperlink(DisableScalaPlugin)}
-           |${hyperlink(Ignore)}
-           |""".stripMargin
-      showIncompatiblePluginNotification(message) {
-        case DisableHaskForcePlugin =>
-          disablePlugin(haskforceId)
-        case DisableScalaPlugin =>
-          disablePlugin(ScalaPluginVersionVerifier.scalaPluginId)
-        case Ignore =>
-        case _ =>
-      }
-    }
-
-  }
-
-  private def hyperlink(description: String): String =
-    s"""<p/><a href="$description">$description</a>"""
-
-  private def disablePlugin(id: PluginId) = {
-    PluginManagerCore.disablePlugin(id)
-    PluginManagerConfigurable.showRestartDialog()
-  }
 }

scala/scala-impl/src/org/jetbrains/plugins/scala/components/ScalaPluginUpdater.scala

@@ -1,31 +1,23 @@
 package org.jetbrains.plugins.scala.components
 
 import com.intellij.ide.plugins.{org => _, _}
-import com.intellij.ide.util.PropertiesComponent
 import com.intellij.notification._
 import com.intellij.openapi.actionSystem.{ActionUpdateThread, AnAction, AnActionEvent}
-import com.intellij.openapi.application.{ApplicationInfo, ApplicationManager, PermanentInstallationID}
+import com.intellij.openapi.application.{ApplicationInfo, ApplicationManager}
 import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.editor.EditorFactory
-import com.intellij.openapi.editor.event.{DocumentEvent, DocumentListener}
-import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.updateSettings.impl._
 import com.intellij.openapi.util.NlsActions.ActionText
-import com.intellij.openapi.util.{BuildNumber, JDOMUtil, SystemInfo}
-import com.intellij.openapi.vfs.CharsetToolkit
+import com.intellij.openapi.util.{BuildNumber, JDOMUtil}
 import com.intellij.platform.ide.customization.ExternalProductResourceUrls
 import com.intellij.util.io.HttpRequests
-import com.intellij.util.io.HttpRequests.Request
 import org.jdom.JDOMException
 import org.jetbrains.plugins.scala.settings.ScalaApplicationSettings
 import org.jetbrains.plugins.scala.settings.ScalaApplicationSettings.pluginBranch
 import org.jetbrains.plugins.scala.settings.ScalaApplicationSettings.pluginBranch._
-import org.jetbrains.plugins.scala.util.{ScalaNotificationGroups, UnloadAwareDisposable}
-import org.jetbrains.plugins.scala.{ScalaBundle, ScalaFileType, extensions}
+import org.jetbrains.plugins.scala.util.ScalaNotificationGroups
+import org.jetbrains.plugins.scala.{ScalaBundle, extensions}
 
-import java.net.URLEncoder
-import java.util.concurrent.TimeUnit
 import scala.xml.XML
 
 class InvalidRepoException(what: String) extends Exception(what)
@@ -35,55 +27,23 @@ object ScalaPluginUpdater {
   private val LOG = Logger.getInstance(getClass)
   private val scalaPluginId = "1347"
   private val baseUrl: String = "https://plugins.jetbrains.com/plugins/%s/" + scalaPluginId
-  private var doneUpdating = false
   private def pluginDescriptor: IdeaPluginDescriptorImpl = ScalaPluginVersionVerifier.getPluginDescriptor
 
-  // *_OLD versions are for legacy repository format.
-  // Need to keep track of them to upgrade to new repository format automatically
-  // Remove eventually, when no significant amount of users will have older ones.
-  private val CASSIOPEIA_OLD    = "cassiopeia_old"
-  private val FOURTEEN_ONE_OLD  = "14.1_old"
-  private val FOURTEEN_ONE      = "14.1"
-
-  private val knownVersions = Map(
-    CASSIOPEIA_OLD   -> Map(
-      Release -> "DUMMY",
-      EAP     -> "https://www.jetbrains.com/idea/plugins/scala-eap-cassiopeia.xml",
-      Nightly -> "https://www.jetbrains.com/idea/plugins/scala-nightly-cassiopeia.xml"
-    ),
-    FOURTEEN_ONE_OLD -> Map(
-      Release -> "DUMMY",
-      EAP     -> "https://www.jetbrains.com/idea/plugins/scala-eap-14.1.xml",
-      Nightly -> ""
-    ),
-    FOURTEEN_ONE -> Map(
-      Release -> "DUMMY",
-      EAP     -> baseUrl.format("eap"),
-      Nightly -> baseUrl.format("nightly")
-    )
+  private def currentRepo: Map[pluginBranch, String] = Map(
+    Release -> "DUMMY",
+    EAP     -> baseUrl.format("eap"),
+    Nightly -> baseUrl.format("nightly")
   )
 
-  private val currentVersion: String = FOURTEEN_ONE
-
-  private def currentRepo: Map[pluginBranch, String] = knownVersions(currentVersion)
-
   private def NotificationGroup = ScalaNotificationGroups.scalaPluginUpdater
 
   // save plugin version before patching to restore it when switching back
   private var savedPluginVersion = ""
 
-  private val updateListener = new DocumentListener {
-    override def documentChanged(e: DocumentEvent): Unit = {
-      val file = FileDocumentManager.getInstance().getFile(e.getDocument)
-      if (file != null && file.getFileType == ScalaFileType.INSTANCE)
-        scheduleUpdate()
-    }
-  }
-
   @throws(classOf[InvalidRepoException])
   def doUpdatePluginHosts(branch: ScalaApplicationSettings.pluginBranch, descriptor: IdeaPluginDescriptorImpl): AnyVal = {
-    if(currentRepo(branch).isEmpty)
-      throw new InvalidRepoException(s"Branch $branch is unavailable for IDEA version $currentVersion")
+    if (currentRepo(branch).isEmpty)
+      throw new InvalidRepoException(s"Branch $branch is unavailable")
 
     // update hack - set plugin version to 0 when downgrading
     // also unpatch it back if user changed mind about downgrading
@@ -121,7 +81,7 @@ object ScalaPluginUpdater {
     else Release
   }
 
-  def pluginIsEap: Boolean = {
+  private def pluginIsEap: Boolean = {
     val updateSettings = UpdateSettings.getInstance()
     updateSettings.getStoredPluginHosts.contains(currentRepo(EAP))
   }
@@ -131,28 +91,7 @@ object ScalaPluginUpdater {
     updateSettings.getStoredPluginHosts.contains(currentRepo(Nightly))
   }
 
-  def pluginIsRelease: Boolean = !pluginIsEap && !pluginIsNightly
-
-  def upgradeRepo(): Unit = {
-    val updateSettings = UpdateSettings.getInstance()
-    for {
-      (version, repo) <- knownVersions
-      if version != currentVersion
-    } {
-      if (updateSettings.getStoredPluginHosts.contains(repo(EAP))) {
-        updateSettings.getStoredPluginHosts.remove(repo(EAP))
-        if (currentRepo(EAP).nonEmpty)
-          updateSettings.getStoredPluginHosts.add(currentRepo(EAP))
-      }
-      if (updateSettings.getStoredPluginHosts.contains(repo(Nightly))) {
-        updateSettings.getStoredPluginHosts.remove(repo(Nightly))
-        if (currentRepo(Nightly).nonEmpty)
-          updateSettings.getStoredPluginHosts.add(currentRepo(Nightly))
-        else if (currentRepo(EAP).nonEmpty)
-          updateSettings.getStoredPluginHosts.add(currentRepo(EAP))
-      }
-    }
-  }
+  private def pluginIsRelease: Boolean = !pluginIsEap && !pluginIsNightly
 
   def postCheckIdeaCompatibility(branch: ScalaApplicationSettings.pluginBranch): Unit = {
     val infoImpl = ApplicationInfo.getInstance()
@@ -203,6 +142,8 @@ object ScalaPluginUpdater {
 
     def getPlatformUpdateResult: Option[PlatformUpdates] = {
       val url = ExternalProductResourceUrls.getInstance.getUpdateMetadataUrl
+      if (url == null)
+        return None
 
       val info: Option[Product] = HttpRequests.request(url).connect { request =>
         val productCode = ApplicationInfo.getInstance().getBuild.getProductCode
@@ -222,35 +163,6 @@ object ScalaPluginUpdater {
     notification.foreach(Notifications.Bus.notify)
   }
 
-  private def scheduleUpdate(): Unit = {
-    val key = "scala.last.updated"
-    val lastUpdateTime = PropertiesComponent.getInstance().getLong(key , 0)
-    EditorFactory.getInstance().getEventMulticaster.removeDocumentListener(updateListener)
-    if (lastUpdateTime == 0L || System.currentTimeMillis() - lastUpdateTime > TimeUnit.DAYS.toMillis(1)) {
-      ApplicationManager.getApplication.executeOnPooledThread(new Runnable {
-        override def run(): Unit = {
-          val buildNumber = ApplicationInfo.getInstance().getBuild.asString()
-          val pluginVersion = pluginDescriptor.getVersion
-          val os = URLEncoder.encode(SystemInfo.OS_NAME + " " + SystemInfo.OS_VERSION, CharsetToolkit.UTF8)
-          val uid: String = PermanentInstallationID.get()
-          val url = s"https://plugins.jetbrains.com/plugins/list?pluginId=$scalaPluginId&build=$buildNumber&pluginVersion=$pluginVersion&os=$os&uuid=$uid"
-          PropertiesComponent.getInstance().setValue(key, System.currentTimeMillis().toString)
-          doneUpdating = true
-          try {
-            HttpRequests.request(url).connect((request: Request) => JDOMUtil.load(request.getReader()))
-          } catch {
-            case e: Throwable => LOG.warn(e)
-          }
-        }
-      })
-    }
-  }
-
-  def setupReporter(): Unit = {
-    if (ApplicationManager.getApplication.isUnitTestMode) return
-    EditorFactory.getInstance().getEventMulticaster.addDocumentListener(updateListener, UnloadAwareDisposable.scalaPluginDisposable)
-  }
-
   // this hack uses reflection to downgrade plugin version
   def patchPluginVersion(newVersion: String, descriptor: IdeaPluginDescriptorImpl): Unit = {
     val versionField = classOf[IdeaPluginDescriptorImpl].getDeclaredField("version")