diff --git a/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java b/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java index 62e665cfad1..fb480c9de79 100644 --- a/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java +++ b/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java @@ -24,7 +24,9 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; public class JetFileType extends LanguageFileType { + public static final String EXTENSION = "kt"; public static final JetFileType INSTANCE = new JetFileType(); + private final NotNullLazyValue myIcon = new NotNullLazyValue() { @NotNull @Override @@ -52,7 +54,7 @@ public class JetFileType extends LanguageFileType { @Override @NotNull public String getDefaultExtension() { - return "kt"; + return EXTENSION; } @Override diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryDetectionUtil.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryDetectionUtil.java index de263f49cf0..37b20548b31 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryDetectionUtil.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryDetectionUtil.java @@ -36,7 +36,7 @@ public class JsHeaderLibraryDetectionUtil { @Override protected boolean accept(VirtualFile file) { String extension = file.getExtension(); - return extension != null && extension.equals(JetFileType.INSTANCE.getDefaultExtension()); + return extension != null && extension.equals(JetFileType.EXTENSION); } }; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinFunctionSignatureComponent.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinFunctionSignatureComponent.kt index 6bdbf3f2ff2..b5b5825064a 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinFunctionSignatureComponent.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinFunctionSignatureComponent.kt @@ -23,7 +23,7 @@ import com.intellij.refactoring.ui.MethodSignatureComponent public class KotlinFunctionSignatureComponent( signature: String, project: Project ) : MethodSignatureComponent(signature, project, JetFileType.INSTANCE) { - private val myFileName = "dummy." + JetFileType.INSTANCE.getDefaultExtension() + private val myFileName = "dummy." + JetFileType.EXTENSION override fun getFileName(): String = myFileName } \ No newline at end of file diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt index 6fa7c1837da..278adb62ae5 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt @@ -168,7 +168,7 @@ fun createMoveUsageInfo( public fun JetNamedDeclaration.getFileNameAfterMove(): String? { return (getContainingFile() as? JetFile)?.let { file -> - if (file.getDeclarations().size > 1) "${getName()}.${JetFileType.INSTANCE.getDefaultExtension()}" else file.getName() + if (file.getDeclarations().size > 1) "${getName()}.${JetFileType.EXTENSION}" else file.getName() } }