From bf05e8dd79a9e22b7373b09aaed7a1b01057d065 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Thu, 14 Jun 2012 16:05:19 +0400 Subject: [PATCH] no error for elements with ide templates --- .../lang/diagnostics/AbstractDiagnostic.java | 2 ++ .../diagnostics/tests/IdeTemplates.jet | 24 +++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/AbstractDiagnostic.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/AbstractDiagnostic.java index 52898fde7a5..36f4cc604a7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/AbstractDiagnostic.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/AbstractDiagnostic.java @@ -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 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; } diff --git a/compiler/testData/diagnostics/tests/IdeTemplates.jet b/compiler/testData/diagnostics/tests/IdeTemplates.jet index 09e92932894..c70c6c06def 100644 --- a/compiler/testData/diagnostics/tests/IdeTemplates.jet +++ b/compiler/testData/diagnostics/tests/IdeTemplates.jet @@ -18,24 +18,24 @@ fun main(args : Array) { else -> <##> } - var <##> = <##> + var <##> = <##> - class <##> { + class <##> { <##> - } + } - class <##> { - var <##> : <##> - get() { + class <##> { + var <##> : <##> + get() { <##> - } + } set(value) { <##> - } + } - val <##> : <##> - get() { + val <##> : <##> + get() { <##> - } - } + } + } } \ No newline at end of file