cleanup

GitOrigin-RevId: d0dd8e748ebc7707b68fb055da571ca89468fd49

plugins/laf/macos/resources/META-INF/plugin.xml

@@ -1,4 +1,4 @@
-<idea-plugin>
+<idea-plugin package="com.intellij.laf.macos">
   <id>com.intellij.laf.macos</id>
   <name>macOS Light Theme</name>
   <vendor>JetBrains</vendor>
@@ -6,8 +6,6 @@
 
   <description><![CDATA[Provides macOS Look And Feel that mimics macOS native Blue and Graphite themes]]></description>
 
-  <depends>com.intellij.modules.platform</depends>
-
   <extensions defaultExtensionNs="com.intellij">
     <lafProvider implementation="com.intellij.laf.macos.MacLafProvider" os="mac"/>
   </extensions>

plugins/laf/macos/src/com/intellij/laf/macos/MacEditorTextFieldBorder.java

@@ -16,7 +16,7 @@ import java.awt.*;
 import java.awt.geom.Path2D;
 import java.awt.geom.Rectangle2D;
 
-class MacEditorTextFieldBorder extends DarculaEditorTextFieldBorder {
+final class MacEditorTextFieldBorder extends DarculaEditorTextFieldBorder {
   MacEditorTextFieldBorder(EditorTextField editorTextField, EditorEx editor) {
     super(editorTextField, editor);
   }

plugins/laf/macos/src/com/intellij/laf/macos/MacIntelliJLaf.kt

@@ -25,9 +25,9 @@ internal class MacIntelliJLaf : IntelliJLaf() {
     }
   }
 
-  override fun getPrefix(): String = "com/intellij/ide/ui/laf/intellijlaf"
+  override fun getPrefix() = "com/intellij/ide/ui/laf/intellijlaf"
 
-  override fun getSystemPrefix(): String = "com/intellij/laf/macos/macintellijlaf"
+  override fun getSystemPrefix() = "com/intellij/laf/macos/macintellijlaf"
 
   companion object {
     fun isMacLaf() = UIManager.getLookAndFeel() is MacIntelliJLaf

plugins/laf/macos/src/com/intellij/laf/macos/MacLafProvider.kt

@@ -2,24 +2,19 @@ package com.intellij.laf.macos
 
 import com.intellij.ide.ui.LafProvider
 import com.intellij.ide.ui.laf.PluggableLafInfo
-import com.intellij.ide.ui.laf.SearchTextAreaPainter
 import com.intellij.ide.ui.laf.darcula.ui.DarculaEditorTextFieldBorder
 import com.intellij.openapi.editor.ex.EditorEx
 import com.intellij.openapi.util.NlsSafe
 import com.intellij.ui.EditorTextField
 import javax.swing.LookAndFeel
 
-class MacLafProvider : LafProvider {
-  override fun getLookAndFeelInfo(): PluggableLafInfo {
-    return infoInstance
-  }
+internal class MacLafProvider : LafProvider {
+  override fun getLookAndFeelInfo() = instance
 
   private class MacOsLookAndFeelInfo : PluggableLafInfo(LAF_NAME, MacIntelliJLaf::class.java.name) {
     override fun createLookAndFeel(): LookAndFeel = MacIntelliJLaf()
 
-    override fun createSearchAreaPainter(context: SearchAreaContext): SearchTextAreaPainter {
-      return MacSearchPainter(context)
-    }
+    override fun createSearchAreaPainter(context: SearchAreaContext) = MacSearchPainter(context)
 
     override fun createEditorTextFieldBorder(editorTextField: EditorTextField, editor: EditorEx): DarculaEditorTextFieldBorder {
       return MacEditorTextFieldBorder(editorTextField, editor)
@@ -29,6 +24,7 @@ class MacLafProvider : LafProvider {
   companion object {
     @NlsSafe
     const val LAF_NAME = "macOS Light"
-    val infoInstance:PluggableLafInfo = MacOsLookAndFeelInfo()
+
+    private val instance: PluggableLafInfo = MacOsLookAndFeelInfo()
   }
 }

plugins/laf/macos/src/com/intellij/laf/macos/MacSearchPainter.java

@@ -12,7 +12,7 @@ import javax.swing.border.Border;
 import javax.swing.text.JTextComponent;
 import java.awt.*;
 
-class MacSearchPainter implements SearchTextAreaPainter {
+final class MacSearchPainter implements SearchTextAreaPainter {
   private final PluggableLafInfo.SearchAreaContext myContext;
 
   MacSearchPainter(PluggableLafInfo.SearchAreaContext context) {
@@ -20,20 +20,17 @@ class MacSearchPainter implements SearchTextAreaPainter {
   }
 
   @Override
-  @NotNull
-  public Border getBorder() {
+  public @NotNull Border getBorder() {
     return JBUI.Borders.empty(3 + Math.max(0, JBUIScale.scale(16) - UIUtil.getLineHeight(myContext.getTextComponent())) / 2, 6, 4, 4);
   }
 
   @Override
-  @NotNull
-  public String getLayoutConstraints() {
+  public @NotNull String getLayoutConstraints() {
     return "flowx, ins 0, gapx " + JBUIScale.scale(4);
   }
 
   @Override
-  @NotNull
-  public String getHistoryButtonConstraints() {
+  public @NotNull String getHistoryButtonConstraints() {
     int extraGap = getExtraGap();
     return "ay top, gaptop " + extraGap + ", gapleft" + (JBUIScale.isUsrHiDPI() ? 4 : 0);
   }
@@ -46,15 +43,13 @@ class MacSearchPainter implements SearchTextAreaPainter {
 
 
   @Override
-  @NotNull
-  public String getIconsPanelConstraints() {
+  public @NotNull String getIconsPanelConstraints() {
     int extraGap = getExtraGap();
     return "gaptop " + extraGap + ", ay top, gapright " + extraGap / 2;
   }
 
   @Override
-  @NotNull
-  public Border getIconsPanelBorder(int rows) {
+  public @NotNull Border getIconsPanelBorder(int rows) {
     return JBUI.Borders.emptyBottom(rows == 2 ? 3 : 0);
   }