cleanup

GitOrigin-RevId: 3e8d50eaf0a3330a106c20023a0193d2061bf2ba

jps/model-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeAssocTable.java

@@ -31,7 +31,7 @@ public final class FileTypeAssocTable<T> {
   private FileTypeAssocTable(@NotNull Map<? extends CharSequence, ? extends T> extensionMappings,
                              @NotNull Map<? extends CharSequence, ? extends T> exactFileNameMappings,
                              @NotNull Map<? extends CharSequence, ? extends T> exactFileNameAnyCaseMappings,
-                             @NotNull Map<String, ? extends T> hashBangMap,
+                             @NotNull Map<? extends String, ? extends T> hashBangMap,
                              @NotNull List<? extends Pair<FileNameMatcher, T>> matchingMappings) {
     myExtensionMappings = createCharSequenceConcurrentMap(extensionMappings);
     myExactFileNameMappings = new ConcurrentHashMap<>(exactFileNameMappings);

platform/lang-impl/src/com/intellij/codeInsight/highlighting/EscapeHandler.java

@@ -31,12 +31,10 @@ public class EscapeHandler extends EditorActionHandler {
       if (project != null) {
         HighlightManagerImpl highlightManager = (HighlightManagerImpl)HighlightManager.getInstance(project);
         if (highlightManager != null && highlightManager.hideHighlights(editor, HighlightManager.HIDE_BY_ESCAPE | HighlightManager.HIDE_BY_ANY_KEY)) {
-  
           StatusBar statusBar = WindowManager.getInstance().getStatusBar(project);
           if (statusBar != null) {
             statusBar.setInfo("");
           }
-  
           FindManager findManager = FindManager.getInstance(project);
           if (findManager != null) {
             FindModel model = findManager.getFindNextModel(editor);
@@ -45,7 +43,6 @@ public class EscapeHandler extends EditorActionHandler {
               findManager.setFindNextModel(model);
             }
           }
-  
           return;
         }
       }

platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java

@@ -340,14 +340,15 @@ public final class HighlightManagerImpl extends HighlightManager {
     Map<RangeHighlighter, HighlightFlags> map = getHighlightInfoMap(editor, false);
     if (map == null) return false;
 
-    boolean done = false;
+    boolean hidden = false;
     List<RangeHighlighter> highlightersToRemove = new ArrayList<>();
-    for (RangeHighlighter highlighter : map.keySet()) {
-      HighlightFlags info = map.get(highlighter);
-      if (!InjectedLanguageEditorUtil.getTopLevelEditor(info.editor).equals(InjectedLanguageEditorUtil.getTopLevelEditor(editor))) continue;
-      if ((info.flags & mask) != 0) {
+    for (Map.Entry<RangeHighlighter, HighlightFlags> entry : map.entrySet()) {
+      HighlightFlags info = entry.getValue();
+      RangeHighlighter highlighter = entry.getKey();
+      if ((info.flags & mask) != 0 &&
+          InjectedLanguageEditorUtil.getTopLevelEditor(info.editor).equals(InjectedLanguageEditorUtil.getTopLevelEditor(editor))) {
         highlightersToRemove.add(highlighter);
-        done = true;
+        hidden = true;
       }
     }
 
@@ -355,7 +356,7 @@ public final class HighlightManagerImpl extends HighlightManager {
       removeSegmentHighlighter(editor, highlighter);
     }
 
-    return done;
+    return hidden;
   }
 
   boolean hasHideByEscapeHighlighters(@NotNull Editor editor) {