IDEA-137224 custom file type keywords trigger Spelling/Typo inspection

java/java-tests/java-tests.iml

@@ -34,5 +34,6 @@
     <orderEntry type="module" module-name="properties-psi-api" scope="TEST" />
     <orderEntry type="module" module-name="java-decompiler-plugin" scope="TEST" />
     <orderEntry type="module" module-name="RegExpSupport" scope="TEST" />
+    <orderEntry type="module" module-name="spellchecker" scope="TEST" />
   </component>
 </module>

java/java-tests/testSrc/com/intellij/codeInsight/completion/CustomFileTypeInspectionTest.groovy

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2000-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight.completion
+
+import com.intellij.spellchecker.inspections.SpellCheckingInspection
+import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
+
+/**
+ * @author peter
+ */
+public class CustomFileTypeInspectionTest extends LightCodeInsightFixtureTestCase {
+
+  public void testSpellChecking() {
+    myFixture.configureByText 'a.hs', '''
+
+infixl -- keyword
+<TYPO descr="Typo: In word 'sdaf'">sdaf</TYPO> -- identifier
+"<TYPO descr="Typo: In word 'infixl'">infixl</TYPO> in string"
+-- <TYPO descr="Typo: In word 'infixl'">infixl</TYPO> in line comment
+{- <TYPO descr="Typo: In word 'infixl'">infixl</TYPO> in block comment -}
+'''
+    myFixture.enableInspections(new SpellCheckingInspection())
+    myFixture.checkHighlighting()
+  }
+  
+}

spellchecker/src/com/intellij/spellchecker/tokenizer/CustomFileTypeTokenizer.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2000-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.spellchecker.tokenizer;
+
+import com.intellij.ide.highlighter.custom.CustomFileTypeLexer;
+import com.intellij.ide.highlighter.custom.SyntaxTable;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.CustomHighlighterTokenType;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.tree.IElementType;
+import com.intellij.spellchecker.inspections.PlainTextSplitter;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author peter
+ */
+class CustomFileTypeTokenizer extends Tokenizer<PsiElement> {
+  private final SyntaxTable mySyntaxTable;
+
+  public CustomFileTypeTokenizer(@NotNull SyntaxTable syntaxTable) {
+    mySyntaxTable = syntaxTable;
+  }
+
+  @Override
+  public void tokenize(@NotNull PsiElement element, TokenConsumer consumer) {
+    CustomFileTypeLexer lexer = new CustomFileTypeLexer(mySyntaxTable);
+    String text = element.getText();
+    lexer.start(text);
+    while (true) {
+      IElementType tokenType = lexer.getTokenType();
+      if (tokenType == null) {
+        break;
+      }
+
+      if (!isKeyword(tokenType)) {
+        consumer.consumeToken(element, text, false, 0, new TextRange(lexer.getTokenStart(), lexer.getTokenEnd()), PlainTextSplitter.getInstance());
+      }
+      lexer.advance();
+    }
+  }
+
+  private static boolean isKeyword(IElementType tokenType) {
+    return tokenType == CustomHighlighterTokenType.KEYWORD_1 ||
+          tokenType == CustomHighlighterTokenType.KEYWORD_2 ||
+          tokenType == CustomHighlighterTokenType.KEYWORD_3 ||
+          tokenType == CustomHighlighterTokenType.KEYWORD_4;
+  }
+}

spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java

@@ -17,6 +17,8 @@ package com.intellij.spellchecker.tokenizer;
 
 import com.intellij.codeInspection.SuppressionUtil;
 import com.intellij.openapi.extensions.ExtensionPointName;
+import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.openapi.fileTypes.impl.CustomSyntaxTableFileType;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
@@ -61,7 +63,14 @@ public class SpellcheckingStrategy {
     }
     if (element instanceof XmlAttributeValue) return myXmlAttributeTokenizer;
     if (element instanceof XmlText) return myXmlTextTokenizer;
-    if (element instanceof PsiPlainText) return TEXT_TOKENIZER;
+    if (element instanceof PsiPlainText) {
+      PsiFile file = element.getContainingFile();
+      FileType fileType = file == null ? null : file.getFileType();
+      if (fileType instanceof CustomSyntaxTableFileType) {
+        return new CustomFileTypeTokenizer(((CustomSyntaxTableFileType)fileType).getSyntaxTable());
+      }
+      return TEXT_TOKENIZER;
+    }
     return EMPTY_TOKENIZER;
   }