azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no error for elements with ide templates

Browse Source
This commit is contained in:
Svetlana Isakova
2012-06-14 16:05:19 +04:00
parent 8b1c76992f
commit bf05e8dd79
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/AbstractDiagnostic.java
+2
View File
@@ -21,6 +21,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiErrorElement; import com.intellij.psi.PsiErrorElement;
import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetNodeTypes;
import java.util.List; import java.util.List;
@@ -74,6 +75,7 @@ public abstract class AbstractDiagnostic<E extends PsiElement> implements Parame
public boolean isValid() { public boolean isValid() {
if (!getFactory().isValid(this)) return false; if (!getFactory().isValid(this)) return false;
if (hasSyntaxErrors(psiElement)) return false; if (hasSyntaxErrors(psiElement)) return false;
if (psiElement.getNode().findChildByType(JetNodeTypes.IDE_TEMPLATE_EXPRESSION) != null) return false;
return true; return true;
} }
compiler/testData/diagnostics/tests/IdeTemplates.jet
+12 -12
View File
@@ -18,24 +18,24 @@ fun main(args : Array<String>) {
else -> <!UNRESOLVED_IDE_TEMPLATE!><#<elseValue>#><!> 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>#> <#<body>#>
}<!> }
<!REDECLARATION!>class <#<name>#> { class <#<name>#> {
<!REDECLARATION!>var <#<name>#> : <#<varType>#> var <#<name>#> : <#<varType>#>
get() <!RETURN_TYPE_MISMATCH!>{ get() {
<!UNRESOLVED_IDE_TEMPLATE!><#<body>#><!> <!UNRESOLVED_IDE_TEMPLATE!><#<body>#><!>
}<!> }
set(value) { set(value) {
<!UNRESOLVED_IDE_TEMPLATE!><#<body>#><!> <!UNRESOLVED_IDE_TEMPLATE!><#<body>#><!>
}<!> }
<!REDECLARATION!>val <#<name>#> : <#<valType>#> val <#<name>#> : <#<valType>#>
get() <!RETURN_TYPE_MISMATCH!>{ get() {
<!UNRESOLVED_IDE_TEMPLATE!><#<body>#><!> <!UNRESOLVED_IDE_TEMPLATE!><#<body>#><!>
}<!><!> }
}<!> }
} }