summaryrefslogtreecommitdiff
path: root/spellchecker/src/com/intellij/spellchecker
diff options
context:
space:
mode:
Diffstat (limited to 'spellchecker/src/com/intellij/spellchecker')
-rw-r--r--spellchecker/src/com/intellij/spellchecker/jetbrains.dic3
-rw-r--r--spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java3
2 files changed, 6 insertions, 0 deletions
diff --git a/spellchecker/src/com/intellij/spellchecker/jetbrains.dic b/spellchecker/src/com/intellij/spellchecker/jetbrains.dic
index 45610cdbdf1c..7e6817c5984c 100644
--- a/spellchecker/src/com/intellij/spellchecker/jetbrains.dic
+++ b/spellchecker/src/com/intellij/spellchecker/jetbrains.dic
@@ -302,6 +302,7 @@ namespaces
nchar
nclob
ndbcluster
+nmtoken
noarchivelog
noaudit
nocache
@@ -538,6 +539,8 @@ taglib
teamcity
temptable
throwable
+thymeleaf
+thymes
timestamp
tinyblob
tinyint
diff --git a/spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java b/spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java
index 6d28563e062c..17044a102559 100644
--- a/spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java
+++ b/spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java
@@ -49,6 +49,9 @@ public class SpellcheckingStrategy {
@NotNull
public Tokenizer getTokenizer(PsiElement element) {
+ if (element instanceof PsiLanguageInjectionHost && InjectedLanguageUtil.hasInjections((PsiLanguageInjectionHost)element)) {
+ return EMPTY_TOKENIZER;
+ }
if (element instanceof PsiNameIdentifierOwner) return new PsiIdentifierOwnerTokenizer();
if (element instanceof PsiComment) {
if (SuppressionUtil.isSuppressionComment(element)) {