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

LanguageExtension.allForLanguageOrAny()

Browse Source
This commit is contained in:
Dmitry Avdeev
2015-08-26 19:17:02 +03:00
parent 976dc0445e
commit c67005fda2
3 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/lang/LanguageExtension.java
+11 -10
View File
@@ -21,6 +21,7 @@ package com.intellij.lang;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.KeyedExtensionCollector;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -66,6 +67,9 @@ public class LanguageExtension<T> extends KeyedExtensionCollector<T, Language> {
return result;
}
/**
* @see #allForLanguageOrAny(Language)
*/
@NotNull
public List<T> allForLanguage(@NotNull Language l) {
List<T> list = forKey(l);
@@ -75,19 +79,16 @@ public class LanguageExtension<T> extends KeyedExtensionCollector<T, Language> {
return allForLanguage(base);
}
}
//if (l != Language.ANY) {
// final List<T> all = allForLanguage(Language.ANY);
// if (!all.isEmpty()) {
// if (list.isEmpty()) {
// return all;
// }
// list = new ArrayList<T>(list);
// list.addAll(all);
// }
//}
return list;
}
@NotNull
public List<T> allForLanguageOrAny(@NotNull Language l) {
List<T> providers = allForLanguage(l);
if (l == Language.ANY) return providers;
return ContainerUtil.concat(providers, allForLanguage(Language.ANY));
}
protected T getDefaultImplementation() {
return myDefaultImplementation;
}
platform/lang-api/src/com/intellij/codeInsight/daemon/LineMarkerProviders.java
-19
View File
@@ -16,13 +16,8 @@
package com.intellij.codeInsight.daemon;
import com.intellij.lang.Language;
import com.intellij.lang.LanguageExtension;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
/**
* @author yole
@@ -35,18 +30,4 @@ public class LineMarkerProviders extends LanguageExtension<LineMarkerProvider> {
private LineMarkerProviders() {
super(EP_NAME);
}
@NotNull
@Override
public List<LineMarkerProvider> allForLanguage(@NotNull Language l) {
//TODO[kb] make this for all Language Extensions
List<LineMarkerProvider> providers = super.allForLanguage(l);
if (l == Language.ANY) return providers;
List<LineMarkerProvider> any = super.allForLanguage(Language.ANY);
if (providers.isEmpty()) return any;
if (any.isEmpty()) return providers;
ArrayList<LineMarkerProvider> result = new ArrayList<LineMarkerProvider>(providers);
result.addAll(any);
return result;
}
}
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java
+1 -1
View File
@@ -144,7 +144,7 @@ public class LineMarkersPass extends TextEditorHighlightingPass implements LineM
}
public static List<LineMarkerProvider> getMarkerProviders(@NotNull Language language, @NotNull Project project) {
return DumbService.getInstance(project).filterByDumbAwareness(LineMarkerProviders.INSTANCE.allForLanguage(language));
return DumbService.getInstance(project).filterByDumbAwareness(LineMarkerProviders.INSTANCE.allForLanguageOrAny(language));
}
@Override