don't include html comment into icon hash

GitOrigin-RevId: 18baf186591787dafbdd6487ecd5b015909adfa7

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

@@ -257,14 +257,14 @@ internal open class IconsClassGenerator(private val projectHome: Path,
 
   private fun getCopyrightComment(text: String?): String {
     if (text == null) {
-      return ""
+      return "// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.\n"
     }
     val i = text.indexOf("package ")
     if (i == -1) {
       return ""
     }
     val comment = text.substring(0, i)
-    return if (comment.trim().endsWith("*/") || comment.trim().startsWith("//")) comment else ""
+    return if (comment.startsWith("//") || comment.trimEnd().endsWith("*/")) comment else ""
   }
 
   private fun getSeparators(text: String?): LineSeparator {
@@ -497,15 +497,15 @@ internal open class IconsClassGenerator(private val projectHome: Path,
       append(result, "${javaDoc}public static final @Deprecated @NotNull Icon $oldName = $iconName;", level)
     }
   }
+}
 
-  protected fun append(result: StringBuilder, text: String, level: Int) {
-    if (text.isNotBlank()) {
-      for (i in 0 until level) {
-        result.append(' ').append(' ')
-      }
+private fun append(result: StringBuilder, text: String, level: Int) {
+  if (text.isNotBlank()) {
+    repeat(level) {
+      result.append(' ').append(' ')
     }
-    result.append(text).append('\n')
   }
+  result.append(text).append('\n')
 }
 
 private fun generateIconFieldName(file: Path): CharSequence {
@@ -658,10 +658,11 @@ private fun capitalize(name: String): String {
 }
 
 private const val ICON_MANAGER_CODE = "IconManager.getInstance()"
+private val commentRegExp = Regex("(?s)<!--.*?-->")
 
 // remove line separators to unify line separators (\n vs \r\n), trim lines
 // normalization is required because a cache key is based on content
-internal fun loadAndNormalizeSvgFile(svgFile: Path): String {
+private fun loadAndNormalizeSvgFile(svgFile: Path): String {
   val builder = StringBuilder()
   Files.lines(svgFile).use { lines ->
     for (line in lines) {
@@ -687,7 +688,7 @@ internal fun loadAndNormalizeSvgFile(svgFile: Path): String {
       }
     }
   }
-  return builder.toString()
+  return commentRegExp.replace(builder, "")
 }
 
 private fun getPluginPackageIfPossible(module: JpsModule): String? {

platform/build-scripts/icons/tests/org/jetbrains/intellij/build/images/ImageResourcesTest.kt

@@ -1,4 +1,4 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.intellij.build.images
 
 import com.intellij.openapi.application.PathManager

platform/collaboration-tools/gen/icons/CollaborationToolsIcons.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package icons;
 
 import com.intellij.ui.IconManager;
@@ -31,7 +31,7 @@ public final class CollaborationToolsIcons {
     /** 16x16 */ public static final @NotNull Icon CommentUnreadMany = load("icons/review/commentUnreadMany.svg", 1838239824, 2);
     /** 16x16 */ public static final @NotNull Icon CommentUnresolved = load("icons/review/commentUnresolved.svg", 514456290, 0);
     /** 16x16 */ public static final @NotNull Icon DefaultAvatar = load("icons/review/defaultAvatar.svg", -2063080124, 0);
-    /** 16x16 */ public static final @NotNull Icon NonMergeable = load("icons/review/nonMergeable.svg", 144288160, 0);
+    /** 16x16 */ public static final @NotNull Icon NonMergeable = load("icons/review/nonMergeable.svg", -1457097161, 0);
   }
 
   /** 16x16 */ public static final @NotNull Icon Send = load("icons/send.svg", -418436367, 0);

platform/dependencies-toolwindow/src/icons/PlatformDependencyToolwindowIcons.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package icons;
 
 import com.intellij.ui.IconManager;
@@ -14,5 +14,5 @@ public final class PlatformDependencyToolwindowIcons {
   private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) {
     return IconManager.getInstance().loadRasterizedIcon(path, PlatformDependencyToolwindowIcons.class.getClassLoader(), cacheKey, flags);
   }
-  /** 13x13 */ public static final @NotNull Icon ArtifactSmall = load("icons/artifactSmall.svg", 76680633, 2);
+  /** 13x13 */ public static final @NotNull Icon ArtifactSmall = load("icons/artifactSmall.svg", 1723057659, 2);
 }

platform/statistics/devkit/src/com/intellij/internal/statistic/devkit/PlatformStatisticsDevkitIcons.java

@@ -14,6 +14,6 @@ public final class PlatformStatisticsDevkitIcons {
   private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) {
     return IconManager.getInstance().loadRasterizedIcon(path, PlatformStatisticsDevkitIcons.class.getClassLoader(), cacheKey, flags);
   }
-  /** 16x16 */ public static final @NotNull Icon StatisticsEventLog = load("icons/statisticsEventLog.svg", 842692644, 2);
-  /** 20x20 */ public static final @NotNull Icon StatisticsEventLog_20x20 = load("icons/statisticsEventLog@20x20.svg", -1423254505, 2);
+  /** 16x16 */ public static final @NotNull Icon StatisticsEventLog = load("icons/statisticsEventLog.svg", 144881750, 2);
+  /** 20x20 */ public static final @NotNull Icon StatisticsEventLog_20x20 = load("icons/statisticsEventLog@20x20.svg", -1400940848, 2);
 }

plugins/gitlab/gen/org/jetbrains/plugins/gitlab/GitlabIcons.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.gitlab;
 
 import com.intellij.ui.IconManager;
@@ -14,6 +14,6 @@ public final class GitlabIcons {
   private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) {
     return IconManager.getInstance().loadRasterizedIcon(path, GitlabIcons.class.getClassLoader(), cacheKey, flags);
   }
-  /** 16x16 */ public static final @NotNull Icon GitLabLogo = load("org/jetbrains/plugins/gitlab/gitLabLogo.svg", 1910543253, 0);
-  /** 13x13 */ public static final @NotNull Icon GitLabToolWindow = load("org/jetbrains/plugins/gitlab/gitLabToolWindow.svg", -13441779, 2);
+  /** 16x16 */ public static final @NotNull Icon GitLabLogo = load("org/jetbrains/plugins/gitlab/gitLabLogo.svg", 1250627198, 0);
+  /** 13x13 */ public static final @NotNull Icon GitLabToolWindow = load("org/jetbrains/plugins/gitlab/gitLabToolWindow.svg", 2119318995, 2);
 }

plugins/groovy/groovy-psi/gen/icons/JetgroovyIcons.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package icons;
 
 import com.intellij.ui.IconManager;
@@ -35,7 +35,7 @@ public final class JetgroovyIcons {
     /** 16x16 */ public static final @NotNull Icon Interface = load("icons/groovy/interface.svg", 1737162257, 1);
     /** 16x16 */ public static final @NotNull Icon Method = load("icons/groovy/method.svg", -1410304419, 1);
     /** 16x16 */ public static final @NotNull Icon Property = load("icons/groovy/property.svg", 1949490268, 0);
-    /** 16x16 */ public static final @NotNull Icon Record = load("icons/groovy/record.svg", -1940578720, 0);
+    /** 16x16 */ public static final @NotNull Icon Record = load("icons/groovy/record.svg", 97866237, 0);
     /** 16x16 */ public static final @NotNull Icon Trait = load("icons/groovy/trait.svg", 208038733, 0);
     /** 16x16 */ public static final @NotNull Icon Variable = load("icons/groovy/variable.svg", 2964789, 0);
   }

plugins/kotlin/base/resources/src/icons/KotlinBaseResourcesIcons.java

@@ -25,7 +25,7 @@ public final class KotlinBaseResourcesIcons {
   /** 16x16 */ public static final @NotNull Icon Expect = load("org/jetbrains/kotlin/idea/icons/expect.svg", 363067744, 1);
   /** 16x16 */ public static final @NotNull Icon Field_value = load("org/jetbrains/kotlin/idea/icons/field_value.svg", -325628794, 0);
   /** 16x16 */ public static final @NotNull Icon Field_variable = load("org/jetbrains/kotlin/idea/icons/field_variable.svg", 1413188893, 0);
-  /** 16x16 */ public static final @NotNull Icon Fir = load("org/jetbrains/kotlin/idea/icons/fir.svg", 1371508146, 0);
+  /** 16x16 */ public static final @NotNull Icon Fir = load("org/jetbrains/kotlin/idea/icons/fir.svg", 26181624, 0);
   /** 16x16 */ public static final @NotNull Icon InterfaceKotlin = load("org/jetbrains/kotlin/idea/icons/interfaceKotlin.svg", 753679007, 1);
   /** 16x16 */ public static final @NotNull Icon Kotlin = load("org/jetbrains/kotlin/idea/icons/kotlin.svg", -670251469, 0);
   /** 13x13 */ public static final @NotNull Icon Kotlin13 = load("org/jetbrains/kotlin/idea/icons/kotlin13.svg", -2024283106, 0);
@@ -45,7 +45,7 @@ public final class KotlinBaseResourcesIcons {
 
   public static final class Wizard {
     /** 16x16 */ public static final @NotNull Icon Android = load("org/jetbrains/kotlin/idea/icons/wizard/android.svg", -1326579908, 0);
-    /** 16x16 */ public static final @NotNull Icon Compose = load("org/jetbrains/kotlin/idea/icons/wizard/compose.svg", -1841956116, 0);
+    /** 16x16 */ public static final @NotNull Icon Compose = load("org/jetbrains/kotlin/idea/icons/wizard/compose.svg", 507227494, 0);
     /** 16x16 */ public static final @NotNull Icon Console = load("org/jetbrains/kotlin/idea/icons/wizard/console.svg", 1289322946, 0);
     /** 16x16 */ public static final @NotNull Icon Ios = load("org/jetbrains/kotlin/idea/icons/wizard/ios.svg", 713314826, 0);
     /** 16x16 */ public static final @NotNull Icon JS = load("org/jetbrains/kotlin/idea/icons/wizard/js.svg", -1754026525, 0);
@@ -57,7 +57,7 @@ public final class KotlinBaseResourcesIcons {
     /** 16x16 */ public static final @NotNull Icon MultiplatformMobile = load("org/jetbrains/kotlin/idea/icons/wizard/multiplatformMobile.svg", 2146171055, 0);
     /** 16x16 */ public static final @NotNull Icon MultiplatformMobileLibrary = load("org/jetbrains/kotlin/idea/icons/wizard/multiplatformMobileLibrary.svg", 1860899803, 0);
     /** 16x16 */ public static final @NotNull Icon Native = load("org/jetbrains/kotlin/idea/icons/wizard/native.svg", 1370229751, 0);
-    /** 16x16 */ public static final @NotNull Icon Nodejs = load("org/jetbrains/kotlin/idea/icons/wizard/nodejs.svg", -777923678, 2);
+    /** 16x16 */ public static final @NotNull Icon Nodejs = load("org/jetbrains/kotlin/idea/icons/wizard/nodejs.svg", 29715953, 2);
     /** 16x16 */ public static final @NotNull Icon PpWeb = load("org/jetbrains/kotlin/idea/icons/wizard/ppWeb.svg", -1741405143, 0);
     /** 16x16 */ public static final @NotNull Icon React = load("org/jetbrains/kotlin/idea/icons/wizard/react.svg", -546671193, 0);
     /** 16x16 */ public static final @NotNull Icon Windows = load("org/jetbrains/kotlin/idea/icons/wizard/windows.svg", 843099969, 0);

plugins/markdown/core/gen/org/intellij/plugins/markdown/MarkdownIcons.java

@@ -22,20 +22,20 @@ public final class MarkdownIcons {
     /** 16x16 */ public static final @NotNull Icon AddRowBelow = load("icons/editor_actions/addRowBelow.svg", -306054638, 2);
     /** 16x16 */ public static final @NotNull Icon Bold = load("icons/editor_actions/Bold.svg", 1921337120, 2);
     /** 16x16 */ public static final @NotNull Icon BulletList = load("icons/editor_actions/bulletList.svg", -335732793, 2);
-    /** 16x16 */ public static final @NotNull Icon CenterAlign = load("icons/editor_actions/centerAlign.svg", 2142499169, 2);
+    /** 16x16 */ public static final @NotNull Icon CenterAlign = load("icons/editor_actions/centerAlign.svg", -339274230, 2);
     /** 16x16 */ public static final @NotNull Icon CheckmarkList = load("icons/editor_actions/checkmarkList.svg", 1808097800, 2);
     /** 16x16 */ public static final @NotNull Icon Code_span = load("icons/editor_actions/Code_span.svg", -211767311, 2);
     /** 16x16 */ public static final @NotNull Icon Header_level_down = load("icons/editor_actions/Header_level_down.svg", 1441503292, 2);
     /** 16x16 */ public static final @NotNull Icon Header_level_up = load("icons/editor_actions/Header_level_up.svg", 705385691, 2);
     /** 16x16 */ public static final @NotNull Icon Italic = load("icons/editor_actions/Italic.svg", 1476403781, 2);
-    /** 16x16 */ public static final @NotNull Icon LeftAlign = load("icons/editor_actions/leftAlign.svg", -1834350471, 2);
+    /** 16x16 */ public static final @NotNull Icon LeftAlign = load("icons/editor_actions/leftAlign.svg", -1385952994, 2);
     /** 16x16 */ public static final @NotNull Icon Link = load("icons/editor_actions/Link.svg", -867860223, 2);
     /** 16x16 */ public static final @NotNull Icon NumberedList = load("icons/editor_actions/numberedList.svg", -188884574, 2);
-    /** 16x16 */ public static final @NotNull Icon RightAlign = load("icons/editor_actions/rightAlign.svg", 1512131859, 2);
+    /** 16x16 */ public static final @NotNull Icon RightAlign = load("icons/editor_actions/rightAlign.svg", 1122920950, 2);
     /** 16x16 */ public static final @NotNull Icon Strike_through = load("icons/editor_actions/Strike_through.svg", 2102723170, 2);
-    /** 16x16 */ public static final @NotNull Icon Table = load("icons/editor_actions/table.svg", 2132721470, 2);
+    /** 16x16 */ public static final @NotNull Icon Table = load("icons/editor_actions/table.svg", 1228514476, 2);
   }
 
-  /** 12x12 */ public static final @NotNull Icon ImageGutter = load("icons/imageGutter.svg", 566665511, 2);
+  /** 12x12 */ public static final @NotNull Icon ImageGutter = load("icons/imageGutter.svg", 266962552, 2);
   /** 16x16 */ public static final @NotNull Icon MarkdownPlugin = load("icons/MarkdownPlugin.svg", -1653656099, 0);
 }

plugins/maven/src/main/gen/icons/MavenIcons.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package icons;
 
 import com.intellij.ui.IconManager;
@@ -16,7 +16,7 @@ public final class MavenIcons {
   }
   /** 16x16 */ public static final @NotNull Icon ChildrenProjects = load("images/childrenProjects.svg", -985931240, 2);
   /** 16x16 */ public static final @NotNull Icon ExecuteMavenGoal = load("images/executeMavenGoal.svg", 1616290340, 2);
-  /** 16x16 */ public static final @NotNull Icon MavenIgnored = load("images/mavenIgnored.svg", -1186342609, 2);
+  /** 16x16 */ public static final @NotNull Icon MavenIgnored = load("images/mavenIgnored.svg", -1681982409, 2);
   /** 16x16 */ public static final @NotNull Icon MavenLoadChanges = load("images/mavenLoadChanges.svg", -855662362, 2);
   /** 16x16 */ public static final @NotNull Icon MavenPlugin = load("images/mavenPlugin.svg", 1839929032, 0);
   /** 16x16 */ public static final @NotNull Icon MavenProject = load("images/mavenProject.svg", 1041122923, 0);

plugins/package-search/src/com/jetbrains/packagesearch/PackageSearchIcons.java

@@ -13,8 +13,8 @@ public final class PackageSearchIcons {
   private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) {
     return IconManager.getInstance().loadRasterizedIcon(path, PackageSearchIcons.class.getClassLoader(), cacheKey, flags);
   }
-  /** 16x16 */ public static final @NotNull Icon Artifact = load("icons/artifact.svg", 801906052, 2);
-  /** 13x13 */ public static final @NotNull Icon ArtifactSmall = load("icons/artifactSmall.svg", 2110168599, 2);
-  /** 16x16 */ public static final @NotNull Icon Checkmark = load("icons/checkmark.svg", 1207998150, 2);
-  /** 16x16 */ public static final @NotNull Icon Package = load("icons/package.svg", -674452563, 0);
+  /** 16x16 */ public static final @NotNull Icon Artifact = load("icons/artifact.svg", 680033985, 2);
+  /** 13x13 */ public static final @NotNull Icon ArtifactSmall = load("icons/artifactSmall.svg", -1405900386, 2);
+  /** 16x16 */ public static final @NotNull Icon Checkmark = load("icons/checkmark.svg", -1034722923, 2);
+  /** 16x16 */ public static final @NotNull Icon Package = load("icons/package.svg", 1724259341, 0);
 }

plugins/settings-sync/src/icons/SettingsSyncIcons.java

@@ -16,6 +16,6 @@ public final class SettingsSyncIcons {
   /** 16x16 */ public static final @NotNull Icon Conflict = load("icons/conflict.svg", -1704427102, 0);
   /** 16x16 */ public static final @NotNull Icon LocalChanges = load("icons/localChanges.svg", 1313941748, 0);
   /** 16x16 */ public static final @NotNull Icon RemoteChanges = load("icons/remoteChanges.svg", -1916304003, 0);
-  /** 16x16 */ public static final @NotNull Icon StatusDisabled = load("icons/statusDisabled.svg", -1445644040, 2);
-  /** 16x16 */ public static final @NotNull Icon StatusEnabled = load("icons/statusEnabled.svg", -373023411, 0);
+  /** 16x16 */ public static final @NotNull Icon StatusDisabled = load("icons/statusDisabled.svg", -877231839, 2);
+  /** 16x16 */ public static final @NotNull Icon StatusEnabled = load("icons/statusEnabled.svg", -1533977764, 0);
 }