diff --git a/UsageView/src/com/intellij/usages/impl/UsageViewImpl.java b/UsageView/src/com/intellij/usages/impl/UsageViewImpl.java index 66270c88c9ae..a0db50392ef4 100644 --- a/UsageView/src/com/intellij/usages/impl/UsageViewImpl.java +++ b/UsageView/src/com/intellij/usages/impl/UsageViewImpl.java @@ -28,8 +28,8 @@ import com.intellij.util.ui.tree.TreeUtil; import javax.swing.*; import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.TreePath; import javax.swing.tree.TreeNode; +import javax.swing.tree.TreePath; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -669,7 +669,10 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra private void collectUsages(DefaultMutableTreeNode node, Set usages) { if (node instanceof UsageNode) { UsageNode usageNode = (UsageNode)node; - usages.add(usageNode.getUsage()); + final Usage usage = usageNode.getUsage(); + if (usage != null && usage.isValid()) { + usages.add(usage); + } } Enumeration enumeration = node.children(); @@ -690,7 +693,9 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra if (lastPathComponent instanceof UsageTargetNode) { UsageTargetNode usageTargetNode = (UsageTargetNode)lastPathComponent; UsageTarget target = usageTargetNode.getTarget(); - targets.add(target); + if (target != null && target.isValid()) { + targets.add(target); + } } } diff --git a/openapi/src/com/intellij/lang/Language.java b/openapi/src/com/intellij/lang/Language.java index 70f1cbc79f33..c9c9d0a67adf 100644 --- a/openapi/src/com/intellij/lang/Language.java +++ b/openapi/src/com/intellij/lang/Language.java @@ -43,7 +43,7 @@ public abstract class Language { return null; } - public ParserDefinition getParserDefinition() { + public ParserDefinition getParserDefinition(Project project) { return null; } diff --git a/openapi/src/com/intellij/openapi/fileTypes/FileType.java b/openapi/src/com/intellij/openapi/fileTypes/FileType.java index 232e4a3154dd..34f8e729bdf2 100644 --- a/openapi/src/com/intellij/openapi/fileTypes/FileType.java +++ b/openapi/src/com/intellij/openapi/fileTypes/FileType.java @@ -4,7 +4,6 @@ */ package com.intellij.openapi.fileTypes; -import com.intellij.codeFormatting.PseudoTextBuilder; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.lang.Language; import com.intellij.openapi.project.Project; @@ -38,8 +37,6 @@ public interface FileType { FileTypeSupportCapabilities getSupportCapabilities(); - PseudoTextBuilder getPseudoTextBuilder(); - StructureViewModel getStructureViewModel(VirtualFile file, Project project); Language getLanguage(); diff --git a/openapi/src/com/intellij/openapi/fileTypes/UserFileType.java b/openapi/src/com/intellij/openapi/fileTypes/UserFileType.java index 13acb74e88f2..a3722c33a17f 100644 --- a/openapi/src/com/intellij/openapi/fileTypes/UserFileType.java +++ b/openapi/src/com/intellij/openapi/fileTypes/UserFileType.java @@ -31,7 +31,6 @@ */ package com.intellij.openapi.fileTypes; -import com.intellij.codeFormatting.PseudoTextBuilder; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.lang.Language; import com.intellij.openapi.options.SettingsEditor; @@ -102,10 +101,6 @@ public abstract class UserFileType implements FileType, return null; } - public PseudoTextBuilder getPseudoTextBuilder() { - return null; - } - public StructureViewModel getStructureViewModel(VirtualFile file, Project project) { return null; } diff --git a/source/com/intellij/ide/highlighter/ArchiveFileType.java b/source/com/intellij/ide/highlighter/ArchiveFileType.java index 53b506c2ff90..c69cebc86462 100644 --- a/source/com/intellij/ide/highlighter/ArchiveFileType.java +++ b/source/com/intellij/ide/highlighter/ArchiveFileType.java @@ -31,7 +31,6 @@ */ package com.intellij.ide.highlighter; -import com.intellij.codeFormatting.PseudoTextBuilder; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.lang.Language; import com.intellij.openapi.fileTypes.FileType; @@ -94,10 +93,6 @@ public class ArchiveFileType implements FileType { return null; } - public PseudoTextBuilder getPseudoTextBuilder() { - return null; - } - public StructureViewModel getStructureViewModel(VirtualFile file, Project project) { return null; } diff --git a/source/com/intellij/ide/highlighter/DTDFileType.java b/source/com/intellij/ide/highlighter/DTDFileType.java index f9ab4ffda28a..f97ca7a1ba17 100644 --- a/source/com/intellij/ide/highlighter/DTDFileType.java +++ b/source/com/intellij/ide/highlighter/DTDFileType.java @@ -31,7 +31,6 @@ */ package com.intellij.ide.highlighter; -import com.intellij.codeFormatting.PseudoTextBuilder; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.lang.dtd.DTDLanguage; import com.intellij.openapi.fileTypes.FileTypeSupportCapabilities; @@ -104,10 +103,6 @@ public class DTDFileType extends LanguageFileType { return mySupportCapabilities; } - public PseudoTextBuilder getPseudoTextBuilder() { - return null; - } - public StructureViewModel getStructureViewModel(VirtualFile file, Project project) { return null; } diff --git a/source/com/intellij/ide/highlighter/GuiFormFileType.java b/source/com/intellij/ide/highlighter/GuiFormFileType.java index 3d496062f167..6dae58072368 100644 --- a/source/com/intellij/ide/highlighter/GuiFormFileType.java +++ b/source/com/intellij/ide/highlighter/GuiFormFileType.java @@ -31,7 +31,6 @@ */ package com.intellij.ide.highlighter; -import com.intellij.codeFormatting.PseudoTextBuilder; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.lang.Language; import com.intellij.openapi.fileTypes.FileType; @@ -94,10 +93,6 @@ public class GuiFormFileType implements FileType { return null; } - public PseudoTextBuilder getPseudoTextBuilder() { - return null; - } - public StructureViewModel getStructureViewModel(VirtualFile file, Project project) { return null; } diff --git a/source/com/intellij/ide/highlighter/HtmlFileType.java b/source/com/intellij/ide/highlighter/HtmlFileType.java index bb86604770d4..e71c33683891 100644 --- a/source/com/intellij/ide/highlighter/HtmlFileType.java +++ b/source/com/intellij/ide/highlighter/HtmlFileType.java @@ -31,8 +31,6 @@ */ package com.intellij.ide.highlighter; -import com.intellij.codeFormatting.PseudoTextBuilder; -import com.intellij.codeFormatting.xml.html.HtmlPseudoTextBuilder; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.ide.structureView.impl.xml.XmlStructureViewTreeModel; import com.intellij.lang.html.HTMLLanguage; @@ -107,11 +105,6 @@ public class HtmlFileType extends LanguageFileType { return capabilities; } - public PseudoTextBuilder getPseudoTextBuilder() { - return new HtmlPseudoTextBuilder(); - //return null; - } - public StructureViewModel getStructureViewModel(VirtualFile file, Project project) { return new XmlStructureViewTreeModel((XmlFile)PsiManager.getInstance(project).findFile(file)); } diff --git a/source/com/intellij/ide/highlighter/JavaClassFileType.java b/source/com/intellij/ide/highlighter/JavaClassFileType.java index 1eebb7b731bf..28938def9b58 100644 --- a/source/com/intellij/ide/highlighter/JavaClassFileType.java +++ b/source/com/intellij/ide/highlighter/JavaClassFileType.java @@ -31,7 +31,6 @@ */ package com.intellij.ide.highlighter; -import com.intellij.codeFormatting.PseudoTextBuilder; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.lang.Language; import com.intellij.openapi.fileTypes.FileType; @@ -108,10 +107,6 @@ public class JavaClassFileType implements FileType { return null; } - public PseudoTextBuilder getPseudoTextBuilder() { - return null; - } - public StructureViewModel getStructureViewModel(VirtualFile file, Project project) { return null; } diff --git a/source/com/intellij/ide/highlighter/JavaFileType.java b/source/com/intellij/ide/highlighter/JavaFileType.java index c66358ac8dff..6b7f158eb299 100644 --- a/source/com/intellij/ide/highlighter/JavaFileType.java +++ b/source/com/intellij/ide/highlighter/JavaFileType.java @@ -31,11 +31,9 @@ */ package com.intellij.ide.highlighter; -import com.intellij.codeFormatting.PseudoTextBuilder; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.ide.structureView.impl.java.JavaFileTreeModel; import com.intellij.lang.java.JavaLanguage; -import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileTypeSupportCapabilities; import com.intellij.openapi.fileTypes.LanguageFileType; import com.intellij.openapi.project.Project; @@ -49,7 +47,6 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.impl.PsiManagerImpl; import com.intellij.psi.impl.source.PsiJavaFileImpl; import com.intellij.psi.impl.source.PsiPlainTextFileImpl; -import com.intellij.psi.impl.source.codeStyle.java.JavaAdapter; import javax.swing.*; @@ -92,14 +89,6 @@ public class JavaFileType extends LanguageFileType { return null; } - public PseudoTextBuilder getPseudoTextBuilder() { - return new JavaAdapter() { - protected FileType getFileType() { - return JavaFileType.this; - } - }; - } - public StructureViewModel getStructureViewModel(VirtualFile file, Project project) { final PsiFile psiFile = PsiManager.getInstance(project).findFile(file); if (!(psiFile instanceof PsiJavaFile)) return null; diff --git a/source/com/intellij/ide/highlighter/ModuleFileType.java b/source/com/intellij/ide/highlighter/ModuleFileType.java index 76ad0300ce7a..c393670744db 100644 --- a/source/com/intellij/ide/highlighter/ModuleFileType.java +++ b/source/com/intellij/ide/highlighter/ModuleFileType.java @@ -31,7 +31,6 @@ */ package com.intellij.ide.highlighter; -import com.intellij.codeFormatting.PseudoTextBuilder; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.lang.Language; import com.intellij.openapi.fileTypes.FileType; @@ -94,10 +93,6 @@ public class ModuleFileType implements FileType { return null; } - public PseudoTextBuilder getPseudoTextBuilder() { - return null; - } - public StructureViewModel getStructureViewModel(VirtualFile file, Project project) { return null; } diff --git a/source/com/intellij/ide/highlighter/ProjectFileType.java b/source/com/intellij/ide/highlighter/ProjectFileType.java index 16ee0c8fb9cc..dec1e05c0756 100644 --- a/source/com/intellij/ide/highlighter/ProjectFileType.java +++ b/source/com/intellij/ide/highlighter/ProjectFileType.java @@ -31,7 +31,6 @@ */ package com.intellij.ide.highlighter; -import com.intellij.codeFormatting.PseudoTextBuilder; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.lang.Language; import com.intellij.openapi.fileTypes.FileType; @@ -94,10 +93,6 @@ public class ProjectFileType implements FileType { return null; } - public PseudoTextBuilder getPseudoTextBuilder() { - return null; - } - public StructureViewModel getStructureViewModel(VirtualFile file, Project project) { return null; } diff --git a/source/com/intellij/ide/highlighter/UnknownFileType.java b/source/com/intellij/ide/highlighter/UnknownFileType.java index 98536ebc9e5a..eae4ce6049f9 100644 --- a/source/com/intellij/ide/highlighter/UnknownFileType.java +++ b/source/com/intellij/ide/highlighter/UnknownFileType.java @@ -31,7 +31,6 @@ */ package com.intellij.ide.highlighter; -import com.intellij.codeFormatting.PseudoTextBuilder; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.lang.Language; import com.intellij.openapi.fileTypes.FileType; @@ -91,10 +90,6 @@ public class UnknownFileType implements FileType { return null; } - public PseudoTextBuilder getPseudoTextBuilder() { - return null; - } - public StructureViewModel getStructureViewModel(VirtualFile file, Project project) { return null; } diff --git a/source/com/intellij/ide/highlighter/WorkspaceFileType.java b/source/com/intellij/ide/highlighter/WorkspaceFileType.java index 3b395866eb59..0ad841526fdb 100644 --- a/source/com/intellij/ide/highlighter/WorkspaceFileType.java +++ b/source/com/intellij/ide/highlighter/WorkspaceFileType.java @@ -31,7 +31,6 @@ */ package com.intellij.ide.highlighter; -import com.intellij.codeFormatting.PseudoTextBuilder; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.lang.Language; import com.intellij.openapi.fileTypes.FileType; @@ -94,10 +93,6 @@ public class WorkspaceFileType implements FileType { return null; } - public PseudoTextBuilder getPseudoTextBuilder() { - return null; - } - public StructureViewModel getStructureViewModel(VirtualFile file, Project project) { return null; } diff --git a/source/com/intellij/ide/highlighter/XHtmlFileType.java b/source/com/intellij/ide/highlighter/XHtmlFileType.java index e4be40fdd958..5fd2e4257c01 100644 --- a/source/com/intellij/ide/highlighter/XHtmlFileType.java +++ b/source/com/intellij/ide/highlighter/XHtmlFileType.java @@ -31,7 +31,6 @@ */ package com.intellij.ide.highlighter; -import com.intellij.codeFormatting.PseudoTextBuilder; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.lang.xhtml.XHTMLLanguage; import com.intellij.openapi.fileTypes.FileTypeSupportCapabilities; @@ -104,10 +103,6 @@ public class XHtmlFileType extends LanguageFileType { return capabilities; } - public PseudoTextBuilder getPseudoTextBuilder() { - return null; - } - public StructureViewModel getStructureViewModel(VirtualFile file, Project project) { return null; } diff --git a/source/com/intellij/ide/highlighter/XmlFileType.java b/source/com/intellij/ide/highlighter/XmlFileType.java index 24fa57238b5c..b29ab249442e 100644 --- a/source/com/intellij/ide/highlighter/XmlFileType.java +++ b/source/com/intellij/ide/highlighter/XmlFileType.java @@ -31,12 +31,9 @@ */ package com.intellij.ide.highlighter; -import com.intellij.codeFormatting.PseudoTextBuilder; -import com.intellij.codeFormatting.xml.xml.XmlPseudoTextBuilder; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.ide.structureView.impl.xml.XmlStructureViewTreeModel; import com.intellij.lang.xml.XMLLanguage; -import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileTypeSupportCapabilities; import com.intellij.openapi.fileTypes.LanguageFileType; import com.intellij.openapi.fileTypes.StdFileTypes; @@ -46,8 +43,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; import com.intellij.psi.impl.PsiManagerImpl; -import com.intellij.psi.impl.source.codeStyle.CodeFormatterFacade; -import com.intellij.psi.impl.source.codeStyle.java.JavaAdapter; import com.intellij.psi.impl.source.xml.XmlFileImpl; import com.intellij.psi.xml.XmlFile; @@ -88,19 +83,6 @@ public class XmlFileType extends LanguageFileType { return null; } - public PseudoTextBuilder getPseudoTextBuilder() { - if (CodeFormatterFacade.USE_NEW_CODE_FORMATTER <= 0) { - return new JavaAdapter() { - protected FileType getFileType() { - return XmlFileType.this; - } - }; - } - else { - return new XmlPseudoTextBuilder(); - } - } - public StructureViewModel getStructureViewModel(VirtualFile file, Project project) { return new XmlStructureViewTreeModel((XmlFile)PsiManager.getInstance(project).findFile(file)); } diff --git a/source/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java b/source/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java index 05c1c9411e8a..94cf525c0124 100644 --- a/source/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java +++ b/source/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java @@ -81,6 +81,7 @@ public class VirtualFileArrayRule implements GetDataRule { if (usages != null) { for (int i = 0; i < usages.length; i++) { Usage usage = usages[i]; + if (!usage.isValid()) continue; if (usage instanceof UsageInFile) { UsageInFile usageInFile = (UsageInFile)usage; result.add(usageInFile.getFile()); @@ -96,6 +97,7 @@ public class VirtualFileArrayRule implements GetDataRule { if (usageTargets != null) { for (int i = 0; i < usageTargets.length; i++) { UsageTarget usageTarget = usageTargets[i]; + if (!usageTarget.isValid()) continue; VirtualFile[] files = usageTarget.getFiles(); if (files != null) { result.addAll(Arrays.asList(files)); diff --git a/source/com/intellij/lang/html/HTMLLanguage.java b/source/com/intellij/lang/html/HTMLLanguage.java index 524101b7e4b0..37ec7c276038 100644 --- a/source/com/intellij/lang/html/HTMLLanguage.java +++ b/source/com/intellij/lang/html/HTMLLanguage.java @@ -1,5 +1,7 @@ package com.intellij.lang.html; +import com.intellij.codeFormatting.PseudoTextBuilder; +import com.intellij.codeFormatting.xml.html.HtmlPseudoTextBuilder; import com.intellij.ide.highlighter.HtmlFileHighlighter; import com.intellij.lang.Language; import com.intellij.openapi.fileTypes.SyntaxHighlighter; @@ -20,4 +22,8 @@ public class HTMLLanguage extends Language { public SyntaxHighlighter getSyntaxHighlighter(Project project) { return new HtmlFileHighlighter(); } + + public PseudoTextBuilder getFormatter() { + return new HtmlPseudoTextBuilder(); + } } diff --git a/source/com/intellij/lang/java/JavaLanguage.java b/source/com/intellij/lang/java/JavaLanguage.java index 97d6b035a2b1..d42e81877fd6 100644 --- a/source/com/intellij/lang/java/JavaLanguage.java +++ b/source/com/intellij/lang/java/JavaLanguage.java @@ -1,11 +1,15 @@ package com.intellij.lang.java; +import com.intellij.codeFormatting.PseudoTextBuilder; import com.intellij.ide.highlighter.JavaFileHighlighter; import com.intellij.lang.Language; +import com.intellij.openapi.fileTypes.FileType; +import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.fileTypes.SyntaxHighlighter; import com.intellij.openapi.project.Project; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.PsiManager; +import com.intellij.psi.impl.source.codeStyle.java.JavaAdapter; /** * Created by IntelliJ IDEA. @@ -23,4 +27,12 @@ public class JavaLanguage extends Language { LanguageLevel level = project != null ? PsiManager.getInstance(project).getEffectiveLanguageLevel() : LanguageLevel.HIGHEST; return new JavaFileHighlighter(level); } + + public PseudoTextBuilder getFormatter() { + return new JavaAdapter() { + protected FileType getFileType() { + return StdFileTypes.JAVA; + } + }; + } } diff --git a/source/com/intellij/lang/xml/XMLLanguage.java b/source/com/intellij/lang/xml/XMLLanguage.java index 6efc55c608a2..0ec1a14a24e2 100644 --- a/source/com/intellij/lang/xml/XMLLanguage.java +++ b/source/com/intellij/lang/xml/XMLLanguage.java @@ -1,9 +1,15 @@ package com.intellij.lang.xml; +import com.intellij.codeFormatting.PseudoTextBuilder; +import com.intellij.codeFormatting.xml.xml.XmlPseudoTextBuilder; import com.intellij.ide.highlighter.XmlFileHighlighter; import com.intellij.lang.Language; +import com.intellij.openapi.fileTypes.FileType; +import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.fileTypes.SyntaxHighlighter; import com.intellij.openapi.project.Project; +import com.intellij.psi.impl.source.codeStyle.CodeFormatterFacade; +import com.intellij.psi.impl.source.codeStyle.java.JavaAdapter; /** * Created by IntelliJ IDEA. @@ -20,4 +26,17 @@ public class XMLLanguage extends Language { public SyntaxHighlighter getSyntaxHighlighter(Project project) { return new XmlFileHighlighter(); } + + public PseudoTextBuilder getFormatter() { + if (CodeFormatterFacade.USE_NEW_CODE_FORMATTER <= 0) { + return new JavaAdapter() { + protected FileType getFileType() { + return StdFileTypes.XML; + } + }; + } + else { + return new XmlPseudoTextBuilder(); + } + } } diff --git a/source/com/intellij/openapi/fileTypes/PlainTextFileType.java b/source/com/intellij/openapi/fileTypes/PlainTextFileType.java index e2cfaf0405ec..68dd5e94a660 100644 --- a/source/com/intellij/openapi/fileTypes/PlainTextFileType.java +++ b/source/com/intellij/openapi/fileTypes/PlainTextFileType.java @@ -31,7 +31,6 @@ */ package com.intellij.openapi.fileTypes; -import com.intellij.codeFormatting.PseudoTextBuilder; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.lang.Language; import com.intellij.openapi.project.Project; @@ -91,10 +90,6 @@ public class PlainTextFileType implements FileType { return null; } - public PseudoTextBuilder getPseudoTextBuilder() { - return null; - } - public StructureViewModel getStructureViewModel(VirtualFile file, Project project) { return null; } diff --git a/source/com/intellij/openapi/fileTypes/ex/FakeFileType.java b/source/com/intellij/openapi/fileTypes/ex/FakeFileType.java index 9880b7fbb139..d848e7923912 100644 --- a/source/com/intellij/openapi/fileTypes/ex/FakeFileType.java +++ b/source/com/intellij/openapi/fileTypes/ex/FakeFileType.java @@ -6,7 +6,6 @@ */ package com.intellij.openapi.fileTypes.ex; -import com.intellij.codeFormatting.PseudoTextBuilder; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.lang.Language; import com.intellij.openapi.fileTypes.FileType; @@ -52,10 +51,6 @@ public abstract class FakeFileType implements FileType { return null; } - public PseudoTextBuilder getPseudoTextBuilder() { - return null; - } - public StructureViewModel getStructureViewModel(VirtualFile file, Project project) { return null; } diff --git a/source/com/intellij/psi/impl/source/codeStyle/CodeEditUtil.java b/source/com/intellij/psi/impl/source/codeStyle/CodeEditUtil.java index d5c5fbdda71d..fb7b0bfdd6a0 100644 --- a/source/com/intellij/psi/impl/source/codeStyle/CodeEditUtil.java +++ b/source/com/intellij/psi/impl/source/codeStyle/CodeEditUtil.java @@ -1,5 +1,8 @@ package com.intellij.psi.impl.source.codeStyle; +import com.intellij.codeFormatting.PseudoText; +import com.intellij.codeFormatting.PseudoTextBuilder; +import com.intellij.lang.ASTNode; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.StdFileTypes; @@ -12,9 +15,6 @@ import com.intellij.psi.impl.source.SourceTreeToPsiMap; import com.intellij.psi.impl.source.tree.*; import com.intellij.util.CharTable; import com.intellij.util.containers.HashMap; -import com.intellij.codeFormatting.PseudoTextBuilder; -import com.intellij.codeFormatting.PseudoText; -import com.intellij.lang.ASTNode; public class CodeEditUtil { private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.codeStyle.CodeEditUtil"); @@ -411,7 +411,7 @@ public class CodeEditUtil { LOG.assertTrue(firstAsPsiElement != null); final PsiFile file = firstAsPsiElement.getContainingFile(); final FileType fileType = file.getVirtualFile().getFileType(); - final PseudoTextBuilder pseudoTextBuilder = fileType.getPseudoTextBuilder(); + final PseudoTextBuilder pseudoTextBuilder = fileType.getLanguage().getFormatter(); LOG.assertTrue(pseudoTextBuilder != null); final Project project = firstAsPsiElement.getProject(); final CodeStyleSettings settings = CodeStyleSettingsManager.getInstance(project).getCurrentSettings(); diff --git a/source/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java b/source/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java index 1aaf86e765e5..926aa0bbfe15 100644 --- a/source/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java +++ b/source/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java @@ -110,7 +110,7 @@ public class CodeFormatterFacade implements Constants { public ASTNode processRange(ASTNode element, int startOffset, int endOffset) { FileType fileType = myHelper.getFileType(); if (useNewFormatter(fileType)) { - PseudoTextBuilder pseudoTextBuilder = fileType.getPseudoTextBuilder(); + PseudoTextBuilder pseudoTextBuilder = fileType.getLanguage().getFormatter(); if (pseudoTextBuilder == null) { return element; } diff --git a/source/com/intellij/psi/impl/source/parsing/ChameleonTransforming.java b/source/com/intellij/psi/impl/source/parsing/ChameleonTransforming.java index d3c47d31a80b..3e44fd3c083c 100644 --- a/source/com/intellij/psi/impl/source/parsing/ChameleonTransforming.java +++ b/source/com/intellij/psi/impl/source/parsing/ChameleonTransforming.java @@ -1,5 +1,6 @@ package com.intellij.psi.impl.source.parsing; +import com.intellij.lang.ASTNode; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.PsiLock; import com.intellij.psi.impl.DebugUtil; @@ -7,7 +8,6 @@ import com.intellij.psi.impl.source.Constants; import com.intellij.psi.impl.source.PsiFileImpl; import com.intellij.psi.impl.source.SourceTreeToPsiMap; import com.intellij.psi.impl.source.tree.*; -import com.intellij.lang.ASTNode; /** * @@ -74,7 +74,6 @@ public class ChameleonTransforming implements Constants { } child = child.getTreeNext(); } - ; } } }