MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 17:20:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

revert incorrect refactoring to list

Browse Source 
GitOrigin-RevId: ca5d603e34d1836e0559f13379902c111bd0aeb5
This commit is contained in:
Alexey Kudravtsev
2023-12-13 01:32:27 +01:00
committed by intellij-monorepo-bot
parent 924753dd78
commit f68d08af16
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
View File

@@ -470,7 +470,7 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP
protected @NotNull HighlightInfoHolder createInfoHolder(@NotNull PsiFile file) {
List<HighlightInfoFilter> filters = HighlightInfoFilter.EXTENSION_POINT_NAME.getExtensionList();
HighlightInfoFilter[] filters = HighlightInfoFilter.EXTENSION_POINT_NAME.getExtensionList().toArray(HighlightInfoFilter.EMPTY_ARRAY);
EditorColorsScheme actualScheme = getColorsScheme() == null ? EditorColorsManager.getInstance().getGlobalScheme() : getColorsScheme();
HighlightInfoHolder infoHolder = new HighlightInfoHolder(file, filters) {
@Override

8
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightInfoHolder.java
View File

@@ -16,16 +16,12 @@ import java.util.List;
public class HighlightInfoHolder {
private final PsiFile myContextFile;
private final List<HighlightInfoFilter> myFilters;
private final @NotNull HighlightInfoFilter @NotNull [] myFilters;
private final AnnotationSession myAnnotationSession;
private int myErrorCount;
private final List<HighlightInfo> myInfos;
public HighlightInfoHolder(@NotNull PsiFile contextFile) {
this(contextFile, List.of());
}
public HighlightInfoHolder(@NotNull PsiFile contextFile, @NotNull List<HighlightInfoFilter> filters) {
public HighlightInfoHolder(@NotNull PsiFile contextFile, @NotNull HighlightInfoFilter @NotNull ... filters) {
myContextFile = contextFile;
myAnnotationSession = new AnnotationSessionImpl(contextFile);
myFilters = filters;

4
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ChameleonSyntaxHighlightingPass.java
View File

@@ -81,8 +81,8 @@ final class ChameleonSyntaxHighlightingPass extends GeneralHighlightingPass {
for (PsiElement e : s) {
(e.getTextRange().intersects(myPriorityRange) ? lazyInside : lazyOutside).add(e);
}
HighlightInfoHolder holderInside = new HighlightInfoHolder(myFile, List.of());
HighlightInfoHolder holderOutside = new HighlightInfoHolder(myFile, List.of());
HighlightInfoHolder holderInside = new HighlightInfoHolder(myFile);
HighlightInfoHolder holderOutside = new HighlightInfoHolder(myFile);
for (PsiElement e : lazyInside) {
collectHighlights(e, holderInside, holderOutside, myPriorityRange);
}

2
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/InjectedGeneralHighlightingPass.java
View File

@@ -185,7 +185,7 @@ final class InjectedGeneralHighlightingPass extends GeneralHighlightingPass {
private @NotNull HighlightInfoHolder createInfoHolder(@NotNull PsiFile injectedPsi, @NotNull DocumentWindow documentWindow,
@NotNull InjectedLanguageManager injectedLanguageManager,
@NotNull Consumer<? super HighlightInfo> outInfos) {
List<HighlightInfoFilter> filters = HighlightInfoFilter.EXTENSION_POINT_NAME.getExtensionList();
HighlightInfoFilter[] filters = HighlightInfoFilter.EXTENSION_POINT_NAME.getExtensionList().toArray(HighlightInfoFilter.EMPTY_ARRAY);
EditorColorsScheme actualScheme = getColorsScheme() == null ? EditorColorsManager.getInstance().getGlobalScheme() : getColorsScheme();
return new HighlightInfoHolder(injectedPsi, filters) {
@Override