no error for elements with ide templates

2012-06-14 16:05:19 +04:00
parent 8b1c76992f
commit bf05e8dd79
2 changed files with 14 additions and 12 deletions
@@ -21,6 +21,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiErrorElement;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.JetNodeTypes;

 import java.util.List;

@@ -74,6 +75,7 @@ public abstract class AbstractDiagnostic<E extends PsiElement> implements Parame
    public boolean isValid() {
        if (!getFactory().isValid(this)) return false;
        if (hasSyntaxErrors(psiElement)) return false;
+        if (psiElement.getNode().findChildByType(JetNodeTypes.IDE_TEMPLATE_EXPRESSION) != null) return false;
        return true;
    }

@@ -18,24 +18,24 @@ fun main(args : Array<String>) {
        else -> <!UNRESOLVED_IDE_TEMPLATE!><#<elseValue>#><!>
    }

-    <!REDECLARATION!>var <#<name>#> = <!UNRESOLVED_IDE_TEMPLATE!><#<value>#><!><!>
+    var <#<name>#> = <!UNRESOLVED_IDE_TEMPLATE!><#<value>#><!>

-    <!REDECLARATION, REDECLARATION!>class <#<name>#> {
+    class <#<name>#> {
        <#<body>#>
-    }<!>
+    }

-    <!REDECLARATION!>class <#<name>#> {
-        <!REDECLARATION!>var <#<name>#> : <#<varType>#>
-        get() <!RETURN_TYPE_MISMATCH!>{
+    class <#<name>#> {
+        var <#<name>#> : <#<varType>#>
+        get() {
            <!UNRESOLVED_IDE_TEMPLATE!><#<body>#><!>
-        }<!>
+        }
        set(value) {
            <!UNRESOLVED_IDE_TEMPLATE!><#<body>#><!>
-        }<!>
+        }

-        <!REDECLARATION!>val <#<name>#> : <#<valType>#>
-        get() <!RETURN_TYPE_MISMATCH!>{
+        val <#<name>#> : <#<valType>#>
+        get() {
            <!UNRESOLVED_IDE_TEMPLATE!><#<body>#><!>
-        }<!><!>
-    }<!>
+        }
+    }
 }