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

fix ASTFactory registration in ParsingTestCase

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-09-09 12:22:13 +02:00
parent e175a14260
commit 540f792196
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/lang/ASTFactory.java
+14 -5
View File
@@ -31,8 +31,6 @@ import org.jetbrains.annotations.Nullable;
* @author max
*/
public abstract class ASTFactory {
public static final ASTFactory DEFAULT = (ASTFactory) ServiceManager.getService(DefaultASTFactory.class);
private static final CharTable WHITESPACES = new CharTableImpl();
// interface methods
@@ -67,7 +65,7 @@ public abstract class ASTFactory {
}
final LazyParseableElement customLazy = factory(type).createLazy(type, text);
return customLazy != null ? customLazy : DEFAULT.createLazy(type, text);
return customLazy != null ? customLazy : DefaultFactoryHolder.DEFAULT.createLazy(type, text);
}
@NotNull
@@ -77,7 +75,7 @@ public abstract class ASTFactory {
}
final CompositeElement customComposite = factory(type).createComposite(type);
return customComposite != null ? customComposite : DEFAULT.createComposite(type);
return customComposite != null ? customComposite : DefaultFactoryHolder.DEFAULT.createComposite(type);
}
@NotNull
@@ -91,7 +89,7 @@ public abstract class ASTFactory {
}
final LeafElement customLeaf = factory(type).createLeaf(type, text);
return customLeaf != null ? customLeaf : DEFAULT.createLeaf(type, text);
return customLeaf != null ? customLeaf : DefaultFactoryHolder.DEFAULT.createLeaf(type, text);
}
private static ASTFactory factory(final IElementType type) {
@@ -104,4 +102,15 @@ public abstract class ASTFactory {
CodeEditUtil.setNodeGenerated(w, true);
return w;
}
public static class DefaultFactoryHolder {
public static final ASTFactory DEFAULT = def();
private static ASTFactory def() {
return (ASTFactory)ServiceManager.getService(DefaultASTFactory.class);
}
private DefaultFactoryHolder() {
}
}
}
platform/lang-impl/src/com/intellij/lang/LanguageASTFactory.java
+1 -1
View File
@@ -23,6 +23,6 @@ public class LanguageASTFactory extends LanguageExtension<ASTFactory> {
public static final LanguageASTFactory INSTANCE = new LanguageASTFactory();
private LanguageASTFactory() {
super("com.intellij.lang.ast.factory", ASTFactory.DEFAULT);
super("com.intellij.lang.ast.factory", ASTFactory.DefaultFactoryHolder.DEFAULT);
}
}
platform/testFramework/src/com/intellij/testFramework/ParsingTestCase.java
+1
View File
@@ -97,6 +97,7 @@ public abstract class ParsingTestCase extends PlatformLiteFixture {
myLanguage = myLanguage == null && myDefinitions != null && myDefinitions.length > 0? myDefinitions[0].getFileNodeType().getLanguage() : myLanguage;
registerComponentInstance(appContainer, FileTypeManager.class, new MockFileTypeManager(new MockLanguageFileType(myLanguage, myFileExt)));
registerApplicationService(PsiBuilderFactory.class, new PsiBuilderFactoryImpl());
registerApplicationService(DefaultASTFactory.class, new DefaultASTFactoryImpl());
myProject.registerService(CachedValuesManager.class, new CachedValuesManagerImpl(myProject, new PsiCachedValuesFactory(myPsiManager)));
myProject.registerService(PsiManager.class, myPsiManager);
myProject.registerService(StartupManager.class, new StartupManagerImpl(myProject));