From 7f46a79dbd65a06717bd44b3635da55b741eb86d Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Fri, 1 Jun 2018 14:52:13 +0300 Subject: [PATCH] Add default implementation to getRangeAffectingIndent() and remove dummy implementations returning null. --- .../intellij/json/formatter/JsonFormattingBuilderModel.java | 6 ------ .../src/com/intellij/formatting/FormattingModelBuilder.java | 6 ++++-- .../TemplateLanguageFormattingModelBuilder.java | 5 ----- .../SimpleTemplateLanguageFormattingModelBuilder.java | 4 ---- .../groovy/formatter/GroovyFormattingModelBuilder.java | 6 ------ .../formatting/PropertiesFormattingModelBuilder.java | 5 ----- .../python/formatter/PythonFormattingModelBuilder.java | 5 ----- .../com/intellij/lang/html/HtmlFormattingModelBuilder.java | 4 ---- .../intellij/lang/xhtml/XhtmlFormattingModelBuilder.java | 4 ---- .../com/intellij/lang/xml/XmlFormattingModelBuilder.java | 5 +---- .../compact/formatting/RncFormattingModelBuilder.java | 5 ----- 11 files changed, 5 insertions(+), 50 deletions(-) diff --git a/json/src/com/intellij/json/formatter/JsonFormattingBuilderModel.java b/json/src/com/intellij/json/formatter/JsonFormattingBuilderModel.java index 5f96cb822195..711d97f7c370 100644 --- a/json/src/com/intellij/json/formatter/JsonFormattingBuilderModel.java +++ b/json/src/com/intellij/json/formatter/JsonFormattingBuilderModel.java @@ -24,12 +24,6 @@ public class JsonFormattingBuilderModel implements FormattingModelBuilder { return FormattingModelProvider.createFormattingModelForPsiFile(element.getContainingFile(), block, settings); } - @Nullable - @Override - public TextRange getRangeAffectingIndent(PsiFile file, int offset, ASTNode elementAtOffset) { - return null; - } - static SpacingBuilder createSpacingBuilder(CodeStyleSettings settings) { final JsonCodeStyleSettings jsonSettings = settings.getCustomSettings(JsonCodeStyleSettings.class); final CommonCodeStyleSettings commonSettings = settings.getCommonSettings(JsonLanguage.INSTANCE); diff --git a/platform/lang-api/src/com/intellij/formatting/FormattingModelBuilder.java b/platform/lang-api/src/com/intellij/formatting/FormattingModelBuilder.java index 84e2cb7e660b..6f631ede106a 100644 --- a/platform/lang-api/src/com/intellij/formatting/FormattingModelBuilder.java +++ b/platform/lang-api/src/com/intellij/formatting/FormattingModelBuilder.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable; * as the language's whitespace tokens. See {@link com.intellij.lang.ParserDefinition} * * @see com.intellij.lang.LanguageFormatting - * @see FormattingModelProvider#createFormattingModelForPsiFile(com.intellij.psi.PsiFile, Block, com.intellij.psi.codeStyle.CodeStyleSettings) + * @see FormattingModelProvider#createFormattingModelForPsiFile(PsiFile, Block, CodeStyleSettings) */ public interface FormattingModelBuilder { @@ -58,5 +58,7 @@ public interface FormattingModelBuilder { * @return the range to reformat, or null if the default range should be used */ @Nullable - TextRange getRangeAffectingIndent(PsiFile file, int offset, ASTNode elementAtOffset); + default TextRange getRangeAffectingIndent(PsiFile file, int offset, ASTNode elementAtOffset) { + return null; + } } diff --git a/platform/lang-impl/src/com/intellij/formatting/templateLanguages/TemplateLanguageFormattingModelBuilder.java b/platform/lang-impl/src/com/intellij/formatting/templateLanguages/TemplateLanguageFormattingModelBuilder.java index 7fca921f9052..a6838b4bf9d4 100644 --- a/platform/lang-impl/src/com/intellij/formatting/templateLanguages/TemplateLanguageFormattingModelBuilder.java +++ b/platform/lang-impl/src/com/intellij/formatting/templateLanguages/TemplateLanguageFormattingModelBuilder.java @@ -91,11 +91,6 @@ public abstract class TemplateLanguageFormattingModelBuilder implements Delegati }; } - @Override - public TextRange getRangeAffectingIndent(PsiFile file, int offset, ASTNode elementAtOffset) { - return null; - } - @Override public boolean dontFormatMyModel() { return true; diff --git a/platform/lang-impl/src/com/intellij/psi/templateLanguages/SimpleTemplateLanguageFormattingModelBuilder.java b/platform/lang-impl/src/com/intellij/psi/templateLanguages/SimpleTemplateLanguageFormattingModelBuilder.java index 0750472363c5..e0650ea9e300 100644 --- a/platform/lang-impl/src/com/intellij/psi/templateLanguages/SimpleTemplateLanguageFormattingModelBuilder.java +++ b/platform/lang-impl/src/com/intellij/psi/templateLanguages/SimpleTemplateLanguageFormattingModelBuilder.java @@ -68,8 +68,4 @@ public class SimpleTemplateLanguageFormattingModelBuilder implements FormattingM }, element.getProject(), settings, file.getFileType(), file); } - @Override - public TextRange getRangeAffectingIndent(final PsiFile file, final int offset, final ASTNode elementAtOffset) { - return null; - } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyFormattingModelBuilder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyFormattingModelBuilder.java index 7d20d2f2c266..cb154837aa0c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyFormattingModelBuilder.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyFormattingModelBuilder.java @@ -68,12 +68,6 @@ public class GroovyFormattingModelBuilder implements FormattingModelBuilder { } } - @Override - @Nullable - public TextRange getRangeAffectingIndent(PsiFile file, int offset, ASTNode elementAtOffset) { - return null; - } - /** * Standard {@link PsiBasedFormattingModel} extension that handles the fact that groovy uses not single white space token type * ({@link TokenType#WHITE_SPACE}) but one additional token type as well: {@link GroovyTokenTypes#mNLS}. So, it allows to adjust 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 d6fa4e658007..76da15cae7e3 100644 --- a/plugins/properties/src/com/intellij/lang/properties/formatting/PropertiesFormattingModelBuilder.java +++ b/plugins/properties/src/com/intellij/lang/properties/formatting/PropertiesFormattingModelBuilder.java @@ -41,9 +41,4 @@ public class PropertiesFormattingModelBuilder implements FormattingModelBuilder return new PsiBasedFormattingModel(element.getContainingFile(), new PropertiesRootBlock(root, settings), documentModel); } - @Nullable - @Override - public TextRange getRangeAffectingIndent(PsiFile file, int offset, ASTNode elementAtOffset) { - return null; - } } diff --git a/python/src/com/jetbrains/python/formatter/PythonFormattingModelBuilder.java b/python/src/com/jetbrains/python/formatter/PythonFormattingModelBuilder.java index 14851b412397..ea19712f0e9b 100644 --- a/python/src/com/jetbrains/python/formatter/PythonFormattingModelBuilder.java +++ b/python/src/com/jetbrains/python/formatter/PythonFormattingModelBuilder.java @@ -167,11 +167,6 @@ public class PythonFormattingModelBuilder implements FormattingModelBuilderEx, C return TokenSet.create(IElementType.enumerate(type -> type != LAMBDA_KEYWORD && type.getLanguage().isKindOf(pythonLanguage))); } - @Override - public TextRange getRangeAffectingIndent(PsiFile file, int offset, ASTNode elementAtOffset) { - return null; - } - private static void printAST(ASTNode node, int indent) { while (node != null) { for (int i = 0; i < indent; i++) { diff --git a/xml/impl/src/com/intellij/lang/html/HtmlFormattingModelBuilder.java b/xml/impl/src/com/intellij/lang/html/HtmlFormattingModelBuilder.java index 16259e895005..c4bc7f12675c 100644 --- a/xml/impl/src/com/intellij/lang/html/HtmlFormattingModelBuilder.java +++ b/xml/impl/src/com/intellij/lang/html/HtmlFormattingModelBuilder.java @@ -45,8 +45,4 @@ public class HtmlFormattingModelBuilder implements FormattingModelBuilder { documentModel); } - @Override - public TextRange getRangeAffectingIndent(PsiFile file, int offset, ASTNode elementAtOffset) { - return null; - } } \ No newline at end of file diff --git a/xml/impl/src/com/intellij/lang/xhtml/XhtmlFormattingModelBuilder.java b/xml/impl/src/com/intellij/lang/xhtml/XhtmlFormattingModelBuilder.java index b1001fc0c4a7..5f985639f08f 100644 --- a/xml/impl/src/com/intellij/lang/xhtml/XhtmlFormattingModelBuilder.java +++ b/xml/impl/src/com/intellij/lang/xhtml/XhtmlFormattingModelBuilder.java @@ -46,8 +46,4 @@ public class XhtmlFormattingModelBuilder implements FormattingModelBuilder { documentModel); } - @Override - public TextRange getRangeAffectingIndent(PsiFile file, int offset, ASTNode elementAtOffset) { - return null; - } } \ No newline at end of file diff --git a/xml/impl/src/com/intellij/lang/xml/XmlFormattingModelBuilder.java b/xml/impl/src/com/intellij/lang/xml/XmlFormattingModelBuilder.java index 138a1bd7654d..e673667687eb 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlFormattingModelBuilder.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlFormattingModelBuilder.java @@ -48,8 +48,5 @@ public class XmlFormattingModelBuilder implements FormattingModelBuilder { return new XmlBlock(root, null, null, new XmlPolicy(settings, documentModel), null, null, false); } - @Override - public TextRange getRangeAffectingIndent(PsiFile file, int offset, ASTNode elementAtOffset) { - return null; - } + } diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/formatting/RncFormattingModelBuilder.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/formatting/RncFormattingModelBuilder.java index e7e4fa898b3f..a600fb89b092 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/formatting/RncFormattingModelBuilder.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/formatting/RncFormattingModelBuilder.java @@ -33,9 +33,4 @@ public class RncFormattingModelBuilder implements FormattingModelBuilder { return FormattingModelProvider.createFormattingModelForPsiFile(element.getContainingFile(), new RncBlock(element.getNode()), settings); } - @Override - public TextRange getRangeAffectingIndent(PsiFile file, int offset, ASTNode elementAtOffset) { - // TODO - return null; - } } \ No newline at end of file