sbt structure caching

build.sbt

@@ -8,7 +8,7 @@ import java.nio.file.Paths
 
 // Global build settings
 
-(ThisBuild / intellijPluginName) := "Scala"
+(ThisBuild / intellijPluginName) := "Scala (AVSystem)"
 
 (ThisBuild / intellijBuild) := Versions.intellijVersion
 

pluginXml/resources/META-INF/plugin.xml

@@ -16,10 +16,11 @@
 <idea-plugin url="https://confluence.jetbrains.com/display/SCA/Scala+Plugin+for+IntelliJ+IDEA"
              xmlns:xi="http://www.w3.org/2001/XInclude"
              require-restart="true">
-    <id>org.intellij.scala</id>
-    <name>Scala</name>
+    <id>com.avsystem.scala</id>
+    <name>Scala (AVSystem)</name>
     <description>
         <![CDATA[
+        <b>Temporary customized version by AVSystem</b>
         Adds support for the Scala language. The following features are available for free with IntelliJ IDEA Community Edition:
         <br>
         <ul>
@@ -29,11 +30,15 @@
           <li>Testing frameworks support (ScalaTest, Specs2, uTest)</li>
           <li>Scala debugger, worksheets and Ammonite scripts</li>
         </ul>
+        AVSystem experimental extensions:
+        <ul>
+        <li>sbt structure caching</li>
+        </ul>
         <br>
         Support for Play Framework, Akka and Scala.js is enabled in IntelliJ IDEA Ultimate.
       ]]>
     </description>
-    <version>VERSION</version>
+    <version>2022.3.99-sbtcaching.1</version>
     <change-notes><!-- CHANGE_NOTES --></change-notes>
     <vendor url="https://www.jetbrains.com">JetBrains</vendor>
     <idea-version since-build="223.7571" until-build="223.*"/>

sbt/sbt-api/resources/META-INF/sbt-api.xml

@@ -1,6 +1,7 @@
 <idea-plugin>
     <extensionPoints>
         <extensionPoint qualifiedName="com.intellij.sbt.internal.dynamicLinker" interface="org.jetbrains.sbt.internal.InternalDynamicLinker"/>
+        <extensionPoint qualifiedName="org.intellij.sbt.structureCache" interface="org.jetbrains.sbt.project.SbtStructureCache" dynamic="true"/>
     </extensionPoints>
 
     <extensions defaultExtensionNs="com.intellij">

sbt/sbt-api/src/org/jetbrains/sbt/project/SbtStructureCache.scala

@@ -0,0 +1,15 @@
+package org.jetbrains.sbt.project
+
+import org.jetbrains.sbt.project.SbtStructureCache.BuildDefinitionHash
+
+trait SbtStructureCache {
+  def getCachedStructureXml(key: BuildDefinitionHash): Option[String]
+
+  def cacheStructureXml(key: BuildDefinitionHash, data: String): Unit
+}
+object SbtStructureCache {
+  final case class BuildDefinitionHash(hash: String) {
+    override def toString: String = hash
+  }
+}
+

sbt/sbt-api/src/org/jetbrains/sbt/settings/SbtSettings.scala

@@ -33,6 +33,10 @@ final class SbtSettings(project: Project)
   @BeanProperty var customVMEnabled: Boolean = false
   @BeanProperty var customVMPath: String = ""
   @BeanProperty var customSbtStructurePath: String = ""
+  @BeanProperty var localStructureCachePath: String = ""
+  @BeanProperty var remoteStructureCacheUri: String = ""
+  @BeanProperty var remoteStructureCacheCredentialsPath: String = ""
+  @BeanProperty var allowManualDependencyDownload: Boolean = false
 
   override def getState: SbtSettings.State = {
     val state = new SbtSettings.State
@@ -45,7 +49,10 @@ final class SbtSettings(project: Project)
     state.customVMEnabled = customVMEnabled
     state.customVMPath = customVMPath
     state.customSbtStructurePath = customSbtStructurePath
-
+    state.localStructureCache = localStructureCachePath
+    state.remoteStructureCacheUri = remoteStructureCacheUri
+    state.remoteStructureCacheCredentialsPath = remoteStructureCacheCredentialsPath
+    state.allowManualDependencyDownload = allowManualDependencyDownload
     state
   }
 
@@ -59,6 +66,10 @@ final class SbtSettings(project: Project)
     customVMEnabled = state.customVMEnabled
     customVMPath = state.customVMPath
     customSbtStructurePath = state.customSbtStructurePath
