Got rid of "jet" file extension.
This commit is contained in:
+1
-1
@@ -155,7 +155,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
|
||||
}
|
||||
|
||||
private static ClassFileFactory getFactoryFromText(String filePath, String text, JetCoreEnvironment jetEnvironment) {
|
||||
JetFile psiFile = JetTestUtils.createFile("dummy.jet", text, jetEnvironment.getProject());
|
||||
JetFile psiFile = JetTestUtils.createFile("dummy.kt", text, jetEnvironment.getProject());
|
||||
ClassFileFactory factory;
|
||||
try {
|
||||
factory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile);
|
||||
|
||||
@@ -86,7 +86,6 @@ public class JetCoreEnvironment {
|
||||
applicationEnvironment.registerFileType(JetFileType.INSTANCE, "kts");
|
||||
applicationEnvironment.registerFileType(JetFileType.INSTANCE, "ktm");
|
||||
applicationEnvironment.registerFileType(JetFileType.INSTANCE, JetParserDefinition.KTSCRIPT_FILE_SUFFIX); // should be renamed to kts
|
||||
applicationEnvironment.registerFileType(JetFileType.INSTANCE, "jet");
|
||||
applicationEnvironment.registerParserDefinition(new JavaParserDefinition());
|
||||
applicationEnvironment.registerParserDefinition(new JetParserDefinition());
|
||||
|
||||
|
||||
@@ -154,7 +154,7 @@ public class JetPsiFactory {
|
||||
|
||||
@NotNull
|
||||
public static JetFile createFile(Project project, String text) {
|
||||
return createFile(project, "dummy.jet", text);
|
||||
return createFile(project, "dummy.kt", text);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
|
||||
@@ -87,7 +87,7 @@ public class LightClassUtil {
|
||||
|
||||
@NotNull
|
||||
public static URL getBuiltInsDirUrl() {
|
||||
String builtInFilePath = "/" + KotlinBuiltIns.BUILT_INS_PACKAGE_NAME_STRING + "/Library.jet";
|
||||
String builtInFilePath = "/" + KotlinBuiltIns.BUILT_INS_PACKAGE_NAME_STRING + "/Library.kt";
|
||||
|
||||
URL url = KotlinBuiltIns.class.getResource(builtInFilePath);
|
||||
|
||||
|
||||
@@ -70,7 +70,7 @@ public abstract class JetLiteFixture extends KotlinTestWithEnvironment {
|
||||
protected JetFile createPsiFile(@Nullable String testName, @Nullable String fileName, String text) {
|
||||
if (fileName == null) {
|
||||
Assert.assertNotNull(testName);
|
||||
fileName = testName + ".jet";
|
||||
fileName = testName + ".kt";
|
||||
}
|
||||
return JetTestUtils.createFile(fileName, text, getProject());
|
||||
}
|
||||
@@ -93,7 +93,7 @@ public abstract class JetLiteFixture extends KotlinTestWithEnvironment {
|
||||
}
|
||||
|
||||
protected void prepareForTest(String name) throws IOException {
|
||||
String text = loadFile(name + ".jet");
|
||||
String text = loadFile(name + ".kt");
|
||||
createAndCheckPsiFile(name, text);
|
||||
}
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName;
|
||||
|
||||
public abstract class JetTestCaseBuilder {
|
||||
|
||||
public static final FilenameFilter KOTLIN_FILTER = filterByExtension("kt", "jet", JetParserDefinition.KTSCRIPT_FILE_SUFFIX);
|
||||
public static final FilenameFilter KOTLIN_FILTER = filterByExtension("kt", JetParserDefinition.KTSCRIPT_FILE_SUFFIX);
|
||||
|
||||
@NotNull
|
||||
public static FilenameFilter filterByExtension(@NotNull final String... extensions) {
|
||||
|
||||
@@ -67,7 +67,7 @@ public class JetControlFlowTest extends JetLiteFixture {
|
||||
|
||||
@Override
|
||||
protected void runTest() throws Throwable {
|
||||
JetFile file = loadPsiFile(myName + ".jet");
|
||||
JetFile file = loadPsiFile(myName + ".kt");
|
||||
|
||||
Map<JetElement, Pseudocode> data = new LinkedHashMap<JetElement, Pseudocode>();
|
||||
AnalyzeExhaust analyzeExhaust = JetTestUtils.analyzeFile(file);
|
||||
|
||||
Reference in New Issue
Block a user