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

give up

Browse Source
This commit is contained in:
Konstantin Bulenkov
2012-01-09 00:27:30 +01:00
parent d4018735f4
commit 444de91187
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/lang/LanguageExtension.java
+10 -11
View File
@@ -25,7 +25,6 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
public class LanguageExtension<T> extends KeyedExtensionCollector<T, Language> {
@@ -74,16 +73,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);
}
}
//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;
}
platform/lang-api/src/com/intellij/codeInsight/daemon/LineMarkerProviders.java
+20
View File
@@ -16,11 +16,17 @@
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
* @author Konstantin Bulenkov
*/
public class LineMarkerProviders extends LanguageExtension<LineMarkerProvider> {
public static LineMarkerProviders INSTANCE = new LineMarkerProviders();
@@ -29,4 +35,18 @@ public class LineMarkerProviders extends LanguageExtension<LineMarkerProvider> {
private LineMarkerProviders() {
super(EP_NAME);
}
@NotNull
@Override
public List<LineMarkerProvider> allForLanguage(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;
}
}