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

Extract PSI to separate module

Browse Source
This commit is contained in:
Simon Ogorodnik
2018-03-13 18:07:10 +03:00
parent 55c93bc8b6
commit c0b0f6d1ca
332 changed files with 344 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt
+9 -3
View File
@@ -246,7 +246,10 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
return
}
val message = "Missing " + diagnostic.description + DiagnosticUtils.atLocation(ktFile, TextRange(expectedStart, expectedEnd))
val message = "Missing " + diagnostic.description + PsiDiagnosticUtils.atLocation(
ktFile,
TextRange(expectedStart, expectedEnd)
)
System.err.println(message)
ok[0] = false
}
@@ -258,7 +261,7 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
end: Int
) {
val message = "Parameters of diagnostic not equal at position " +
DiagnosticUtils.atLocation(ktFile, TextRange(start, end)) +
PsiDiagnosticUtils.atLocation(ktFile, TextRange(start, end)) +
". Expected: ${expectedDiagnostic.asString()}, actual: $actualDiagnostic"
System.err.println(message)
ok[0] = false
@@ -270,7 +273,10 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
return
}
val message = "Unexpected ${diagnostic.description}${DiagnosticUtils.atLocation(ktFile, TextRange(actualStart, actualEnd))}"
val message = "Unexpected ${diagnostic.description}${PsiDiagnosticUtils.atLocation(
ktFile,
TextRange(actualStart, actualEnd)
)}"
System.err.println(message)
ok[0] = false
}
compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExpectedResolveData.java
+4 -4
View File
@@ -27,8 +27,8 @@ import org.jetbrains.kotlin.builtins.DefaultBuiltIns;
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.diagnostics.DiagnosticUtils;
import org.jetbrains.kotlin.diagnostics.Errors;
import org.jetbrains.kotlin.diagnostics.PsiDiagnosticUtils;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.*;
@@ -66,7 +66,7 @@ public abstract class ExpectedResolveData {
@Override
public String toString() {
return DiagnosticUtils.atLocation(element);
return PsiDiagnosticUtils.atLocation(element);
}
}
@@ -370,8 +370,8 @@ public abstract class ExpectedResolveData {
return referenceExpression.getText() + " at " + DiagnosticUtils.atLocation(referenceExpression) +
" in " + statement.getText() + (declaration == null ? "" : " in " + declaration.getText());
return referenceExpression.getText() + " at " + PsiDiagnosticUtils.atLocation(referenceExpression) +
" in " + statement.getText() + (declaration == null ? "" : " in " + declaration.getText());
}
private static <T> T getAncestorOfType(Class<T> type, PsiElement element) {