Merge remote-tracking branch 'origin/master'

.idea/runConfigurations/PyCharm_Edu.xml

@@ -14,7 +14,7 @@
     <option name="VM_PARAMETERS" value="-ea -Xmx192m -Didea.is.internal=true -Didea.platform.prefix=PyCharmEdu -Didea.config.path=../config/pycharmEdu -Didea.system.path=../system/pycharmEdu" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bin" />
     <method>
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="deployEduPlugin" externalProjectPath="$PROJECT_DIR$/edu/dependencies" vmOptions="-Didea.config.path=../../config/pycharmEdu" scriptParameters="" />
+      <option name="Gradle.BeforeRunTask" enabled="true" tasks="deployEduToolsPlugin" externalProjectPath="$PROJECT_DIR$/edu/dependencies" vmOptions="-Didea.config.path=../../config/pycharmEdu" scriptParameters="" />
     </method>
   </configuration>
 </component>

edu/dependencies/build.gradle

@@ -39,26 +39,46 @@ repositories {
 
 configurations {
   eduPlugin
+  scalaPlugin
 }
 
-def eduPluginId = "com.jetbrains.edu"
-def eduPluginName = "EduTools"
+def EduToolsPluginId = "com.jetbrains.edu"
+def EduToolsPluginName = "EduTools"
+
+def ScalaPluginId = "org.intellij.scala"
+def ScalaPluginName = "Scala"
 
 dependencies {
-  eduPlugin "com.jetbrains.plugins:$eduPluginId:$eduPluginVersion@zip"
+  eduPlugin "com.jetbrains.plugins:$EduToolsPluginId:$EduToolsPluginVersion@zip"
+  scalaPlugin "com.jetbrains.plugins:$ScalaPluginId:$ScalaPluginVersion@zip"
 }
 
-task setupEduPlugin(dependsOn: configurations.eduPlugin, type: Sync) {
+task setupEduToolsPlugin(dependsOn: configurations.eduPlugin, type: Sync) {
   from fileTree(configurations.eduPlugin.singleFile)
-  into "${project.buildDir}/edu/"
+  into "${project.buildDir}/$EduToolsPluginName/"
   rename { String fileName ->
-    fileName.replace(eduPluginId, eduPluginName) }
+    fileName.replace(EduToolsPluginId, EduToolsPluginName) }
 }
 
-task deployEduPlugin(dependsOn: setupEduPlugin, type: Sync) {
-  from zipTree("${project.buildDir}/edu/$eduPluginName-${eduPluginVersion}.zip")
+task deployEduToolsPlugin(dependsOn: setupEduToolsPlugin, type: Sync) {
+  from zipTree("${project.buildDir}/$EduToolsPluginName/$EduToolsPluginName-${EduToolsPluginVersion}.zip")
   into "${System.getProperty("idea.config.path")}/plugins/"
   preserve {
-    exclude "$eduPluginName/**"
+    exclude "$EduToolsPluginName/**"
+  }
+}
+
+task setupScalaPlugin(dependsOn: configurations.scalaPlugin, type: Sync) {
+  from fileTree(configurations.scalaPlugin.singleFile)
+  into "${project.buildDir}/$ScalaPluginName/"
+  rename { String fileName ->
+    fileName.replace(ScalaPluginId, ScalaPluginName) }
+}
+
+task deployScalaPlugin(dependsOn: setupScalaPlugin, type: Sync) {
+  from zipTree("${project.buildDir}/$ScalaPluginName/$ScalaPluginName-${ScalaPluginVersion}.zip")
+  into "${System.getProperty("idea.config.path")}/plugins/"
+  preserve {
+    exclude "$ScalaPluginName/**"
   }
 }

edu/dependencies/gradle.properties

@@ -1 +1,2 @@
-eduPluginVersion=1.7-2018.1-119
+EduToolsPluginVersion=1.7-2018.1-119
+ScalaPluginVersion=2018.2.6

edu/dependencies/groovy/org/jetbrains/intellij/build/EduUtils.groovy

@@ -20,17 +20,18 @@ import com.intellij.util.SystemProperties
 import com.intellij.util.io.ZipUtil
 
 class EduUtils {
-  static void copyEduToolsPlugin(String dependenciesPath, BuildContext buildContext, String targetDirectory) {
+  static void copyPlugin(String pluginName, String dependenciesPath, BuildContext buildContext, String targetDirectory) {
     def dependenciesProjectDir = new File(dependenciesPath)
-    new GradleRunner(dependenciesProjectDir, buildContext.messages, SystemProperties.getJavaHome()).run("Downloading EduTools plugin...", "setupEduPlugin")
+    new GradleRunner(dependenciesProjectDir, buildContext.messages, SystemProperties.getJavaHome()).run(
+      "Downloading $pluginName plugin...", "setup${pluginName}Plugin")
     Properties properties = new Properties()
     new File(dependenciesProjectDir, "gradle.properties").withInputStream {
       properties.load(it)
     }
 
-    def pluginZip = new File("${dependenciesProjectDir.absolutePath}/build/edu/EduTools-${properties.getProperty("eduPluginVersion")}.zip")
+    def pluginZip = new File("${dependenciesProjectDir.absolutePath}/build/$pluginName/$pluginName-${properties.getProperty("${pluginName}PluginVersion")}.zip")
     if (!pluginZip.exists()) {
-      throw new IllegalStateException("EduTools bundled plugin is not found. Plugin path:${pluginZip.canonicalPath}")
+      throw new IllegalStateException("$pluginName bundled plugin is not found. Plugin path:${pluginZip.canonicalPath}")
     }
     ZipUtil.extract(pluginZip, new File("$targetDirectory/plugins/"), new FilenameFilter() {
       @Override

edu/idea/build/groovy/org/jetbrains/intellij/build/IdeaEduProperties.groovy

@@ -32,7 +32,8 @@ class IdeaEduProperties extends IdeaCommunityProperties {
   void copyAdditionalFiles(BuildContext buildContext, String targetDirectory) {
     super.copyAdditionalFiles(buildContext, targetDirectory)
 
-    EduUtils.copyEduToolsPlugin(dependenciesPath, buildContext, targetDirectory)
+    EduUtils.copyPlugin("EduTools", dependenciesPath, buildContext, targetDirectory)
+    EduUtils.copyPlugin("Scala", dependenciesPath, buildContext, targetDirectory)
   }
 
   @Override

platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/reportUtils.kt

@@ -44,19 +44,19 @@ internal fun report(
   log(report)
   if (doNotify) {
     val success = addedByDev.isEmpty() && removedByDev.isEmpty() && modifiedByDev.isEmpty()
-    sendNotification(success, report)
+    sendNotification(success)
     if (!success) errorHandler.accept(report)
   }
 }
 
-private fun sendNotification(isSuccess: Boolean, report: String) {
+private fun sendNotification(isSuccess: Boolean) {
   if (BUILD_SERVER == null) {
     log("TeamCity url is unknown: unable to query last build status and send Slack channel notification")
   }
   else {
     callSafely {
       if (isNotificationRequired(isSuccess)) {
-        notifySlackChannel(isSuccess, report)
+        notifySlackChannel(isSuccess)
       }
     }
   }
@@ -91,10 +91,10 @@ private val CHANNEL_WEB_HOOK = System.getProperty("intellij.icons.slack.channel"
 private val BUILD_ID = System.getProperty("teamcity.build.id")
 private val INTELLIJ_ICONS_SYNC_RUN_CONF = System.getProperty("intellij.icons.sync.run.conf")
 
-private fun notifySlackChannel(isSuccess: Boolean, report: String) {
+private fun notifySlackChannel(isSuccess: Boolean) {
   HttpClients.createDefault().use {
     val text = "*${System.getProperty("teamcity.buildConfName")}* " +
-               (if (isSuccess) ":white_check_mark:" else ":scream:") + "\n$report\n" +
+               (if (isSuccess) ":white_check_mark:" else ":scream:") + "\n" +
                (if (!isSuccess) "Use 'Icons processing/*$INTELLIJ_ICONS_SYNC_RUN_CONF*' IDEA Ultimate run configuration\n" else "") +
                "<$BUILD_SERVER/viewLog.html?buildId=$BUILD_ID&buildTypeId=$BUILD_CONF|See build log>"
     val post = HttpPost(CHANNEL_WEB_HOOK)

platform/configuration-store-impl/src/SchemeManagerImpl.kt

@@ -3,6 +3,7 @@ package com.intellij.configurationStore
 
 import com.intellij.concurrency.ConcurrentCollectionFactory
 import com.intellij.configurationStore.schemeManager.*
+import com.intellij.ide.ui.UITheme
 import com.intellij.openapi.application.ex.DecodeDefaultsUtil
 import com.intellij.openapi.application.runUndoTransparentWriteAction
 import com.intellij.openapi.components.RoamingType
@@ -111,6 +112,7 @@ class SchemeManagerImpl<T : Any, MUTABLE_SCHEME : T>(val fileSpec: String,
     try {
       val url = when (requestor) {
         is AbstractExtensionPointBean -> requestor.loaderForClass.getResource(resourceName)
+        is UITheme -> DecodeDefaultsUtil.getDefaults(requestor.providerClassLoader, resourceName)
         else -> DecodeDefaultsUtil.getDefaults(requestor, resourceName)
       }
 
@@ -140,6 +142,9 @@ class SchemeManagerImpl<T : Any, MUTABLE_SCHEME : T>(val fileSpec: String,
           LOG.warn("Duplicated scheme ${schemeKey} - old: $oldScheme, new $scheme")
         }
         schemes.add(scheme)
+        if (requestor is UITheme) {
+          requestor.editorSchemeName = schemeKey
+        }
       }
     }
     catch (e: ProcessCanceledException) {

platform/icons/src/actions/MoveTo2.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#6E6E6E" fill-rule="evenodd" transform="translate(2 2)">
+    <g transform="rotate(180 6 4)">
+      <rect width="2" height="6.001" x="3.371" y=".671" transform="rotate(45 4.371 3.671)"/>
+      <polygon points="0 2 6 8 0 8"/>
+    </g>
+    <path d="M5.14110379,3 L3.14110379,5 L2,5 L2,10 L7,10 L7,8.75857846 L9,6.75857846 L9,12 L0,12 L0,3 L5.14110379,3 Z"/>
+  </g>
+</svg>

platform/icons/src/actions/MoveTo2_dark.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#AFB1B3" fill-rule="evenodd" transform="translate(2 2)">
+    <g transform="rotate(180 6 4)">
+      <rect width="2" height="6.001" x="3.371" y=".671" transform="rotate(45 4.371 3.671)"/>
+      <polygon points="0 2 6 8 0 8"/>
+    </g>
+    <path d="M5.14110379,3 L3.14110379,5 L2,5 L2,10 L7,10 L7,8.75857846 L9,6.75857846 L9,12 L0,12 L0,3 L5.14110379,3 Z"/>
+  </g>
+</svg>

platform/icons/src/actions/icon-robots.txt

@@ -1,18 +1,29 @@
+deprecated: addFacesSupport.png; to be removed in IDEA 2020
+deprecated: allLeft.png; to be removed in IDEA 2020
+deprecated: allRight.png; to be removed in IDEA 2020
 deprecated: browser-externalJavaDoc.png -> /actions/previousOccurence.svg; to be removed in IDEA 2020 - use AllIcons.Actions.PreviousOccurence
 deprecated: checkedBlack.png -> /actions/checked.png; to be removed in IDEA 2020 - use AllIcons.Actions.Checked
 deprecated: checkedGrey.png -> /actions/checked.png; to be removed in IDEA 2020 - use AllIcons.Actions.Checked
-deprecated: createFromUsage.png -> /actions/intentionBulb.png; to be removed in IDEA 2020 - use AllIcons.Actions.IntentionBulb
+deprecated: createFromUsage.png -> /actions/intentionBulb.svg; to be removed in IDEA 2020 - use AllIcons.Actions.IntentionBulb
+deprecated: createPatch.png; to be removed in IDEA 2020
 deprecated: delete.png -> /actions/cancel.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Cancel
+deprecated: diffPreview.png -> /actions/diff.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Diff
+deprecated: diffWithCurrent.png -> /actions/diff.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Diff
+deprecated: down.png -> /general/splitDown.png; to be removed in IDEA 2020 - use AllIcons.General.SplitDown
 deprecated: exclude.png -> /general/remove.svg; to be removed in IDEA 2020 - use AllIcons.General.Remove
 deprecated: export.png -> /toolbarDecorator/export.svg; to be removed in IDEA 2020 - use AllIcons.ToolbarDecorator.Export
 deprecated: fileStatus.png
 deprecated: filter_small.png -> /general/filter.svg; to be removed in IDEA 2020 - use AllIcons.General.Filter
 deprecated: findPlain.png -> /actions/find.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Find
+deprecated: findWhite.png; to be removed in IDEA 2020
 deprecated: get.png -> /actions/download.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Download
+deprecated: left.png -> /general/splitLeft.png; to be removed in IDEA 2020 - use AllIcons.General.SplitLeft
 deprecated: menu-find.png -> /actions/find.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Find
 deprecated: menu-help.png -> /actions/help.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Help
 deprecated: menu-replace.png -> /actions/replace.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Replace
-deprecated: moveToStandardPlace.png -> /actions/MoveTo2.png; to be removed in IDEA 2020 - use AllIcons.Actions.MoveTo2
+deprecated: move-to-button-top.png -> /actions/move-to-button.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Move_to_button
+deprecated: moveToStandardPlace.png -> /actions/MoveTo2.svg; to be removed in IDEA 2020 - use AllIcons.Actions.MoveTo2
+deprecated: multicaret.svg; to be removed in IDEA 2020
 deprecated: nextfile.png -> /actions/forward.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Forward
 deprecated: prevfile.png -> /actions/back.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Back
 deprecated: reset.png -> /actions/rollback.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Rollback
@@ -21,3 +32,4 @@ deprecated: sortAsc.png -> /actions/moveUp.svg; to be removed in IDEA 2020 - use
 deprecated: sortDesc.png -> /actions/moveDown.svg; to be removed in IDEA 2020 - use AllIcons.Actions.MoveDown
 deprecated: submit1.png -> /actions/setDefault.svg; to be removed in IDEA 2020 - use AllIcons.Actions.SetDefault
 deprecated: synchronizeFS.png -> /actions/refresh.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Refresh
+deprecated: up.png -> /general/splitUp.png; to be removed in IDEA 2020 - use AllIcons.General.SplitUp

platform/icons/src/actions/intentionBulb.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="6" height="1" x="5" y="12" fill="#6E6E6E"/>
+    <path fill="#6E6E6E" d="M5.5,14 L10.5,14 L10.5,14 C10.5,14.5522847 10.0522847,15 9.5,15 L6.5,15 C5.94771525,15 5.5,14.5522847 5.5,14 Z"/>
+    <path fill="#EDA200" d="M13,5.2 C13,9.2 11,8.96875 11,11 L5,11 C5,9.03125 3,9.2 3,5.2 C3,2.991 5.23878906,1 8,1 C10.76125,1 13,2.99103125 13,5.2 Z"/>
+  </g>
+</svg>

platform/icons/src/actions/intentionBulb_dark.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="6" height="1" x="5" y="12" fill="#AFB1B3"/>
+    <path fill="#AFB1B3" d="M5.5,14 L10.5,14 L10.5,14 C10.5,14.5522847 10.0522847,15 9.5,15 L6.5,15 C5.94771525,15 5.5,14.5522847 5.5,14 Z"/>
+    <path fill="#F0A732" d="M13,5.2 C13,9.2 11,8.96875 11,11 L5,11 C5,9.03125 3,9.2 3,5.2 C3,2.991 5.23878906,1 8,1 C10.76125,1 13,2.99103125 13,5.2 Z"/>
+  </g>
+</svg>

platform/icons/src/actions/move-to-button.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="3" height="3" x="9" y="2" fill="#6E6E6E"/>
+    <rect width="5" height="1" x="1" y="6" fill="#6E6E6E"/>
+    <polygon fill="#6E6E6E" points="6.5 5 9 8 4 8" transform="rotate(90 6.5 6.5)"/>
+  </g>
+</svg>

platform/icons/src/actions/move-to-button_dark.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="3" height="3" x="9" y="2" fill="#AFB1B3"/>
+    <rect width="5" height="1" x="1" y="6" fill="#AFB1B3"/>
+    <polygon fill="#AFB1B3" points="6.5 5 9 8 4 8" transform="rotate(90 6.5 6.5)"/>
+  </g>
+</svg>

platform/icons/src/actions/quickfixBulb.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="6" height="1" x="5" y="12" fill="#6E6E6E"/>
+    <path fill="#6E6E6E" d="M5.5,14 L10.5,14 L10.5,14 C10.5,14.5522847 10.0522847,15 9.5,15 L6.5,15 C5.94771525,15 5.5,14.5522847 5.5,14 Z"/>
+    <path fill="#DB5860" d="M13,5.2 C13,9.2 11,8.96875 11,11 L5,11 C5,9.03125 3,9.2 3,5.2 C3,2.991 5.23878906,1 8,1 C10.76125,1 13,2.99103125 13,5.2 Z M7,3 L7,7 L9,7 L9,3 L7,3 Z M7,8 L7,10 L9,10 L9,8 L7,8 Z"/>
+  </g>
+</svg>

platform/icons/src/actions/quickfixBulb_dark.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="6" height="1" x="5" y="12" fill="#AFB1B3"/>
+    <path fill="#AFB1B3" d="M5.5,14 L10.5,14 L10.5,14 C10.5,14.5522847 10.0522847,15 9.5,15 L6.5,15 C5.94771525,15 5.5,14.5522847 5.5,14 Z"/>
+    <path fill="#C75450" d="M13,5.2 C13,9.2 11,8.96875 11,11 L5,11 C5,9.03125 3,9.2 3,5.2 C3,2.991 5.23878906,1 8,1 C10.76125,1 13,2.99103125 13,5.2 Z"/>
+  </g>
+</svg>

platform/icons/src/actions/quickfixOffBulb.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="6" height="1" x="5" y="12" fill="#6E6E6E"/>
+    <path fill="#6E6E6E" d="M5.5,14 L10.5,14 L10.5,14 C10.5,14.5522847 10.0522847,15 9.5,15 L6.5,15 C5.94771525,15 5.5,14.5522847 5.5,14 Z"/>
+    <path fill="#389FD6" d="M13,5.2 C13,9.2 11,8.96875 11,11 L5,11 C5,9.03125 3,9.2 3,5.2 C3,2.991 5.23878906,1 8,1 C10.76125,1 13,2.99103125 13,5.2 Z"/>
+  </g>
+</svg>

platform/icons/src/actions/quickfixOffBulb_dark.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="6" height="1" x="5" y="12" fill="#AFB1B3"/>
+    <path fill="#AFB1B3" d="M5.5,14 L10.5,14 L10.5,14 C10.5,14.5522847 10.0522847,15 9.5,15 L6.5,15 C5.94771525,15 5.5,14.5522847 5.5,14 Z"/>
+    <path fill="#3592C4" d="M13,5.2 C13,9.2 11,8.96875 11,11 L5,11 C5,9.03125 3,9.2 3,5.2 C3,2.991 5.23878906,1 8,1 C10.76125,1 13,2.99103125 13,5.2 Z"/>
+  </g>
+</svg>

platform/icons/src/actions/realIntentionBulb.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#6E6E6E" fill-rule="evenodd" transform="translate(3 4)">
+    <path d="M10.108434 3.96199965L8.03801633 1.89158197 3 6.90139228 3 8.97180996 5.07041768 8.97180996 10.108434 3.96199965zM11.8337821 2.23665158C12.055406 2.01500638 12.055406 1.42308794 11.8337821 1.20144274L10.7985732.1662339C10.5769494-.0554112999 9.98498829-.0554112999 9.7633644.1662339L8.72815556 1.20144274 10.7985732 3.27186042 11.8337821 2.23665158zM5.86396103 2L4.86396103 3 0 3 0 2 5.86396103 2zM7.86396103 4.4408921e-16L6.86396103 1 0 1 0 0 7.86396103 0zM3.86396103 4L2.86396103 5 0 5 0 4 3.86396103 4z"/>
+  </g>
+</svg>

platform/icons/src/actions/realIntentionBulb_dark.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#AFB1B3" d="M13.108434 7.96199965L11.0380163 5.89158197 6 10.9013923 6 12.97181 8.07041768 12.97181 13.108434 7.96199965zM14.8337821 6.23665158C15.055406 6.01500638 15.055406 5.42308794 14.8337821 5.20144274L13.7985732 4.1662339C13.5769494 3.9445887 12.9849883 3.9445887 12.7633644 4.1662339L11.7281556 5.20144274 13.7985732 7.27186042 14.8337821 6.23665158zM8.86396103 6L7.86396103 7 3 7 3 6 8.86396103 6zM10.863961 4L9.86396103 5 3 5 3 4 10.863961 4zM6.86396103 8L5.86396103 9 3 9 3 8 6.86396103 8z"/>
+  </g>
+</svg>

platform/icons/src/actions/refactoringBulb.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#6E6E6E" d="M7.64194584 8.22201519L6.79657297 9.06738806 5.57145378 7.016 4.13627731 7.016 4.13627731 9.7 2.99 9.7 2.99 2 5.89763025 2C6.71773109 2 7.36076471 2.286 7.78013445 2.77 8.12494958 3.188 8.32065546 3.76 8.32065546 4.431 8.32065546 5.718 7.67762185 6.477 6.77364706 6.785L7.64194584 8.22201519zM4.343 5.817L5.76744444 5.817C6.46383951 5.817 6.907 5.311 6.907 4.53L6.907 4.508C6.907 3.683 6.47966667 3.232 5.75953086 3.232L4.343 3.232 4.343 5.817zM13.108434 8.96199965L11.0380163 6.89158197 6 11.9013923 6 13.97181 8.07041768 13.97181 13.108434 8.96199965zM14.8337821 7.23665158C15.055406 7.01500638 15.055406 6.42308794 14.8337821 6.20144274L13.7985732 5.1662339C13.5769494 4.9445887 12.9849883 4.9445887 12.7633644 5.1662339L11.7281556 6.20144274 13.7985732 8.27186042 14.8337821 7.23665158z"/>
+  </g>
+</svg>

platform/icons/src/actions/refactoringBulb_dark.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#AFB1B3" d="M7.64194584 8.22201519L6.79657297 9.06738806 5.57145378 7.016 4.13627731 7.016 4.13627731 9.7 2.99 9.7 2.99 2 5.89763025 2C6.71773109 2 7.36076471 2.286 7.78013445 2.77 8.12494958 3.188 8.32065546 3.76 8.32065546 4.431 8.32065546 5.718 7.67762185 6.477 6.77364706 6.785L7.64194584 8.22201519zM4.343 5.817L5.76744444 5.817C6.46383951 5.817 6.907 5.311 6.907 4.53L6.907 4.508C6.907 3.683 6.47966667 3.232 5.75953086 3.232L4.343 3.232 4.343 5.817zM13.108434 8.96199965L11.0380163 6.89158197 6 11.9013923 6 13.97181 8.07041768 13.97181 13.108434 8.96199965zM14.8337821 7.23665158C15.055406 7.01500638 15.055406 6.42308794 14.8337821 6.20144274L13.7985732 5.1662339C13.5769494 4.9445887 12.9849883 4.9445887 12.7633644 5.1662339L11.7281556 6.20144274 13.7985732 8.27186042 14.8337821 7.23665158z"/>
+  </g>
+</svg>

platform/icons/src/actions/scratch.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <circle cx="12" cy="12" r="4" fill="#FFF" fill-opacity=".5" fill-rule="nonzero"/>
+    <circle cx="12.5" cy="12.5" r="3.5" fill="#FFF" fill-rule="nonzero"/>
+    <path fill="#40B6E0" d="M13,12.5928932 L13,11 L12,11 L12,13 L12.0071068,13 L12,13.0071068 L13.4142136,14.4213203 L14.1213203,13.7142136 L13,12.5928932 Z M12.5,16 C10.5670034,16 9,14.4329966 9,12.5 C9,10.5670034 10.5670034,9 12.5,9 C14.4329966,9 16,10.5670034 16,12.5 C16,14.4329966 14.4329966,16 12.5,16 Z"/>
+  </g>
+</svg>

platform/icons/src/actions/scratch_dark.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <circle cx="12" cy="12" r="4" fill="#0C0C0D" fill-opacity=".5" fill-rule="nonzero"/>
+    <circle cx="12.5" cy="12.5" r="3.5" fill="#231F20" fill-opacity=".7"/>
+    <path fill="#40B6E0" d="M13,12.5928932 L13,11 L12,11 L12,13 L12.0071068,13 L12,13.0071068 L13.4142136,14.4213203 L14.1213203,13.7142136 L13,12.5928932 Z M12.5,16 C10.5670034,16 9,14.4329966 9,12.5 C9,10.5670034 10.5670034,9 12.5,9 C14.4329966,9 16,10.5670034 16,12.5 C16,14.4329966 14.4329966,16 12.5,16 Z"/>
+  </g>
+</svg>

platform/icons/src/actions/searchNewLine.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#7F8B91" fill-opacity=".5" d="M5.00264069,9 L13,9 L13,4 L14,4 L14,10 L13,10 L5.00264069,10 L5.00264069,13.7352814 L0.76,9.49264069 L5.00264069,5.25 L5.00264069,9 Z"/>
+</svg>

platform/icons/src/actions/searchNewLineHover.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#7F8B91" fill-opacity=".9" d="M5.00264069,9 L13,9 L13,4 L14,4 L14,10 L13,10 L5.00264069,10 L5.00264069,13.7352814 L0.76,9.49264069 L5.00264069,5.25 L5.00264069,9 Z"/>
+</svg>

platform/icons/src/actions/swapPanels.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#6E6E6E" d="M2 6L6 6 6 10 2 10 2 6zM3 7L3 9 5 9 5 7 3 7zM10 6L14 6 14 10 10 10 10 6zM11 7L11 9 13 9 13 7 11 7z"/>
+    <path fill="#6E6E6E" d="M3.08355828,15.3584902 L3.04061597,15.3584902 L3.04061597,11.1743889 L4.42008602,12.5538301 C5.3309178,11.5966356 6.61717583,11 8.04278474,11 C10.5872696,11 12.6878304,12.9006761 13.0021688,15.3597218 L11.4838618,15.3597218 C11.1819841,13.7338101 9.75616032,12.5026584 8.04278474,12.5026584 C7.03206436,12.5026584 6.12140684,12.9310772 5.48250276,13.6162246 L7.2248048,15.3584902 L4.60193651,15.3584902 C4.60186016,15.3589007 4.60178387,15.3593113 4.60170764,15.3597218 L3.08340071,15.3597218 C3.08345318,15.3593113 3.08350571,15.3589007 3.08355829,15.3584902 Z" transform="rotate(180 8.021 13.18)"/>
+    <path fill="#6E6E6E" d="M3.08355828,4.85849024 L3.04061597,4.85849024 L3.04061597,0.674388872 L4.42008602,2.05383009 C5.3309178,1.09663562 6.61717583,0.5 8.04278474,0.5 C10.5872696,0.5 12.6878304,2.40067606 13.0021688,4.8597218 L11.4838618,4.8597218 C11.1819841,3.23381015 9.75616032,2.00265838 8.04278474,2.00265838 C7.03206436,2.00265838 6.12140684,2.43107715 5.48250276,3.11622463 L7.2248048,4.85849024 L4.60193651,4.85849024 C4.60186016,4.85890074 4.60178387,4.85931126 4.60170764,4.8597218 L3.08340071,4.8597218 C3.08345318,4.85931127 3.08350571,4.85890075 3.08355829,4.85849024 Z"/>
+  </g>
+</svg>

platform/icons/src/actions/swapPanels_dark.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#AFB1B3" d="M2 6L6 6 6 10 2 10 2 6zM3 7L3 9 5 9 5 7 3 7zM10 6L14 6 14 10 10 10 10 6zM11 7L11 9 13 9 13 7 11 7z"/>
+    <path fill="#AFB1B3" d="M3.08355828,15.3584902 L3.04061597,15.3584902 L3.04061597,11.1743889 L4.42008602,12.5538301 C5.3309178,11.5966356 6.61717583,11 8.04278474,11 C10.5872696,11 12.6878304,12.9006761 13.0021688,15.3597218 L11.4838618,15.3597218 C11.1819841,13.7338101 9.75616032,12.5026584 8.04278474,12.5026584 C7.03206436,12.5026584 6.12140684,12.9310772 5.48250276,13.6162246 L7.2248048,15.3584902 L4.60193651,15.3584902 C4.60186016,15.3589007 4.60178387,15.3593113 4.60170764,15.3597218 L3.08340071,15.3597218 C3.08345318,15.3593113 3.08350571,15.3589007 3.08355829,15.3584902 Z" transform="rotate(180 8.021 13.18)"/>
+    <path fill="#AFB1B3" d="M3.08355828,4.85849024 L3.04061597,4.85849024 L3.04061597,0.674388872 L4.42008602,2.05383009 C5.3309178,1.09663562 6.61717583,0.5 8.04278474,0.5 C10.5872696,0.5 12.6878304,2.40067606 13.0021688,4.8597218 L11.4838618,4.8597218 C11.1819841,3.23381015 9.75616032,2.00265838 8.04278474,2.00265838 C7.03206436,2.00265838 6.12140684,2.43107715 5.48250276,3.11622463 L7.2248048,4.85849024 L4.60193651,4.85849024 C4.60186016,4.85890074 4.60178387,4.85931126 4.60170764,4.8597218 L3.08340071,4.8597218 C3.08345318,4.85931127 3.08350571,4.85890075 3.08355829,4.85849024 Z"/>
+  </g>
+</svg>

platform/icons/src/actions/syncPanels.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#6E6E6E" d="M3 7L7 7 7 14 3 14 3 7zM4 8L4 13 6 13 6 8 4 8zM9 7L13 7 13 14 9 14 9 7zM10 8L10 13 12 13 12 8 10 8zM10.5772866 4.24124037C9.93667737 3.56469008 9.02998345 3.14265838 8.02471846 3.14265838 7.00748824 3.14265838 6.09118957 3.57479637 5.44938902 4.26550628L7.18240921 5.99849024 4.57165647 5.99849024C4.57157863 5.99890074 4.57150085 5.99931126 4.57142314 5.9997218L3.04316101 5.9997218C3.04321502 5.99931127 3.04326909 5.99890075 3.0433232 5.99849024L2.99822039 5.99849024 2.99822039 1.81438887 4.38363631 3.19977584C5.29826066 2.23890038 6.58968871 1.64 8.02099661 1.64 9.44223548 1.64 10.7255556 2.23050367 11.6389983 3.17955084L13.0041888 1.81438887 13.0041888 5.99849024 12.99867 5.99849024C12.9987241 5.99890075 12.9987782 5.99931127 12.9988322 5.9997218L11.4780138 5.9997218C11.4779361 5.99931126 11.4778583 5.99890074 11.4777804 5.99849024L8.82 5.99849024 10.5772866 4.24124037z"/>
+  </g>
+</svg>

platform/icons/src/actions/syncPanels_dark.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#AFB1B3" d="M3 7L7 7 7 14 3 14 3 7zM4 8L4 13 6 13 6 8 4 8zM9 7L13 7 13 14 9 14 9 7zM10 8L10 13 12 13 12 8 10 8zM10.5772866 4.24124037C9.93667737 3.56469008 9.02998345 3.14265838 8.02471846 3.14265838 7.00748824 3.14265838 6.09118957 3.57479637 5.44938902 4.26550628L7.18240921 5.99849024 4.57165647 5.99849024C4.57157863 5.99890074 4.57150085 5.99931126 4.57142314 5.9997218L3.04316101 5.9997218C3.04321502 5.99931127 3.04326909 5.99890075 3.0433232 5.99849024L2.99822039 5.99849024 2.99822039 1.81438887 4.38363631 3.19977584C5.29826066 2.23890038 6.58968871 1.64 8.02099661 1.64 9.44223548 1.64 10.7255556 2.23050367 11.6389983 3.17955084L13.0041888 1.81438887 13.0041888 5.99849024 12.99867 5.99849024C12.9987241 5.99890075 12.9987782 5.99931127 12.9988322 5.9997218L11.4780138 5.9997218C11.4779361 5.99931126 11.4778583 5.99890074 11.4777804 5.99849024L8.82 5.99849024 10.5772866 4.24124037z"/>
+  </g>
+</svg>

platform/icons/src/actions/synchronizeScrolling.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#6E6E6E" d="M13,4.99999981 L15,4.99999981 L12,7.99999981 L9,4.99999981 L11,4.99999981 L11,0.999999809 L13,0.999999809 L13,4.99999981 Z" transform="matrix(1 0 0 -1 0 9)"/>
+    <path fill="#6E6E6E" d="M13 12L15 12 12 15 9 12 11 12 11 8 13 8 13 12zM7 4L2 4 2 12 7 12 7 13 1 13 1 3 7 3 7 4z"/>
+    <path fill="#6E6E6E" d="M4,3 L8,3 L8,13 L4,13 L4,3 Z M5,4 L5,12 L7,12 L7,4 L5,4 Z"/>
+  </g>
+</svg>

platform/icons/src/actions/synchronizeScrolling_dark.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#AFB1B3" d="M13,4.99999981 L15,4.99999981 L12,7.99999981 L9,4.99999981 L11,4.99999981 L11,0.999999809 L13,0.999999809 L13,4.99999981 Z" transform="matrix(1 0 0 -1 0 9)"/>
+    <path fill="#AFB1B3" d="M13 12L15 12 12 15 9 12 11 12 11 8 13 8 13 12zM7 4L2 4 2 12 7 12 7 13 1 13 1 3 7 3 7 4z"/>
+    <path fill="#AFB1B3" d="M4,3 L8,3 L8,13 L4,13 L4,3 Z M5,4 L5,12 L7,12 L7,4 L5,4 Z"/>
+  </g>
+</svg>

platform/icons/src/actions/unselectall.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#6E6E6E" d="M2,2 L14,2 L14,14 L2,14 L2,2 Z M4,4 L4,12 L12,12 L12,4 L4,4 Z"/>
+    <rect width="6" height="2" x="5" y="7" fill="#6E6E6E"/>
+  </g>
+</svg>