From e2ce16b40d682383fbf4d01f942ed018341b29de Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 15 Jan 2026 16:21:34 +0100 Subject: [PATCH] cleanup platform-impl: pattern vars GitOrigin-RevId: f7fe4e33c74a787ea6dd56820405748ce975daeb --- .../intellij/execution/junit/InheritorChooser.java | 4 ++-- .../testDiscovery/actions/TestMethodUsage.java | 4 ++-- .../diff/tools/util/side/ThreesideContentPanel.java | 2 +- .../structureView/TreeBasedStructureViewBuilder.java | 2 +- .../folding/impl/CodeFoldingManagerImpl.java | 12 ++++++------ .../intellij/codeInspection/IntentionWrapper.java | 2 +- .../execution/console/ConsoleExecutionEditor.java | 4 ++-- .../execution/lineMarker/RunnableStatusListener.java | 4 ++-- .../intellij/find/findUsages/FindUsagesManager.java | 4 ++-- .../intellij/ide/actions/SelectInContextImpl.java | 2 +- .../intellij/ide/actions/ViewStructureAction.java | 4 ++-- .../com/intellij/ide/script/RunIdeConsoleAction.java | 4 ++-- .../src/com/intellij/ide/util/EditorHelper.java | 2 +- .../com/intellij/ide/util/FileStructurePopup.java | 4 ++-- .../com/intellij/ide/FileEditorSelectInContext.java | 2 +- .../src/com/intellij/ui/EditorNotificationPanel.java | 4 ++-- .../src/com/intellij/internal/OpenLogAction.java | 4 ++-- .../statistic/collectors/fus/TypingEventsLogger.java | 4 ++-- .../com/intellij/ide/lightEdit/LightEditTabs.java | 4 ++-- .../intellij/ide/lightEdit/LightEditorInfoImpl.java | 4 ++-- .../ide/lightEdit/LightEditorManagerImpl.java | 10 +++++----- .../openapi/command/impl/StartMarkAction.java | 4 ++-- .../intellij/openapi/editor/ex/util/EditorUtil.java | 2 +- .../editor/impl/BidiContentNotificationProvider.java | 4 ++-- .../impl/ForcedSoftWrapsNotificationProvider.java | 4 ++-- .../openapi/fileEditor/impl/EditorFileSwapper.java | 4 ++-- .../impl/text/LargeFileNotificationProvider.java | 4 ++-- .../plugin/ui/StructuralSearchDialog.java | 4 ++-- .../propertyBased/RehighlightAllEditors.java | 4 ++-- .../usageView/src/com/intellij/usages/Usage.java | 4 ++-- .../com/intellij/usages/UsageInfo2UsageAdapter.java | 4 ++-- .../openapi/vcs/impl/AbstractVcsHelperImpl.java | 4 ++-- .../xdebugger/impl/inline/XDebuggerInlayUtil.java | 4 ++-- .../xdebugger/impl/ui/ExecutionPointHighlighter.java | 4 ++-- .../lang/properties/editor/ResourceBundleEditor.java | 11 ++++++----- .../com/jetbrains/python/PythonTemplateRunner.java | 4 ++-- .../util/xml/structure/DomStructureViewBuilder.java | 2 +- 37 files changed, 77 insertions(+), 76 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/junit/InheritorChooser.java b/java/execution/impl/src/com/intellij/execution/junit/InheritorChooser.java index d2d5be41498e..91786743465c 100644 --- a/java/execution/impl/src/com/intellij/execution/junit/InheritorChooser.java +++ b/java/execution/impl/src/com/intellij/execution/junit/InheritorChooser.java @@ -76,8 +76,8 @@ public class InheritorChooser { } if (classes.isEmpty()) return false; final FileEditor fileEditor = PlatformCoreDataKeys.FILE_EDITOR.getData(context.getDataContext()); - if (fileEditor instanceof TextEditor) { - final Document document = ((TextEditor)fileEditor).getEditor().getDocument(); + if (fileEditor instanceof TextEditor te) { + final Document document = te.getEditor().getDocument(); final PsiFile containingFile = PsiDocumentManager.getInstance(context.getProject()).getPsiFile(document); if (containingFile instanceof PsiClassOwner) { final List psiClasses = new ArrayList<>(Arrays.asList(((PsiClassOwner)containingFile).getClasses())); diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/TestMethodUsage.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/TestMethodUsage.java index ab1f2ded993a..5a5c8ebb74e8 100644 --- a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/TestMethodUsage.java +++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/TestMethodUsage.java @@ -107,11 +107,11 @@ class TestMethodUsage implements Usage, UsageInFile, UsageInModule, PsiElementUs if (virtualFile == null) return null; Project project = getPointer().getProject(); FileEditor editor = FileEditorManager.getInstance(project).getSelectedEditor(virtualFile); - if (!(editor instanceof TextEditor)) return null; + if (!(editor instanceof TextEditor te)) return null; Segment segment = getPointer().getPsiRange(); if (segment == null) return null; - return new TextEditorLocation(segment.getStartOffset(), (TextEditor)editor); + return new TextEditorLocation(segment.getStartOffset(), te); } @Override diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideContentPanel.java b/platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideContentPanel.java index ab41c42a6d8d..b13b905bd9db 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideContentPanel.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideContentPanel.java @@ -80,7 +80,7 @@ public class ThreesideContentPanel extends JPanel { super(ContainerUtil.map(holders, holder -> holder.getComponent())); EditorHolder baseHolder = ThreeSide.BASE.select(holders); - myBaseEditor = baseHolder instanceof TextEditorHolder ? ((TextEditorHolder)baseHolder).getEditor() : null; + myBaseEditor = baseHolder instanceof TextEditorHolder te ? te.getEditor() : null; mySplitter.redispatchWheelEventsTo(baseHolder); } diff --git a/platform/editor-ui-api/src/com/intellij/ide/structureView/TreeBasedStructureViewBuilder.java b/platform/editor-ui-api/src/com/intellij/ide/structureView/TreeBasedStructureViewBuilder.java index 003ff067572d..c9131a774267 100644 --- a/platform/editor-ui-api/src/com/intellij/ide/structureView/TreeBasedStructureViewBuilder.java +++ b/platform/editor-ui-api/src/com/intellij/ide/structureView/TreeBasedStructureViewBuilder.java @@ -34,7 +34,7 @@ public abstract class TreeBasedStructureViewBuilder implements StructureViewBuil public @NotNull StructureView createStructureView(@Nullable FileEditor fileEditor, @NotNull Project project) { StructureViewModel model; try (AccessToken ignore = SlowOperations.knownIssue("IJPL-162970")) { - model = createStructureViewModel(fileEditor instanceof TextEditor ? ((TextEditor)fileEditor).getEditor() : null); + model = createStructureViewModel(fileEditor instanceof TextEditor te ? te.getEditor() : null); } var view = createStructureView(fileEditor, project, model); Disposer.register(view, model); diff --git a/platform/foldings/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java b/platform/foldings/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java index a684088f53e5..e32c34cf9222 100644 --- a/platform/foldings/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java +++ b/platform/foldings/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java @@ -67,8 +67,8 @@ public final class CodeFoldingManagerImpl extends CodeFoldingManager implements public void extensionAdded(@NotNull KeyedLazyInstance extension, @NotNull PluginDescriptor pluginDescriptor) { // Asynchronously update foldings when an extension is added for (FileEditor fileEditor : FileEditorManager.getInstance(project).getAllEditors()) { - if (fileEditor instanceof TextEditor) { - scheduleAsyncFoldingUpdate(((TextEditor)fileEditor).getEditor()); + if (fileEditor instanceof TextEditor te) { + scheduleAsyncFoldingUpdate(te.getEditor()); } } } @@ -77,8 +77,8 @@ public final class CodeFoldingManagerImpl extends CodeFoldingManager implements public void extensionRemoved(@NotNull KeyedLazyInstance extension, @NotNull PluginDescriptor pluginDescriptor) { // Synchronously remove foldings when an extension is removed for (FileEditor fileEditor : FileEditorManager.getInstance(project).getAllEditors()) { - if (fileEditor instanceof TextEditor) { - updateFoldRegions(((TextEditor)fileEditor).getEditor()); + if (fileEditor instanceof TextEditor te) { + updateFoldRegions(te.getEditor()); } } } @@ -86,8 +86,8 @@ public final class CodeFoldingManagerImpl extends CodeFoldingManager implements Runnable listener = () -> { for (FileEditor fileEditor : FileEditorManager.getInstance(project).getAllEditors()) { - if (fileEditor instanceof TextEditor) { - FoldingUpdate.clearFoldingCache(((TextEditor)fileEditor).getEditor()); + if (fileEditor instanceof TextEditor te) { + FoldingUpdate.clearFoldingCache(te.getEditor()); } } }; diff --git a/platform/lang-api/src/com/intellij/codeInspection/IntentionWrapper.java b/platform/lang-api/src/com/intellij/codeInspection/IntentionWrapper.java index affab2defe48..b42bd10bc314 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/IntentionWrapper.java +++ b/platform/lang-api/src/com/intellij/codeInspection/IntentionWrapper.java @@ -77,7 +77,7 @@ public class IntentionWrapper implements LocalQuickFix, IntentionAction, ActionC PsiFile file = element == null ? null : element.getContainingFile(); if (file != null) { FileEditor editor = FileEditorManager.getInstance(project).getSelectedEditor(file.getVirtualFile()); - myAction.invoke(project, editor instanceof TextEditor ? ((TextEditor)editor).getEditor() : null, file); + myAction.invoke(project, editor instanceof TextEditor te ? te.getEditor() : null, file); } } diff --git a/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecutionEditor.java b/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecutionEditor.java index 344772aebe89..11edd6a47a03 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecutionEditor.java +++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecutionEditor.java @@ -173,11 +173,11 @@ public final class ConsoleExecutionEditor implements Disposable { Editor selectedTextEditor = source.getSelectedTextEditor(); for (FileEditor fileEditor : source.getAllEditorList(file)) { - if (!(fileEditor instanceof TextEditor)) { + if (!(fileEditor instanceof TextEditor te)) { continue; } - final Editor editor = ((TextEditor)fileEditor).getEditor(); + final Editor editor = te.getEditor(); if (editor instanceof EditorEx editorEx) { editorEx.addFocusListener(myFocusListener, ConsoleExecutionEditor.this); if (selectedTextEditor == editorEx) { // already focused diff --git a/platform/lang-impl/src/com/intellij/execution/lineMarker/RunnableStatusListener.java b/platform/lang-impl/src/com/intellij/execution/lineMarker/RunnableStatusListener.java index 73daefa9c800..d79e5464a411 100644 --- a/platform/lang-impl/src/com/intellij/execution/lineMarker/RunnableStatusListener.java +++ b/platform/lang-impl/src/com/intellij/execution/lineMarker/RunnableStatusListener.java @@ -26,8 +26,8 @@ final class RunnableStatusListener implements DaemonCodeAnalyzer.DaemonListener if (!LineMarkerSettings.getSettings().isEnabled(new RunLineMarkerProvider())) return; for (FileEditor fileEditor : fileEditors) { - if (fileEditor instanceof TextEditor && fileEditor.isValid()) { - Editor editor = ((TextEditor)fileEditor).getEditor(); + if (fileEditor instanceof TextEditor te && fileEditor.isValid()) { + Editor editor = te.getEditor(); Project project = editor.getProject(); VirtualFile file = fileEditor.getFile(); if (file != null && project != null && file.isValid()) { diff --git a/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java b/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java index a61580095327..a809d5fdeaad 100644 --- a/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java +++ b/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java @@ -244,8 +244,8 @@ public final class FindUsagesManager { checkNotNull(primaryElements, handler, "getPrimaryElements()"); PsiElement[] secondaryElements = handler.getSecondaryElements(); checkNotNull(secondaryElements, handler, "getSecondaryElements()"); - if (singleFile && fileEditor instanceof TextEditor) { - Editor editor = ((TextEditor)fileEditor).getEditor(); + if (singleFile && fileEditor instanceof TextEditor te) { + Editor editor = te.getEditor(); editor.putUserData(KEY_START_USAGE_AGAIN, null); findUsagesInEditor(primaryElements, secondaryElements, handler, scopeFile, FileSearchScope.FROM_START, findUsagesOptions.clone(), editor); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SelectInContextImpl.java b/platform/lang-impl/src/com/intellij/ide/actions/SelectInContextImpl.java index 1f63814442d3..0773b51a7f69 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/SelectInContextImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/SelectInContextImpl.java @@ -163,7 +163,7 @@ public final class SelectInContextImpl extends FileSelectInContext { } private static @Nullable Object getElementFromStructureTreeView(@NotNull FileEditor fileEditor, TreeBasedStructureViewBuilder builder) { - Editor editor = fileEditor instanceof TextEditor ? ((TextEditor)fileEditor).getEditor() : null; + Editor editor = fileEditor instanceof TextEditor te ? te.getEditor() : null; StructureViewModel model = builder.createStructureViewModel(editor); Object selectorInFile = model.getCurrentEditorElement(); Disposer.dispose(model); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/ViewStructureAction.java b/platform/lang-impl/src/com/intellij/ide/actions/ViewStructureAction.java index 015692f7d6df..7a472d55af67 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/ViewStructureAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/ViewStructureAction.java @@ -61,7 +61,7 @@ public final class ViewStructureAction extends DumbAwareAction { if (fileEditor == null) return; VirtualFile virtualFile = fileEditor.getFile(); - Editor editor = fileEditor instanceof TextEditor ? ((TextEditor)fileEditor).getEditor() : + Editor editor = fileEditor instanceof TextEditor te ? te.getEditor() : e.getData(CommonDataKeys.EDITOR); if (editor != null) { PsiDocumentManager.getInstance(project).commitDocument(editor.getDocument()); @@ -118,7 +118,7 @@ public final class ViewStructureAction extends DumbAwareAction { } FileEditor fileEditor = e.getData(PlatformCoreDataKeys.FILE_EDITOR); - Editor editor = fileEditor instanceof TextEditor ? ((TextEditor)fileEditor).getEditor() : + Editor editor = fileEditor instanceof TextEditor te ? te.getEditor() : e.getData(CommonDataKeys.EDITOR); boolean enabled = fileEditor != null && diff --git a/platform/lang-impl/src/com/intellij/ide/script/RunIdeConsoleAction.java b/platform/lang-impl/src/com/intellij/ide/script/RunIdeConsoleAction.java index 39a3ad791f8a..78516d2e8679 100644 --- a/platform/lang-impl/src/com/intellij/ide/script/RunIdeConsoleAction.java +++ b/platform/lang-impl/src/com/intellij/ide/script/RunIdeConsoleAction.java @@ -141,8 +141,8 @@ public final class RunIdeConsoleAction extends DumbAwareAction { public static void configureConsole(@NotNull VirtualFile file, @NotNull FileEditorManager source) { MyRunAction runAction = new MyRunAction(); for (FileEditor fileEditor : source.getEditors(file)) { - if (!(fileEditor instanceof TextEditor)) continue; - Editor editor = ((TextEditor)fileEditor).getEditor(); + if (!(fileEditor instanceof TextEditor te)) continue; + Editor editor = te.getEditor(); runAction.registerCustomShortcutSet(CommonShortcuts.getCtrlEnter(), editor.getComponent()); } } diff --git a/platform/lang-impl/src/com/intellij/ide/util/EditorHelper.java b/platform/lang-impl/src/com/intellij/ide/util/EditorHelper.java index 171f16aea86f..f20560a3b653 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/EditorHelper.java +++ b/platform/lang-impl/src/com/intellij/ide/util/EditorHelper.java @@ -27,7 +27,7 @@ public final class EditorHelper { public static Editor openInEditor(@NotNull PsiElement element) { FileEditor editor = openInEditor(element, true); - return editor instanceof TextEditor ? ((TextEditor)editor).getEditor() : null; + return editor instanceof TextEditor te ? te.getEditor() : null; } public static @Nullable Editor openInMaybeInjectedEditor(@NotNull PsiElement element) { diff --git a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java index 32e71c11493c..f36c8945abc4 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java +++ b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java @@ -457,8 +457,8 @@ public final class FileStructurePopup implements Disposable, TreeActionsOwner { return (PsiElement)elementAtCursor; } - if (psiFile != null && myFileEditor instanceof TextEditor) { - return psiFile.getViewProvider().findElementAt(((TextEditor)myFileEditor).getEditor().getCaretModel().getOffset()); + if (psiFile != null && myFileEditor instanceof TextEditor te) { + return psiFile.getViewProvider().findElementAt(te.getEditor().getCaretModel().getOffset()); } return null; diff --git a/platform/platform-api/src/com/intellij/ide/FileEditorSelectInContext.java b/platform/platform-api/src/com/intellij/ide/FileEditorSelectInContext.java index 0ac57f53d7ac..c96836e21a0f 100644 --- a/platform/platform-api/src/com/intellij/ide/FileEditorSelectInContext.java +++ b/platform/platform-api/src/com/intellij/ide/FileEditorSelectInContext.java @@ -20,7 +20,7 @@ public class FileEditorSelectInContext extends SmartSelectInContext { public FileEditorSelectInContext(@NotNull FileEditor fileEditor, @NotNull PsiFile psiFile) { super(psiFile, psiFile, () -> fileEditor); - editor = fileEditor instanceof TextEditor ? (TextEditor)fileEditor : null; + editor = fileEditor instanceof TextEditor te ? te : null; } @Override diff --git a/platform/platform-api/src/com/intellij/ui/EditorNotificationPanel.java b/platform/platform-api/src/com/intellij/ui/EditorNotificationPanel.java index a45b8c8ec085..38c4fa661db6 100644 --- a/platform/platform-api/src/com/intellij/ui/EditorNotificationPanel.java +++ b/platform/platform-api/src/com/intellij/ui/EditorNotificationPanel.java @@ -130,7 +130,7 @@ public class EditorNotificationPanel extends JPanel implements IntentionActionPr public EditorNotificationPanel(@Nullable FileEditor fileEditor, @Nullable Color backgroundColor, @Nullable ColorKey backgroundColorKey) { - this(fileEditor instanceof TextEditor ? ((TextEditor)fileEditor).getEditor() : null, + this(fileEditor instanceof TextEditor te ? te.getEditor() : null, backgroundColor, backgroundColorKey); } @@ -179,7 +179,7 @@ public class EditorNotificationPanel extends JPanel implements IntentionActionPr @Nullable Color backgroundColor, @Nullable ColorKey backgroundColorKey, @NotNull Status status) { - this(fileEditor instanceof TextEditor ? ((TextEditor)fileEditor).getEditor() : null, backgroundColor, backgroundColorKey, status); + this(fileEditor instanceof TextEditor te ? te.getEditor() : null, backgroundColor, backgroundColorKey, status); } public EditorNotificationPanel(@Nullable Editor editor, diff --git a/platform/platform-impl/internal/src/com/intellij/internal/OpenLogAction.java b/platform/platform-impl/internal/src/com/intellij/internal/OpenLogAction.java index 4f1709ce29d5..11f6b05ae379 100644 --- a/platform/platform-impl/internal/src/com/intellij/internal/OpenLogAction.java +++ b/platform/platform-impl/internal/src/com/intellij/internal/OpenLogAction.java @@ -50,8 +50,8 @@ public class OpenLogAction extends DumbAwareAction { if (file != null) { VfsUtil.markDirtyAndRefresh(true, false, false, file); final FileEditor[] editors = FileEditorManager.getInstance(project).openFile(file, true); - if (editors.length > 0 && editors[0] instanceof TextEditor) { - scrollToLastIDEStart((TextEditor)editors[0]); + if (editors.length > 0 && editors[0] instanceof TextEditor te) { + scrollToLastIDEStart(te); } else { PsiNavigationSupport.getInstance().createNavigatable(project, file, -1).navigate(true); diff --git a/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/TypingEventsLogger.java b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/TypingEventsLogger.java index 16701dbe8b40..41cd73f36945 100644 --- a/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/TypingEventsLogger.java +++ b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/TypingEventsLogger.java @@ -124,9 +124,9 @@ public final class TypingEventsLogger extends CounterUsagesCollector { logCurrentLatency(); FileEditor editor = event.getNewEditor(); - if (editor instanceof TextEditor) { + if (editor instanceof TextEditor te) { myCurrentFile = event.getNewFile(); - myCurrentEditor = ((TextEditor)editor).getEditor(); + myCurrentEditor = te.getEditor(); myLatencyRecord = new LatencyDistributionRecord(new LatencyDistributionRecordKey("FUS")); } else { diff --git a/platform/platform-impl/src/com/intellij/ide/lightEdit/LightEditTabs.java b/platform/platform-impl/src/com/intellij/ide/lightEdit/LightEditTabs.java index f8b349099476..e5be0f3c6e38 100644 --- a/platform/platform-impl/src/com/intellij/ide/lightEdit/LightEditTabs.java +++ b/platform/platform-impl/src/com/intellij/ide/lightEdit/LightEditTabs.java @@ -200,8 +200,8 @@ final class LightEditTabs extends JBEditorTabs implements LightEditorListener, C @Override public void onDiscard() { FileEditor fileEditor = editorInfo.getFileEditor(); - if (fileEditor instanceof TextEditor) { - Editor editor = ((TextEditor)fileEditor).getEditor(); + if (fileEditor instanceof TextEditor te) { + Editor editor = te.getEditor(); FileDocumentManager.getInstance().reloadFromDisk(editor.getDocument()); } } diff --git a/platform/platform-impl/src/com/intellij/ide/lightEdit/LightEditorInfoImpl.java b/platform/platform-impl/src/com/intellij/ide/lightEdit/LightEditorInfoImpl.java index 15463c95e476..f48c5849448d 100644 --- a/platform/platform-impl/src/com/intellij/ide/lightEdit/LightEditorInfoImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/lightEdit/LightEditorInfoImpl.java @@ -60,7 +60,7 @@ public final class LightEditorInfoImpl implements LightEditorInfo { } public static @Nullable Editor getEditor(@Nullable FileEditor fileEditor) { - TextEditor textEditor = fileEditor instanceof TextEditor ? (TextEditor)fileEditor : null; + TextEditor textEditor = fileEditor instanceof TextEditor te ? te : null; return textEditor == null ? null : textEditor.getEditor(); } @@ -71,7 +71,7 @@ public final class LightEditorInfoImpl implements LightEditorInfo { @Override public boolean isSaveRequired() { return isUnsaved() && - (!isNew() || myFileEditor instanceof TextEditor && ((TextEditor)myFileEditor).getEditor().getDocument().getTextLength() > 0); + (!isNew() || myFileEditor instanceof TextEditor te && te.getEditor().getDocument().getTextLength() > 0); } @Override diff --git a/platform/platform-impl/src/com/intellij/ide/lightEdit/LightEditorManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/lightEdit/LightEditorManagerImpl.java index d9a2da66701a..9a8723e3bceb 100644 --- a/platform/platform-impl/src/com/intellij/ide/lightEdit/LightEditorManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/lightEdit/LightEditorManagerImpl.java @@ -74,10 +74,10 @@ public final class LightEditorManagerImpl implements LightEditorManager, Disposa private void installListener(@NotNull LightEditorInfo editorInfo) { FileEditor fileEditor = editorInfo.getFileEditor(); - if (fileEditor instanceof TextEditor) { - Editor editor = ((TextEditor)fileEditor).getEditor(); - if (editor instanceof EditorEx) { - ((EditorEx)editor).addFocusListener(new FocusChangeListener() { + if (fileEditor instanceof TextEditor te) { + Editor editor = te.getEditor(); + if (editor instanceof EditorEx ex) { + ex.addFocusListener(new FocusChangeListener() { @Override public void focusGained(@NotNull Editor editor) { WriteIntentReadAction.run(() -> checkUpdate(editor)); @@ -252,7 +252,7 @@ public final class LightEditorManagerImpl implements LightEditorManager, Disposa private @Nullable LightEditorInfo findEditor(@NotNull Editor editor) { for (LightEditorInfo editorInfo : editors) { FileEditor fileEditor = editorInfo.getFileEditor(); - if (fileEditor instanceof TextEditor && editor == ((TextEditor)fileEditor).getEditor()) { + if (fileEditor instanceof TextEditor te && editor == te.getEditor()) { return editorInfo; } } diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/StartMarkAction.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/StartMarkAction.java index 1d9a58fb18b7..692479d42b48 100644 --- a/platform/platform-impl/src/com/intellij/openapi/command/impl/StartMarkAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/StartMarkAction.java @@ -101,8 +101,8 @@ public final class StartMarkAction extends BasicUndoableAction { @Deprecated public static StartMarkAction canStart(@NotNull Project project) { for (FileEditor fileEditor : FileEditorManager.getInstance(project).getAllEditors()) { - if (fileEditor instanceof TextEditor) { - StartMarkAction startMarkAction = ((TextEditor)fileEditor).getEditor().getUserData(START_MARK_ACTION_KEY); + if (fileEditor instanceof TextEditor te) { + StartMarkAction startMarkAction = te.getEditor().getUserData(START_MARK_ACTION_KEY); if (startMarkAction != null) { return startMarkAction; } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java b/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java index 501ff87b43c0..e6694d2edddf 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java @@ -84,7 +84,7 @@ public final class EditorUtil { } public static @Nullable EditorEx getEditorEx(@Nullable FileEditor fileEditor) { - Editor editor = fileEditor instanceof TextEditor ? ((TextEditor)fileEditor).getEditor() : null; + Editor editor = fileEditor instanceof TextEditor te ? te.getEditor() : null; return editor instanceof EditorEx ? (EditorEx)editor : null; } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/BidiContentNotificationProvider.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/BidiContentNotificationProvider.java index af635ebbc2d2..4a8b5fc45157 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/BidiContentNotificationProvider.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/BidiContentNotificationProvider.java @@ -34,11 +34,11 @@ final class BidiContentNotificationProvider implements EditorNotificationProvide } return fileEditor -> { - if (!(fileEditor instanceof TextEditor)) { + if (!(fileEditor instanceof TextEditor te)) { return null; } - Editor editor = ((TextEditor)fileEditor).getEditor(); + Editor editor = te.getEditor(); if (!Boolean.TRUE.equals(editor.getUserData(EditorImpl.CONTAINS_BIDI_TEXT)) || Boolean.TRUE.equals(editor.getUserData(DISABLE_NOTIFICATION))) { return null; diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ForcedSoftWrapsNotificationProvider.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ForcedSoftWrapsNotificationProvider.java index c7cfd03d0423..d16734be5392 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ForcedSoftWrapsNotificationProvider.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ForcedSoftWrapsNotificationProvider.java @@ -25,8 +25,8 @@ final class ForcedSoftWrapsNotificationProvider implements EditorNotificationPro public @NotNull Function collectNotificationData(@NotNull Project project, @NotNull VirtualFile file) { return fileEditor -> { - if (!(fileEditor instanceof TextEditor)) return null; - final Editor editor = ((TextEditor)fileEditor).getEditor(); + if (!(fileEditor instanceof TextEditor te)) return null; + final Editor editor = te.getEditor(); if (!Boolean.TRUE.equals(editor.getUserData(EditorImpl.FORCED_SOFT_WRAPS)) || !Boolean.TRUE.equals(editor.getUserData(EditorImpl.SOFT_WRAPS_EXIST)) || PropertiesComponent.getInstance().isTrueValue(DISABLED_NOTIFICATION_KEY)) return null; diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorFileSwapper.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorFileSwapper.java index 45ed590cab6b..c803be567a8b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorFileSwapper.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorFileSwapper.java @@ -17,9 +17,9 @@ public interface EditorFileSwapper { static @Nullable TextEditorImpl findSinglePsiAwareEditor(@NotNull List fileEditors) { TextEditorImpl result = null; for (FileEditor fileEditor : fileEditors) { - if (fileEditor instanceof TextEditorImpl) { + if (fileEditor instanceof TextEditorImpl te) { if (result == null) { - result = (TextEditorImpl)fileEditor; + result = te; } else { return null; diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/LargeFileNotificationProvider.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/LargeFileNotificationProvider.java index 1d5d2c6819e2..90d03b476310 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/LargeFileNotificationProvider.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/LargeFileNotificationProvider.java @@ -30,11 +30,11 @@ public final class LargeFileNotificationProvider implements EditorNotificationPr public @NotNull Function collectNotificationData(@NotNull Project project, @NotNull VirtualFile file) { return fileEditor -> { - if (!(fileEditor instanceof TextEditor) || fileEditor.getUserData(LargeFileEditorProvider.IS_LARGE) != Boolean.TRUE) { + if (!(fileEditor instanceof TextEditor te) || fileEditor.getUserData(LargeFileEditorProvider.IS_LARGE) != Boolean.TRUE) { return null; } - Editor editor = ((TextEditor)fileEditor).getEditor(); + Editor editor = te.getEditor(); if (editor.getUserData(HIDDEN_KEY) != null || PropertiesComponent.getInstance().isTrueValue(DISABLE_KEY)) { return null; } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java index d2832f56df08..83ad2d65e858 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java @@ -191,8 +191,8 @@ public final class StructuralSearchDialog extends DialogWrapper implements Docum final Runnable runnable = () -> { removeRestartHighlightingListenerFromCurrentEditor(); removeMatchHighlights(); - if (myNewEditor instanceof TextEditor) { - myEditor = ((TextEditor)myNewEditor).getEditor(); + if (myNewEditor instanceof TextEditor te) { + myEditor = te.getEditor(); addMatchHighlights(); addRestartHighlightingListenerToCurrentEditor(); } diff --git a/platform/testFramework/src/com/intellij/testFramework/propertyBased/RehighlightAllEditors.java b/platform/testFramework/src/com/intellij/testFramework/propertyBased/RehighlightAllEditors.java index 076840c28599..6e95d9c83cb2 100644 --- a/platform/testFramework/src/com/intellij/testFramework/propertyBased/RehighlightAllEditors.java +++ b/platform/testFramework/src/com/intellij/testFramework/propertyBased/RehighlightAllEditors.java @@ -31,8 +31,8 @@ public class RehighlightAllEditors implements MadTestingAction { public void performCommand(@NotNull Environment env) { env.logMessage(toString()); for (FileEditor editor : FileEditorManager.getInstance(myProject).getAllEditors()) { - if (editor instanceof TextEditor) { - highlightEditor(((TextEditor)editor).getEditor(), myProject); + if (editor instanceof TextEditor te) { + highlightEditor(te.getEditor(), myProject); } } } diff --git a/platform/usageView/src/com/intellij/usages/Usage.java b/platform/usageView/src/com/intellij/usages/Usage.java index d05e0b15c97d..502afa275357 100644 --- a/platform/usageView/src/com/intellij/usages/Usage.java +++ b/platform/usageView/src/com/intellij/usages/Usage.java @@ -37,8 +37,8 @@ public interface Usage extends Navigatable { */ default int getNavigationOffset() { FileEditorLocation location = getLocation(); - if (location instanceof TextEditorLocation) { - LogicalPosition position = ((TextEditorLocation)location).getPosition(); + if (location instanceof TextEditorLocation tel) { + LogicalPosition position = tel.getPosition(); return ((TextEditor)location.getEditor()).getEditor().logicalPositionToOffset(position); } return -1; diff --git a/platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java b/platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java index 9e6d09c3a677..1f2d9c4982b4 100644 --- a/platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java +++ b/platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java @@ -213,11 +213,11 @@ public class UsageInfo2UsageAdapter implements UsageInModule, UsageInfoAdapter, VirtualFile virtualFile = getFile(); if (virtualFile == null) return null; FileEditor editor = FileEditorManager.getInstance(getProject()).getSelectedEditor(virtualFile); - if (!(editor instanceof TextEditor)) return null; + if (!(editor instanceof TextEditor te)) return null; Segment segment = getUsageInfo().getSegment(); if (segment == null) return null; - return new TextEditorLocation(segment.getStartOffset(), (TextEditor)editor); + return new TextEditorLocation(segment.getStartOffset(), te); } @Override diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java index 700d24d130db..8b1e8f02f606 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java @@ -341,8 +341,8 @@ public class AbstractVcsHelperImpl extends AbstractVcsHelper { public void showAnnotation(FileAnnotation annotation, VirtualFile file, AbstractVcs vcs, int line) { TextEditor textFileEditor; FileEditor fileEditor = FileEditorManager.getInstance(myProject).getSelectedEditor(file); - if (fileEditor instanceof TextEditor) { - textFileEditor = ((TextEditor)fileEditor); + if (fileEditor instanceof TextEditor te) { + textFileEditor = te; } else { textFileEditor = ContainerUtil.findInstance(FileEditorManager.getInstance(myProject).getEditorList(file), TextEditor.class); diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/inline/XDebuggerInlayUtil.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/inline/XDebuggerInlayUtil.java index 2393838dd82b..026284957245 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/inline/XDebuggerInlayUtil.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/inline/XDebuggerInlayUtil.java @@ -95,8 +95,8 @@ public final class XDebuggerInlayUtil { EDT.assertIsEdt(); XSourcePosition position = renderer.getPosition(); FileEditor editor = XDebuggerUtil.getInstance().getSelectedEditor(session.getProject(), position.getFile()); - if (editor instanceof TextEditor) { - Editor e = ((TextEditor)editor).getEditor(); + if (editor instanceof TextEditor te) { + Editor e = te.getEditor(); int line = position.getLine(); if (!DocumentUtil.isValidLine(line, e.getDocument())) return; int lineStart = e.getDocument().getLineStartOffset(line); diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/ExecutionPointHighlighter.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/ExecutionPointHighlighter.java index 5e22f535f033..e568d848af35 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/ExecutionPointHighlighter.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/ExecutionPointHighlighter.java @@ -162,8 +162,8 @@ public class ExecutionPointHighlighter { if (myOpenFileDescriptor != null) { if (!navigate) { FileEditor editor = FileEditorManager.getInstance(myProject).getSelectedEditor(myOpenFileDescriptor.getFile()); - if (editor instanceof TextEditor) { - myEditor = ((TextEditor)editor).getEditor(); + if (editor instanceof TextEditor te) { + myEditor = te.getEditor(); } } else { diff --git a/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java b/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java index bc8f6aea8a62..5715396b8de6 100644 --- a/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java +++ b/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java @@ -235,16 +235,17 @@ public final class ResourceBundleEditor extends UserDataHolderBase implements Do // We want to sync selected property key on selection change. if (newEditor == this) { - if (oldEditor instanceof TextEditor) { + if (oldEditor instanceof TextEditor te) { myPropertiesInsertDeleteManager.reload(); - setStructureViewSelectionFromPropertiesFile(((TextEditor)oldEditor).getEditor()); - } else if (myPropertyToSelectWhenVisible != null) { + setStructureViewSelectionFromPropertiesFile(te.getEditor()); + } + else if (myPropertyToSelectWhenVisible != null) { setStructureViewSelection(myPropertyToSelectWhenVisible); myPropertyToSelectWhenVisible = null; } } - else if (newEditor instanceof TextEditor) { - setPropertiesFileSelectionFromStructureView(((TextEditor)newEditor).getEditor()); + else if (newEditor instanceof TextEditor te) { + setPropertiesFileSelectionFromStructureView(te.getEditor()); } } diff --git a/python/python-psi-impl/src/com/jetbrains/python/PythonTemplateRunner.java b/python/python-psi-impl/src/com/jetbrains/python/PythonTemplateRunner.java index 1209d9368f11..9c3e3430eee1 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/PythonTemplateRunner.java +++ b/python/python-psi-impl/src/com/jetbrains/python/PythonTemplateRunner.java @@ -33,8 +33,8 @@ public final class PythonTemplateRunner { VirtualFile virtualFile = anchor.getContainingFile().getVirtualFile(); if (virtualFile == null) return; final FileEditor editor = PythonUiService.getInstance().getSelectedEditor(project, virtualFile); - if (editor instanceof TextEditor) { - builder.run(((TextEditor)editor).getEditor(), false); + if (editor instanceof TextEditor te) { + builder.run(te.getEditor(), false); } else { builder.runNonInteractively(false); diff --git a/xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureViewBuilder.java b/xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureViewBuilder.java index e62dc8b0ec58..74b605db28bb 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureViewBuilder.java +++ b/xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureViewBuilder.java @@ -33,6 +33,6 @@ public class DomStructureViewBuilder extends TreeBasedStructureViewBuilder { @Override public @NotNull StructureView createStructureView(final FileEditor fileEditor, final @NotNull Project project) { - return new StructureViewComponent(fileEditor, createStructureViewModel(fileEditor instanceof TextEditor ? ((TextEditor)fileEditor).getEditor() : null), project, true); + return new StructureViewComponent(fileEditor, createStructureViewModel(fileEditor instanceof TextEditor te ? te.getEditor() : null), project, true); } } \ No newline at end of file