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

Introduce constant for "kt".

Browse Source
This commit is contained in:
Zalim Bashorov
2014-10-27 14:14:30 +03:00
parent ab5d34c373
commit aecd2be25e
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java
+3 -1
View File
@@ -24,7 +24,9 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*; import javax.swing.*;
public class JetFileType extends LanguageFileType { public class JetFileType extends LanguageFileType {
public static final String EXTENSION = "kt";
public static final JetFileType INSTANCE = new JetFileType(); public static final JetFileType INSTANCE = new JetFileType();
private final NotNullLazyValue<Icon> myIcon = new NotNullLazyValue<Icon>() { private final NotNullLazyValue<Icon> myIcon = new NotNullLazyValue<Icon>() {
@NotNull @NotNull
@Override @Override
@@ -52,7 +54,7 @@ public class JetFileType extends LanguageFileType {
@Override @Override
@NotNull @NotNull
public String getDefaultExtension() { public String getDefaultExtension() {
return "kt"; return EXTENSION;
} }
@Override @Override
idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryDetectionUtil.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class JsHeaderLibraryDetectionUtil {
@Override @Override
protected boolean accept(VirtualFile file) { protected boolean accept(VirtualFile file) {
String extension = file.getExtension(); String extension = file.getExtension();
return extension != null && extension.equals(JetFileType.INSTANCE.getDefaultExtension()); return extension != null && extension.equals(JetFileType.EXTENSION);
} }
}; };
idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinFunctionSignatureComponent.kt
+1 -1
View File
@@ -23,7 +23,7 @@ import com.intellij.refactoring.ui.MethodSignatureComponent
public class KotlinFunctionSignatureComponent( public class KotlinFunctionSignatureComponent(
signature: String, project: Project signature: String, project: Project
) : MethodSignatureComponent(signature, project, JetFileType.INSTANCE) { ) : MethodSignatureComponent(signature, project, JetFileType.INSTANCE) {
private val myFileName = "dummy." + JetFileType.INSTANCE.getDefaultExtension() private val myFileName = "dummy." + JetFileType.EXTENSION
override fun getFileName(): String = myFileName override fun getFileName(): String = myFileName
} }
idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt
+1 -1
View File
@@ -168,7 +168,7 @@ fun createMoveUsageInfo(
public fun JetNamedDeclaration.getFileNameAfterMove(): String? { public fun JetNamedDeclaration.getFileNameAfterMove(): String? {
return (getContainingFile() as? JetFile)?.let { file -> 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()
} }
} }