+    localStructureCachePath = state.localStructureCache
+    remoteStructureCacheUri = state.remoteStructureCacheUri
+    remoteStructureCacheCredentialsPath = state.remoteStructureCacheCredentialsPath
+    allowManualDependencyDownload = state.allowManualDependencyDownload
   }
 
   override def subscribe(listener: ExternalSystemSettingsListener[SbtProjectSettings]): Unit = {
@@ -79,6 +90,10 @@ final class SbtSettings(project: Project)
     customVMEnabled = settings.customVMEnabled
     customVMPath = settings.customVMPath
     customSbtStructurePath = settings.customSbtStructurePath
+    localStructureCachePath = settings.localStructureCachePath
+    remoteStructureCacheUri = settings.remoteStructureCacheUri
+    remoteStructureCacheCredentialsPath = settings.remoteStructureCacheCredentialsPath
+    allowManualDependencyDownload = settings.allowManualDependencyDownload
   }
 
   def getLinkedProjectSettings(module: Module): Option[SbtProjectSettings] =
@@ -124,6 +139,18 @@ object SbtSettings {
     @BeanProperty
     var customSbtStructurePath: String = ""
 
+    @BeanProperty
+    var localStructureCache: String = ""
+
+    @BeanProperty
+    var remoteStructureCacheUri: String = ""
+
+    @BeanProperty
+    var remoteStructureCacheCredentialsPath: String = ""
+
+    @BeanProperty
+    var allowManualDependencyDownload: Boolean = false
+
     private val linkedProjectSettings: util.TreeSet[SbtProjectSettings] = new util.TreeSet[SbtProjectSettings]
 
     @XCollection(style = XCollection.Style.v1, elementTypes = Array(classOf[SbtProjectSettings]))

sbt/sbt-impl/resources/messages/SbtBundle.properties

@@ -169,6 +169,10 @@ sbt.settings.bundled=&Bundled
 ### org/jetbrains/sbt/settings/SbtSettingsPane.java
 sbt.settings.choose.custom.launcher=Choose a Custom Launcher
 sbt.settings.choose.sbt.launch.jar=Choose sbt-launch.jar
+sbt.settings.choose.cache.directory=Choose Cache Directory
+sbt.settings.choose.local.structure.cache.directory=Choose local sbt structure cache directory
+sbt.settings.choose.remote.cache.credentials=Choose Remote Cache Credentials
+sbt.settings.choose.remote.structure.cache.credentials.file=Choose remote sbt structure cache credentials file
 
 ### org/jetbrains/sbt/shell/SbtProcessManager.scala
 sbt.shell.disable.version.override=Disable version override

sbt/sbt-impl/src/org/jetbrains/sbt/project/SbtExternalSystemManager.scala

@@ -23,6 +23,7 @@ import org.jetbrains.sbt.project.settings._
 import org.jetbrains.sbt.settings.{SbtExternalSystemConfigurable, SbtSettings}
 
 import java.io.File
+import java.net.URI
 import scala.jdk.CollectionConverters._
 
 class SbtExternalSystemManager
@@ -84,6 +85,22 @@ object SbtExternalSystemManager {
     val vmOptions = getVmOptions(settingsState, jreHome)
     val environment = Map.empty ++ getAndroidEnvironmentVariables(projectJdkName)
 
+    val localStructureCacheFile =
+      Option(settingsState.localStructureCache)
+        .filter(_.nonEmpty)
+        .map(new File(_))
+
+    val remoteStructureCacheUri =
+      Option(settingsState.remoteStructureCacheUri)
+        .filter(_.nonEmpty)
+        .map(v => if (v.endsWith("/")) v else s"$v/")
+        .map(new URI(_))
+
+    val remoteStructureCacheCredentialsFile =
+      Option(settingsState.remoteStructureCacheCredentialsPath)
+        .filter(_.nonEmpty)
+        .map(new File(_))
+
     new SbtExecutionSettings(
       realProjectPath,
       vmExecutable,
@@ -92,14 +109,18 @@ object SbtExternalSystemManager {
       environment,
       customLauncher,
       customSbtStructureFile,
+      localStructureCacheFile,
+      remoteStructureCacheUri,
+      remoteStructureCacheCredentialsFile,
       projectJdkName,
       projectSettings.resolveClassifiers,
       projectSettings.resolveJavadocs,
       projectSettings.resolveSbtClassifiers,
       projectSettings.useSbtShellForImport,
       projectSettings.enableDebugSbtShell,
       projectSettings.allowSbtVersionOverride,
-      projectSettings.preferScala2
+      projectSettings.preferScala2,
+      settingsState.allowManualDependencyDownload
     )
   }