From 48fd5c015346890f42cd4028ce8d4e98f3ef16f8 Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Wed, 5 Jun 2019 10:33:39 +0300 Subject: [PATCH] Update preview with the current source file when navigating to EditorConfig GitOrigin-RevId: f68d63aa66ba44c8e9c5f4ba9595e14c9c683137 --- .../EditorConfigNavigationActionsFactory.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigNavigationActionsFactory.java b/plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigNavigationActionsFactory.java index d9dfcf9873e1..736e4c39a1b0 100644 --- a/plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigNavigationActionsFactory.java +++ b/plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigNavigationActionsFactory.java @@ -1,10 +1,10 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.editorconfig.configmanagement; -import com.intellij.ide.actions.OpenFileAction; import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; @@ -47,8 +47,12 @@ public class EditorConfigNavigationActionsFactory { } private static void openEditorConfig(@NotNull Project project, @NotNull VirtualFile sourceFile, @NotNull VirtualFile editorConfigFile) { + final FileEditorManager fileEditorManager = FileEditorManager.getInstance(project); + if (fileEditorManager.isFileOpen(editorConfigFile)) { + fileEditorManager.closeFile(editorConfigFile); + } EditorConfigPreviewManager.getInstance(project).associateWithPreviewFile(editorConfigFile, sourceFile); - OpenFileAction.openFile(editorConfigFile, project); + fileEditorManager.openFile(editorConfigFile, true); } public void updateEditorConfigFilePaths(@NotNull List editorConfigFilePaths) {