diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpParserDefinition.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpParserDefinition.java index 0fbec6331539..8ffedfb3d2a1 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpParserDefinition.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpParserDefinition.java @@ -145,7 +145,7 @@ public class RegExpParserDefinition implements ParserDefinition { } @Override - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { return SpaceRequirements.MUST_NOT; } } diff --git a/java/java-impl/src/com/intellij/spi/parsing/SPIParserDefinition.java b/java/java-impl/src/com/intellij/spi/parsing/SPIParserDefinition.java index 068f2d1f1461..d1cc257d6683 100644 --- a/java/java-impl/src/com/intellij/spi/parsing/SPIParserDefinition.java +++ b/java/java-impl/src/com/intellij/spi/parsing/SPIParserDefinition.java @@ -19,6 +19,7 @@ import com.intellij.lang.ASTNode; import com.intellij.lang.ParserDefinition; import com.intellij.lang.PsiBuilder; import com.intellij.lang.PsiParser; +import com.intellij.lang.spi.SPILanguage; import com.intellij.lexer.Lexer; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; @@ -29,9 +30,8 @@ import com.intellij.psi.tree.TokenSet; import com.intellij.psi.util.PsiUtilCore; import com.intellij.spi.psi.SPIClassProviderReferenceElement; import com.intellij.spi.psi.SPIClassProvidersElementList; -import com.intellij.spi.psi.SPIPackageOrClassReferenceElement; import com.intellij.spi.psi.SPIFile; -import com.intellij.lang.spi.SPILanguage; +import com.intellij.spi.psi.SPIPackageOrClassReferenceElement; import org.jetbrains.annotations.NotNull; public class SPIParserDefinition implements ParserDefinition { @@ -109,7 +109,7 @@ public class SPIParserDefinition implements ParserDefinition { } @Override - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { return SpaceRequirements.MAY; } diff --git a/java/java-psi-impl/src/com/intellij/lang/java/JavaParserDefinition.java b/java/java-psi-impl/src/com/intellij/lang/java/JavaParserDefinition.java index 45b5947eb7f5..df16b294106a 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/JavaParserDefinition.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/JavaParserDefinition.java @@ -91,7 +91,7 @@ public class JavaParserDefinition implements ParserDefinition { @Override @SuppressWarnings("SpellCheckingInspection") - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { if (right.getElementType() == JavaDocTokenType.DOC_TAG_VALUE_SHARP_TOKEN || left.getElementType() == JavaDocTokenType.DOC_TAG_VALUE_SHARP_TOKEN) { return SpaceRequirements.MUST_NOT; diff --git a/java/manifest/src/org/jetbrains/lang/manifest/parser/ManifestParserDefinition.java b/java/manifest/src/org/jetbrains/lang/manifest/parser/ManifestParserDefinition.java index dfe1d978c6a8..76d369df5bd4 100644 --- a/java/manifest/src/org/jetbrains/lang/manifest/parser/ManifestParserDefinition.java +++ b/java/manifest/src/org/jetbrains/lang/manifest/parser/ManifestParserDefinition.java @@ -97,7 +97,7 @@ public class ManifestParserDefinition implements ParserDefinition { @SuppressWarnings("SpellCheckingInspection") @Override - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { return left.getPsi() instanceof Header || right.getPsi() instanceof Header ? SpaceRequirements.MUST_LINE_BREAK : SpaceRequirements.MUST_NOT; } diff --git a/json/src/com/intellij/json/JsonParserDefinition.java b/json/src/com/intellij/json/JsonParserDefinition.java index c7f123c25a66..385dff171ddb 100644 --- a/json/src/com/intellij/json/JsonParserDefinition.java +++ b/json/src/com/intellij/json/JsonParserDefinition.java @@ -78,7 +78,7 @@ public class JsonParserDefinition implements ParserDefinition { } @Override - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode astNode, ASTNode astNode2) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode astNode, ASTNode astNode2) { return SpaceRequirements.MAY; } } diff --git a/platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextParserDefinition.java b/platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextParserDefinition.java index 1db3132b6173..a9d2e80959e6 100644 --- a/platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextParserDefinition.java +++ b/platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextParserDefinition.java @@ -92,7 +92,7 @@ public class PlainTextParserDefinition implements ParserDefinition { } @Override - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { return SpaceRequirements.MAY; } } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/parser/GroovyParserDefinition.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/parser/GroovyParserDefinition.java index e3828c99f80b..5f541189d20a 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/parser/GroovyParserDefinition.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/parser/GroovyParserDefinition.java @@ -96,7 +96,7 @@ public class GroovyParserDefinition implements ParserDefinition { } @Override - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { final IElementType lType = left.getElementType(); final IElementType rType = right.getElementType(); diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/parsing/PropertiesParserDefinition.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/parsing/PropertiesParserDefinition.java index dceab81adb39..73d312c4d84d 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/parsing/PropertiesParserDefinition.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/parsing/PropertiesParserDefinition.java @@ -68,7 +68,7 @@ public class PropertiesParserDefinition implements ParserDefinition { return new PropertiesFileImpl(viewProvider); } - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { return SpaceRequirements.MAY; } diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/JqlParserDefinition.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/JqlParserDefinition.java index 5c535cc0d9f9..75fe7693e83d 100644 --- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/JqlParserDefinition.java +++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/JqlParserDefinition.java @@ -65,7 +65,7 @@ public class JqlParserDefinition implements ParserDefinition { } @Override - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { return SpaceRequirements.MAY; } } diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/lang/YouTrackParserDefinition.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/lang/YouTrackParserDefinition.java index b50811fe4da9..b0db0797cb04 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/lang/YouTrackParserDefinition.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/lang/YouTrackParserDefinition.java @@ -75,7 +75,7 @@ public class YouTrackParserDefinition implements ParserDefinition { } @Override - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { return SpaceRequirements.MAY; } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/XPathParserDefinition.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/XPathParserDefinition.java index dd923a16fc6b..0d34f45a384b 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/XPathParserDefinition.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/XPathParserDefinition.java @@ -26,9 +26,8 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IFileElementType; import com.intellij.psi.tree.TokenSet; -import org.jetbrains.annotations.NotNull; - import org.intellij.lang.xpath.psi.impl.*; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @SuppressWarnings({"NullableProblems"}) @@ -62,7 +61,7 @@ public class XPathParserDefinition implements ParserDefinition { return new XPathParser(); } - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { return SpaceRequirements.MUST_NOT; } diff --git a/plugins/yaml/src/org/jetbrains/yaml/YAMLParserDefinition.java b/plugins/yaml/src/org/jetbrains/yaml/YAMLParserDefinition.java index fb87a244838c..7b3c12266415 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/YAMLParserDefinition.java +++ b/plugins/yaml/src/org/jetbrains/yaml/YAMLParserDefinition.java @@ -104,7 +104,7 @@ public class YAMLParserDefinition implements ParserDefinition, YAMLElementTypes return new YAMLFileImpl(viewProvider); } - public SpaceRequirements spaceExistanceTypeBetweenTokens(final ASTNode left, final ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(final ASTNode left, final ASTNode right) { return SpaceRequirements.MAY; } } diff --git a/python/rest/src/com/jetbrains/rest/parsing/RestParserDefinition.java b/python/rest/src/com/jetbrains/rest/parsing/RestParserDefinition.java index ce489de35906..072bdac76578 100644 --- a/python/rest/src/com/jetbrains/rest/parsing/RestParserDefinition.java +++ b/python/rest/src/com/jetbrains/rest/parsing/RestParserDefinition.java @@ -86,7 +86,7 @@ public class RestParserDefinition implements ParserDefinition, RestTokenTypes { } @Override - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { return SpaceRequirements.MAY; } } diff --git a/python/src/com/jetbrains/commandInterface/commandLine/CommandLineParserDefinition.java b/python/src/com/jetbrains/commandInterface/commandLine/CommandLineParserDefinition.java index 623f6fbda210..f09db51d71ca 100644 --- a/python/src/com/jetbrains/commandInterface/commandLine/CommandLineParserDefinition.java +++ b/python/src/com/jetbrains/commandInterface/commandLine/CommandLineParserDefinition.java @@ -86,7 +86,7 @@ public final class CommandLineParserDefinition implements ParserDefinition { } @Override - public SpaceRequirements spaceExistanceTypeBetweenTokens(final ASTNode left, final ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(final ASTNode left, final ASTNode right) { return SpaceRequirements.MAY; } } diff --git a/python/src/com/jetbrains/python/PythonParserDefinition.java b/python/src/com/jetbrains/python/PythonParserDefinition.java index a34e66559a5c..1462782f9604 100644 --- a/python/src/com/jetbrains/python/PythonParserDefinition.java +++ b/python/src/com/jetbrains/python/PythonParserDefinition.java @@ -96,7 +96,7 @@ public class PythonParserDefinition implements ParserDefinition { return new PyFileImpl(viewProvider); } - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { // see LanguageTokenSeparatorGenerator instead return SpaceRequirements.MAY; } diff --git a/python/src/com/jetbrains/python/buildout/config/BuildoutCfgParserDefinition.java b/python/src/com/jetbrains/python/buildout/config/BuildoutCfgParserDefinition.java index 21d9552af2b8..1a80fdf4b32c 100644 --- a/python/src/com/jetbrains/python/buildout/config/BuildoutCfgParserDefinition.java +++ b/python/src/com/jetbrains/python/buildout/config/BuildoutCfgParserDefinition.java @@ -75,7 +75,7 @@ public class BuildoutCfgParserDefinition implements ParserDefinition, BuildoutCf return new BuildoutCfgFile(viewProvider); } - public SpaceRequirements spaceExistanceTypeBetweenTokens(final ASTNode left, final ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(final ASTNode left, final ASTNode right) { return SpaceRequirements.MAY; } } diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncParserDefinition.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncParserDefinition.java index 6ca4d3cac257..a50406c2fec7 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncParserDefinition.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncParserDefinition.java @@ -93,7 +93,7 @@ public class RncParserDefinition implements ParserDefinition { } @Override - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { return SpaceRequirements.MAY; } diff --git a/xml/xml-psi-impl/src/com/intellij/lang/dtd/DTDParserDefinition.java b/xml/xml-psi-impl/src/com/intellij/lang/dtd/DTDParserDefinition.java index 8197314a18c6..0739445d19ab 100644 --- a/xml/xml-psi-impl/src/com/intellij/lang/dtd/DTDParserDefinition.java +++ b/xml/xml-psi-impl/src/com/intellij/lang/dtd/DTDParserDefinition.java @@ -38,7 +38,7 @@ import org.jetbrains.annotations.NotNull; */ public class DTDParserDefinition extends XMLParserDefinition { @Override - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { return LanguageUtil.canStickTokensTogetherByLexer(left, right, new DtdLexer(false)); } diff --git a/xml/xml-psi-impl/src/com/intellij/lang/html/HTMLParserDefinition.java b/xml/xml-psi-impl/src/com/intellij/lang/html/HTMLParserDefinition.java index 8690f87fa414..6ca49ddb26c9 100644 --- a/xml/xml-psi-impl/src/com/intellij/lang/html/HTMLParserDefinition.java +++ b/xml/xml-psi-impl/src/com/intellij/lang/html/HTMLParserDefinition.java @@ -88,7 +88,7 @@ public class HTMLParserDefinition implements ParserDefinition { } @Override - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { final Lexer lexer = createLexer(left.getPsi().getProject()); return XMLParserDefinition.canStickTokensTogetherByLexerInXml(left, right, lexer, 0); } diff --git a/xml/xml-psi-impl/src/com/intellij/lang/xhtml/XHTMLParserDefinition.java b/xml/xml-psi-impl/src/com/intellij/lang/xhtml/XHTMLParserDefinition.java index 098d58bc12c7..1377b58c1dd7 100644 --- a/xml/xml-psi-impl/src/com/intellij/lang/xhtml/XHTMLParserDefinition.java +++ b/xml/xml-psi-impl/src/com/intellij/lang/xhtml/XHTMLParserDefinition.java @@ -38,7 +38,7 @@ public class XHTMLParserDefinition extends XMLParserDefinition { } @Override - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { final Lexer lexer = createLexer(left.getPsi().getProject()); return canStickTokensTogetherByLexerInXml(left, right, lexer, 0); } diff --git a/xml/xml-psi-impl/src/com/intellij/lang/xml/XMLParserDefinition.java b/xml/xml-psi-impl/src/com/intellij/lang/xml/XMLParserDefinition.java index ee9447da8ccc..4f12ece058c9 100644 --- a/xml/xml-psi-impl/src/com/intellij/lang/xml/XMLParserDefinition.java +++ b/xml/xml-psi-impl/src/com/intellij/lang/xml/XMLParserDefinition.java @@ -84,7 +84,7 @@ public class XMLParserDefinition implements ParserDefinition { } @Override - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { final Lexer lexer = createLexer(left.getPsi().getProject()); return canStickTokensTogetherByLexerInXml(left, right, lexer, 0); }