MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup FileEditor.EMPTY_ARRAY

Browse Source 
GitOrigin-RevId: d668fe3606e810e52bae56338f61eec8180ab9fc
This commit is contained in:
Alexey Kudravtsev
2020-04-24 12:16:59 +00:00
committed by intellij-monorepo-bot
parent f18799e660
commit aa565167d4
7 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/editor-ui-api/src/com/intellij/openapi/fileEditor/FileEditor.java
+2
View File
@@ -29,6 +29,8 @@ public interface FileEditor extends UserDataHolder, Disposable {
*/
@NonNls String PROP_VALID = "valid";
FileEditor[] EMPTY_ARRAY = {};
/**
* @return component which represents editor in the UI.
* The method should never return {@code null}.
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java
+1 -1
View File
@@ -262,7 +262,7 @@ final class PassExecutorService implements Disposable {
pass.applyInformationToEditor();
if (document != null) {
VirtualFile file = FileDocumentManager.getInstance().getFile(document);
FileEditor[] editors = file == null ? new FileEditor[0] : FileEditorManager.getInstance(myProject).getEditors(file);
FileEditor[] editors = file == null ? FileEditor.EMPTY_ARRAY : FileEditorManager.getInstance(myProject).getEditors(file);
for (FileEditor editor : editors) {
repaintErrorStripeAndIcon(editor);
}
platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/TestEditorManagerImpl.java
+3 -3
View File
@@ -346,7 +346,7 @@ final class TestEditorManagerImpl extends FileEditorManagerEx implements Disposa
@Override
public FileEditor @NotNull [] getEditors(@NotNull VirtualFile file) {
FileEditor e = getSelectedEditor(file);
if (e == null) return new FileEditor[0];
if (e == null) return FileEditor.EMPTY_ARRAY;
return new FileEditor[] {e};
}
@@ -395,7 +395,7 @@ final class TestEditorManagerImpl extends FileEditorManagerEx implements Disposa
@Override
public FileEditor @NotNull [] getSelectedEditors() {
return myActiveFile == null ? new FileEditor[0] : getEditors(myActiveFile);
return myActiveFile == null ? FileEditor.EMPTY_ARRAY : getEditors(myActiveFile);
}
@Override
@@ -504,7 +504,7 @@ final class TestEditorManagerImpl extends FileEditorManagerEx implements Disposa
public Pair<FileEditor[], FileEditorProvider[]> getEditorsWithProviders(@NotNull VirtualFile file) {
Pair<FileEditor, FileEditorProvider> editorAndProvider = myTestEditorSplitter.getEditorAndProvider(file);
FileEditor[] fileEditor = new FileEditor[0];
FileEditor[] fileEditor = FileEditor.EMPTY_ARRAY;
FileEditorProvider[] fileEditorProvider= new FileEditorProvider[0];
if (editorAndProvider != null) {
fileEditor = new FileEditor[] {editorAndProvider.first};
platform/platform-impl/src/com/intellij/ide/lightEdit/project/LightEditFileEditorManagerImpl.java
+1 -1
View File
@@ -51,7 +51,7 @@ final class LightEditFileEditorManagerImpl extends FileEditorManagerImpl {
FileEditorWithProvider data = getSelectedEditorWithProvider(file);
return data != null
? Pair.create(new FileEditor[]{data.getFileEditor()}, new FileEditorProvider[]{data.getProvider()})
: Pair.create(new FileEditor[0], new FileEditorProvider[0]);
: Pair.create(FileEditor.EMPTY_ARRAY, new FileEditorProvider[0]);
}
@Override
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java
+1 -1
View File
@@ -367,7 +367,7 @@ public class EditorsSplitters extends IdePanePanel implements UISettingsListener
editors.add(composite.getSelectedEditor());
}
}
return editors.toArray(new FileEditor[0]);
return editors.toArray(FileEditor.EMPTY_ARRAY);
}
public void updateFileIcon(@NotNull VirtualFile file) {
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
+8 -9
View File
@@ -107,7 +107,6 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
private static final Logger LOG = Logger.getInstance(FileEditorManagerImpl.class);
private static final Key<Boolean> DUMB_AWARE = Key.create("DUMB_AWARE");
private static final FileEditor[] EMPTY_EDITOR_ARRAY = {};
private static final FileEditorProvider[] EMPTY_PROVIDER_ARRAY = {};
public static final Key<Boolean> CLOSING_TO_REOPEN = Key.create("CLOSING_TO_REOPEN");
public static final String FILE_EDITOR_MANAGER = "FileEditorManager";
@@ -752,7 +751,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
// and select the created EditorComposite.
newProviders = FileEditorProviderManager.getInstance().getProviders(myProject, file);
if (newProviders.length == 0) {
return Pair.createNonNull(EMPTY_EDITOR_ARRAY, EMPTY_PROVIDER_ARRAY);
return Pair.createNonNull(FileEditor.EMPTY_ARRAY, EMPTY_PROVIDER_ARRAY);
}
builders = new AsyncFileEditorProvider.Builder[newProviders.length];
@@ -786,7 +785,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
openFileImpl4Edt(window, file, entry, options, compositeRef, newProviders, builders)));
EditorWithProviderComposite composite = compositeRef.get();
return Pair.createNonNull(composite == null ? EMPTY_EDITOR_ARRAY : composite.getEditors(),
return Pair.createNonNull(composite == null ? FileEditor.EMPTY_ARRAY : composite.getEditors(),
composite == null ? EMPTY_PROVIDER_ARRAY : composite.getProviders());
}
@@ -936,7 +935,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
}
}
if (editorList.isEmpty()) return null;
editors = editorList.toArray(new FileEditor[0]);
editors = editorList.toArray(FileEditor.EMPTY_ARRAY);
providers = providerList.toArray(new FileEditorProvider[0]);
}
return new EditorWithProviderComposite(file, editors, providers, this);
@@ -1235,7 +1234,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
for (EditorsSplitters splitters : getAllSplitters()) {
splitters.addSelectedEditorsTo(selectedEditors);
}
return selectedEditors.toArray(EMPTY_EDITOR_ARRAY);
return selectedEditors.toArray(FileEditor.EMPTY_ARRAY);
}
@Override
@@ -1293,7 +1292,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
if (!composites.isEmpty()) {
return Pair.create(composites.get(0).getEditors(), composites.get(0).getProviders());
}
return Pair.create(EMPTY_EDITOR_ARRAY, EMPTY_PROVIDER_ARRAY);
return Pair.create(FileEditor.EMPTY_ARRAY, EMPTY_PROVIDER_ARRAY);
}
@Override
@@ -1311,7 +1310,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
if (!composites.isEmpty()) {
return composites.get(0).getEditors();
}
return EMPTY_EDITOR_ARRAY;
return FileEditor.EMPTY_ARRAY;
}
@Override
@@ -1320,7 +1319,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
myOpenedEditors.forEach(composite -> {
if (composite.getFile().equals(file)) ContainerUtil.addAll(result, composite.myEditors);
});
return result.toArray(new FileEditor[0]);
return result.toArray(FileEditor.EMPTY_ARRAY);
}
@Nullable
@@ -1346,7 +1345,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
public FileEditor @NotNull [] getAllEditors() {
List<FileEditor> result = new ArrayList<>();
myOpenedEditors.forEach(composite -> ContainerUtil.addAll(result, composite.myEditors));
return result.toArray(new FileEditor[0]);
return result.toArray(FileEditor.EMPTY_ARRAY);
}
platform/testFramework/src/com/intellij/mock/Mock.java
+5 -5
View File
@@ -296,7 +296,7 @@ public class Mock {
public Pair<FileEditor[], FileEditorProvider[]> openFileWithProviders(@NotNull VirtualFile file,
boolean focusEditor,
boolean searchForSplitter) {
return Pair.create(new FileEditor[0], new FileEditorProvider[0]);
return Pair.create(FileEditor.EMPTY_ARRAY, new FileEditorProvider[0]);
}
@Override
@@ -334,7 +334,7 @@ public class Mock {
@Override
public FileEditor @NotNull [] getSelectedEditors() {
return new FileEditor[0];
return FileEditor.EMPTY_ARRAY;
}
@Override
@@ -344,17 +344,17 @@ public class Mock {
@Override
public FileEditor @NotNull [] getEditors(@NotNull VirtualFile file) {
return new FileEditor[0];
return FileEditor.EMPTY_ARRAY;
}
@Override
public FileEditor @NotNull [] getAllEditors(@NotNull VirtualFile file) {
return new FileEditor[0];
return FileEditor.EMPTY_ARRAY;
}
@Override
public FileEditor @NotNull [] getAllEditors() {
return new FileEditor[0];
return FileEditor.EMPTY_ARRAY;
}
@Override