From fd1bf63dbb7ea1de5e277e1956db3a1c8ad7431a Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Fri, 14 Apr 2017 14:13:34 +0300 Subject: [PATCH] properties: use PsiBasedFormattingModel (IDEA-163408) --- .../PropertiesFormattingModelBuilder.java | 42 ++----------------- 1 file changed, 3 insertions(+), 39 deletions(-) diff --git a/plugins/properties/src/com/intellij/lang/properties/formatting/PropertiesFormattingModelBuilder.java b/plugins/properties/src/com/intellij/lang/properties/formatting/PropertiesFormattingModelBuilder.java index 699616b5bcbb..d6fa4e658007 100644 --- a/plugins/properties/src/com/intellij/lang/properties/formatting/PropertiesFormattingModelBuilder.java +++ b/plugins/properties/src/com/intellij/lang/properties/formatting/PropertiesFormattingModelBuilder.java @@ -22,6 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.formatter.FormattingDocumentModelImpl; +import com.intellij.psi.formatter.PsiBasedFormattingModel; import com.intellij.psi.impl.source.SourceTreeToPsiMap; import com.intellij.psi.impl.source.tree.TreeElement; import com.intellij.psi.impl.source.tree.TreeUtil; @@ -34,10 +35,10 @@ import org.jetbrains.annotations.Nullable; public class PropertiesFormattingModelBuilder implements FormattingModelBuilder { @NotNull @Override - public PropertiesFormattingModel createModel(PsiElement element, CodeStyleSettings settings) { + public FormattingModel createModel(PsiElement element, CodeStyleSettings settings) { final ASTNode root = TreeUtil.getFileElement((TreeElement)SourceTreeToPsiMap.psiElementToTree(element)); final FormattingDocumentModelImpl documentModel = FormattingDocumentModelImpl.createOn(element.getContainingFile()); - return new PropertiesFormattingModel(root, documentModel, settings); + return new PsiBasedFormattingModel(element.getContainingFile(), new PropertiesRootBlock(root, settings), documentModel); } @Nullable @@ -45,41 +46,4 @@ public class PropertiesFormattingModelBuilder implements FormattingModelBuilder public TextRange getRangeAffectingIndent(PsiFile file, int offset, ASTNode elementAtOffset) { return null; } - - private static class PropertiesFormattingModel implements FormattingModel { - private final FormattingDocumentModelImpl myDocumentModel; - private PropertiesRootBlock myRoot; - - public PropertiesFormattingModel(ASTNode root, FormattingDocumentModelImpl documentModel, CodeStyleSettings settings) { - myRoot = new PropertiesRootBlock(root, settings); - myDocumentModel = documentModel; - } - - @NotNull - @Override - public Block getRootBlock() { - return myRoot; - } - - @NotNull - @Override - public FormattingDocumentModel getDocumentModel() { - return myDocumentModel; - } - - @Override - public TextRange replaceWhiteSpace(TextRange textRange, String whiteSpace) { - return textRange; - } - - @Override - public TextRange shiftIndentInsideRange(ASTNode node, TextRange range, int indent) { - return null; - } - - @Override - public void commitChanges() { - - } - } }