summaryrefslogtreecommitdiff
path: root/spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2014-09-04 20:44:00 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-09-04 20:44:01 +0000
commitfb5a02906f644d044eb0286bf27d413ba0e05216 (patch)
treebca7d49005d81d10c70bc3f547df041c636b4300 /spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java
parent9cde0e3c015174898df8b8f3672185941fad4786 (diff)
parentd245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff)
downloadidea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java')
-rw-r--r--spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java3
1 files changed, 3 insertions, 0 deletions
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)) {