Removed IDE templates support from compiler.

This commit is contained in:
Evgeny Gerashchenko
2013-09-17 17:56:49 +04:00
parent 31a712b424
commit dcfeea4029
19 changed files with 442 additions and 993 deletions
@@ -152,11 +152,6 @@ public class CliTest {
executeCompilerCompareOutput(new String[]{ "-script", "compiler/testData/cli/script.ktscript", "hi", "there" });
}
@Test
public void ideTemplates() {
executeCompilerCompareOutput(new String[]{ "-src", "compiler/testData/cli/ideTemplates.kt", "-output", tmpdir.getTmpDir().getPath()});
}
@Test
public void wrongArgument() {
executeCompilerCompareOutput(new String[] { "-wrongArgument" });
@@ -31,7 +31,6 @@ import org.jetbrains.jet.JetTestCaseBuilder;
import org.jetbrains.jet.lang.parsing.JetParserDefinition;
import org.jetbrains.jet.lang.psi.IfNotParsed;
import org.jetbrains.jet.lang.psi.JetElement;
import org.jetbrains.jet.lang.psi.JetIdeTemplate;
import org.jetbrains.jet.lang.psi.JetVisitorVoid;
import java.io.File;
@@ -102,11 +101,10 @@ public class JetParsingTest extends ParsingTestCase {
if (result == null) {
for (Annotation annotation : method.getDeclaredAnnotations()) {
if (annotation instanceof IfNotParsed) {
assertTrue(
assertNotNull(
"Incomplete operation in parsed OK test, method " + methodName +
" in " + declaringClass.getSimpleName() + " returns null. Element text: \n" + elem.getText(),
PsiTreeUtil.findChildOfType(elem, PsiErrorElement.class) == null
|| PsiTreeUtil.findChildOfType(elem, JetIdeTemplate.class) == null);
PsiTreeUtil.findChildOfType(elem, PsiErrorElement.class));
}
}
}