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

change the ID of the language from "jet" to "kotlin"; rename JetLanguage to KotlinLanguage

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-10-05 16:51:42 +02:00
parent 870b640008
commit c5d3673b6b
57 changed files with 171 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java
+3 -3
View File
@@ -53,7 +53,7 @@ import org.jetbrains.kotlin.context.MutableModuleContext;
import org.jetbrains.kotlin.descriptors.ScriptDescriptor;
import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider;
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.parsing.JetParserDefinition;
import org.jetbrains.kotlin.psi.JetFile;
@@ -272,9 +272,9 @@ public class ReplInterpreter {
}
fullText.append(line);
LightVirtualFile virtualFile = new LightVirtualFile("line" + lineNumber + JetParserDefinition.STD_SCRIPT_EXT, JetLanguage.INSTANCE, fullText.toString());
LightVirtualFile virtualFile = new LightVirtualFile("line" + lineNumber + JetParserDefinition.STD_SCRIPT_EXT, KotlinLanguage.INSTANCE, fullText.toString());
virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
JetFile psiFile = (JetFile) psiFileFactory.trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false);
JetFile psiFile = (JetFile) psiFileFactory.trySetupPsiForFile(virtualFile, KotlinLanguage.INSTANCE, true, false);
assert psiFile != null : "Script file not analyzed at line " + lineNumber + ": " + fullText;
DiagnosticMessageHolder errorHolder = createDiagnosticHolder();
compiler/frontend/src/org/jetbrains/kotlin/JetNodeType.java
+2 -2
View File
@@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.psi.JetElement;
import org.jetbrains.kotlin.psi.JetElementImpl;
@@ -34,7 +34,7 @@ public class JetNodeType extends IElementType {
}
public JetNodeType(@NotNull @NonNls String debugName, Class<? extends JetElement> psiClass) {
super(debugName, JetLanguage.INSTANCE);
super(debugName, KotlinLanguage.INSTANCE);
try {
myPsiFactory = psiClass != null ? psiClass.getConstructor(ASTNode.class) : null;
} catch (NoSuchMethodException e) {
compiler/frontend/src/org/jetbrains/kotlin/JetNodeTypes.java
+2 -2
View File
@@ -18,12 +18,12 @@ package org.jetbrains.kotlin;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.IFileElementType;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes;
public interface JetNodeTypes {
IFileElementType JET_FILE = new IFileElementType(JetLanguage.INSTANCE);
IFileElementType JET_FILE = new IFileElementType(KotlinLanguage.INSTANCE);
IElementType CLASS = JetStubElementTypes.CLASS;
IElementType FUN = JetStubElementTypes.FUNCTION;
compiler/frontend/src/org/jetbrains/kotlin/idea/JetFileType.java
+2 -2
View File
@@ -36,13 +36,13 @@ public class JetFileType extends LanguageFileType {
};
private JetFileType() {
super(JetLanguage.INSTANCE);
super(KotlinLanguage.INSTANCE);
}
@Override
@NotNull
public String getName() {
return JetLanguage.NAME;
return KotlinLanguage.NAME;
}
@Override
compiler/frontend/src/org/jetbrains/kotlin/idea/JetLanguage.java → compiler/frontend/src/org/jetbrains/kotlin/idea/KotlinLanguage.java
+4 -4
View File
@@ -19,12 +19,12 @@ package org.jetbrains.kotlin.idea;
import com.intellij.lang.Language;
import org.jetbrains.annotations.NotNull;
public class JetLanguage extends Language {
public static final JetLanguage INSTANCE = new JetLanguage();
public class KotlinLanguage extends Language {
public static final KotlinLanguage INSTANCE = new KotlinLanguage();
public static final String NAME = "Kotlin";
private JetLanguage() {
super("jet");
private KotlinLanguage() {
super("kotlin");
}
@NotNull
compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/KDocTokens.java
+3 -3
View File
@@ -25,13 +25,13 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.ILazyParseableElementType;
import com.intellij.psi.tree.TokenSet;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.kdoc.parser.KDocLinkParser;
import org.jetbrains.kotlin.kdoc.parser.KDocParser;
import org.jetbrains.kotlin.kdoc.psi.impl.KDocImpl;
public interface KDocTokens {
ILazyParseableElementType KDOC = new ILazyParseableElementType("KDoc", JetLanguage.INSTANCE) {
ILazyParseableElementType KDOC = new ILazyParseableElementType("KDoc", KotlinLanguage.INSTANCE) {
@Override
public ASTNode parseContents(ASTNode chameleon) {
PsiElement parentElement = chameleon.getTreeParent().getPsi();
@@ -57,7 +57,7 @@ public interface KDocTokens {
KDocToken TEXT = new KDocToken("KDOC_TEXT");
KDocToken TAG_NAME = new KDocToken("KDOC_TAG_NAME");
ILazyParseableElementType MARKDOWN_LINK = new ILazyParseableElementType("KDOC_MARKDOWN_LINK", JetLanguage.INSTANCE) {
ILazyParseableElementType MARKDOWN_LINK = new ILazyParseableElementType("KDOC_MARKDOWN_LINK", KotlinLanguage.INSTANCE) {
@Override
public ASTNode parseContents(ASTNode chameleon) {
return KDocLinkParser.parseMarkdownLink(this, chameleon);
compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocElementType.java
+2 -2
View File
@@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import java.lang.reflect.Constructor;
@@ -28,7 +28,7 @@ public class KDocElementType extends IElementType {
private final Constructor<? extends PsiElement> psiFactory;
public KDocElementType(String debugName, @NotNull Class<? extends PsiElement> psiClass) {
super(debugName, JetLanguage.INSTANCE);
super(debugName, KotlinLanguage.INSTANCE);
try {
psiFactory = psiClass.getConstructor(ASTNode.class);
} catch (NoSuchMethodException e) {
compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocElementImpl.java
+2 -2
View File
@@ -20,13 +20,13 @@ import com.intellij.extapi.psi.ASTWrapperPsiElement;
import com.intellij.lang.ASTNode;
import com.intellij.lang.Language;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
public abstract class KDocElementImpl extends ASTWrapperPsiElement {
@NotNull
@Override
public Language getLanguage() {
return JetLanguage.INSTANCE;
return KotlinLanguage.INSTANCE;
}
@Override
compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocImpl.kt
+2 -2
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.kdoc.psi.impl
import com.intellij.lang.Language
import com.intellij.psi.impl.source.tree.LazyParseablePsiElement
import com.intellij.psi.tree.IElementType
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.kdoc.lexer.KDocTokens
import org.jetbrains.kotlin.kdoc.psi.api.KDoc
import org.jetbrains.kotlin.lexer.JetTokens
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.kdoc.parser.KDocKnownTag
public class KDocImpl(buffer: CharSequence?) : LazyParseablePsiElement(KDocTokens.KDOC, buffer), KDoc {
override fun getLanguage(): Language = JetLanguage.INSTANCE
override fun getLanguage(): Language = KotlinLanguage.INSTANCE
override fun toString(): String = getNode().getElementType().toString()
compiler/frontend/src/org/jetbrains/kotlin/lexer/JetToken.java
+2 -2
View File
@@ -19,10 +19,10 @@ package org.jetbrains.kotlin.lexer;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
public class JetToken extends IElementType {
public JetToken(@NotNull @NonNls String debugName) {
super(debugName, JetLanguage.INSTANCE);
super(debugName, KotlinLanguage.INSTANCE);
}
}
compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParserDefinition.java
+2 -2
View File
@@ -32,7 +32,7 @@ import com.intellij.psi.tree.TokenSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.JetNodeType;
import org.jetbrains.kotlin.JetNodeTypes;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.kdoc.lexer.KDocTokens;
import org.jetbrains.kotlin.kdoc.parser.KDocElementType;
import org.jetbrains.kotlin.kdoc.psi.impl.KDocLink;
@@ -55,7 +55,7 @@ public class JetParserDefinition implements ParserDefinition {
@NotNull
public static JetParserDefinition getInstance() {
return (JetParserDefinition)LanguageParserDefinitions.INSTANCE.forLanguage(JetLanguage.INSTANCE);
return (JetParserDefinition)LanguageParserDefinitions.INSTANCE.forLanguage(KotlinLanguage.INSTANCE);
}
@Override
compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImpl.java
+2 -2
View File
@@ -25,7 +25,7 @@ import com.intellij.psi.PsiReference;
import com.intellij.psi.PsiReferenceService;
import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
public class JetElementImpl extends ASTWrapperPsiElement implements JetElement {
public JetElementImpl(@NotNull ASTNode node) {
@@ -35,7 +35,7 @@ public class JetElementImpl extends ASTWrapperPsiElement implements JetElement {
@NotNull
@Override
public Language getLanguage() {
return JetLanguage.INSTANCE;
return KotlinLanguage.INSTANCE;
}
@Override
compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java
+2 -2
View File
@@ -24,7 +24,7 @@ import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry
import com.intellij.psi.stubs.IStubElementType;
import com.intellij.psi.stubs.StubElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementType;
import java.util.Arrays;
@@ -43,7 +43,7 @@ public class JetElementImplStub<T extends StubElement<?>> extends StubBasedPsiEl
@NotNull
@Override
public Language getLanguage() {
return JetLanguage.INSTANCE;
return KotlinLanguage.INSTANCE;
}
@Override
compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java
+2 -2
View File
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.JetNodeTypes;
import org.jetbrains.kotlin.idea.JetFileType;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.stubs.KotlinFileStub;
import org.jetbrains.kotlin.psi.stubs.elements.JetPlaceHolderStubElementType;
@@ -47,7 +47,7 @@ public class JetFile extends PsiFileBase implements JetDeclarationContainer, Jet
private final boolean isCompiled;
public JetFile(FileViewProvider viewProvider, boolean compiled) {
super(viewProvider, JetLanguage.INSTANCE);
super(viewProvider, KotlinLanguage.INSTANCE);
this.isCompiled = compiled;
}
compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java
+3 -3
View File
@@ -27,7 +27,7 @@ import com.intellij.psi.stubs.StubOutputStream;
import com.intellij.psi.tree.IStubFileElementType;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.parsing.JetParser;
import org.jetbrains.kotlin.psi.stubs.KotlinFileStub;
@@ -39,11 +39,11 @@ public class JetFileElementType extends IStubFileElementType<KotlinFileStub> {
private static final String NAME = "kotlin.FILE";
public JetFileElementType() {
super(NAME, JetLanguage.INSTANCE);
super(NAME, KotlinLanguage.INSTANCE);
}
protected JetFileElementType(@NonNls String debugName) {
super(debugName, JetLanguage.INSTANCE);
super(debugName, KotlinLanguage.INSTANCE);
}
@Override
compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementType.java
+2 -2
View File
@@ -27,7 +27,7 @@ import com.intellij.util.ArrayFactory;
import com.intellij.util.ReflectionUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.psi.JetClassOrObject;
import org.jetbrains.kotlin.psi.JetElementImplStub;
import org.jetbrains.kotlin.psi.JetFunction;
@@ -48,7 +48,7 @@ public abstract class JetStubElementType<StubT extends StubElement, PsiT extends
private final ArrayFactory<PsiT> arrayFactory;
public JetStubElementType(@NotNull @NonNls String debugName, @NotNull final Class<PsiT> psiClass, @NotNull Class<?> stubClass) {
super(debugName, JetLanguage.INSTANCE);
super(debugName, KotlinLanguage.INSTANCE);
try {
byNodeConstructor = psiClass.getConstructor(ASTNode.class);
byStubConstructor = psiClass.getConstructor(stubClass);
compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java
+2 -2
View File
@@ -24,7 +24,7 @@ import com.intellij.psi.PsiManager;
import com.intellij.psi.impl.light.AbstractLightClass;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.JetClassOrObject;
import org.jetbrains.kotlin.psi.JetFile;
@@ -93,7 +93,7 @@ public class FakeLightClassForFileOfPackage extends AbstractLightClass implement
@NotNull
@Override
public Language getLanguage() {
return JetLanguage.INSTANCE;
return KotlinLanguage.INSTANCE;
}
@Override
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt
+3 -3
View File
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.fileClasses.NoResolveFileClassesProvider
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.lexer.JetTokens.*
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.FqNameUnsafe
@@ -66,7 +66,7 @@ public open class KotlinLightClassForExplicitDeclaration(
var createWrapper = forceMethodWrapping
// Use PsiClass wrapper instead of package light class to avoid names like "FooPackage" in Type Hierarchy and related views
if (containingClass is KotlinLightClassForFacade) {
containingClass = object : LightClass(containingClass as KotlinLightClassForFacade, JetLanguage.INSTANCE) {
containingClass = object : LightClass(containingClass as KotlinLightClassForFacade, KotlinLanguage.INSTANCE) {
override fun getName(): String? {
return currentFileName
}
@@ -75,7 +75,7 @@ public open class KotlinLightClassForExplicitDeclaration(
}
if (createWrapper) {
return object : LightMethod(myManager, method, containingClass!!, JetLanguage.INSTANCE) {
return object : LightMethod(myManager, method, containingClass!!, KotlinLanguage.INSTANCE) {
override fun getParent(): PsiElement {
return getContainingClass()!!
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForFacade.kt
+2 -2
View File
@@ -30,7 +30,7 @@ import com.intellij.psi.util.CachedValuesManager
import com.intellij.psi.util.PsiModificationTracker
import com.intellij.util.containers.SLRUCache
import org.jetbrains.annotations.NonNls
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.JetClassOrObject
@@ -111,7 +111,7 @@ public class KotlinLightClassForFacade private constructor(
facadeClassFqName.parent()
private val modifierList: PsiModifierList =
LightModifierList(manager, JetLanguage.INSTANCE, PsiModifier.PUBLIC, PsiModifier.FINAL)
LightModifierList(manager, KotlinLanguage.INSTANCE, PsiModifier.PUBLIC, PsiModifier.FINAL)
private val implementsList: LightEmptyImplementsList =
LightEmptyImplementsList(manager)
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java
+2 -2
View File
@@ -27,7 +27,7 @@ import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.psi.JetDeclaration;
// Copied from com.intellij.psi.impl.light.LightField
@@ -172,7 +172,7 @@ public abstract class KotlinLightField<T extends JetDeclaration, D extends PsiFi
@NotNull
@Override
public Language getLanguage() {
return JetLanguage.INSTANCE;
return KotlinLanguage.INSTANCE;
}
@Override
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForDeclaration.kt
+3 -3
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.asJava
import com.intellij.psi.impl.light.LightMethod
import com.intellij.psi.*
import org.jetbrains.kotlin.psi.JetDeclaration
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import kotlin.properties.Delegates
import com.intellij.psi.util.CachedValuesManager
import com.intellij.psi.util.PsiModificationTracker
@@ -42,7 +42,7 @@ open public class KotlinLightMethodForDeclaration(
private val paramsList: CachedValue<PsiParameterList> by Delegates.blockingLazy {
val cacheManager = CachedValuesManager.getManager(delegate.getProject())
cacheManager.createCachedValue<PsiParameterList>({
val parameterBuilder = LightParameterListBuilder(getManager(), JetLanguage.INSTANCE, this)
val parameterBuilder = LightParameterListBuilder(getManager(), KotlinLanguage.INSTANCE, this)
for ((index, parameter) in delegate.getParameterList().getParameters().withIndex()) {
parameterBuilder.addParameter(KotlinLightParameter(parameter, index, this))
@@ -113,7 +113,7 @@ open public class KotlinLightMethodForDeclaration(
override fun getUseScope(): SearchScope = origin.getUseScope()
override fun getLanguage(): Language = JetLanguage.INSTANCE
override fun getLanguage(): Language = KotlinLanguage.INSTANCE
override fun processDeclarations(processor: PsiScopeProcessor, state: ResolveState, lastParent: PsiElement?, place: PsiElement): Boolean {
return getTypeParameters().all { processor.execute(it, state) }
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightModifierList.java
+2 -2
View File
@@ -23,11 +23,11 @@ import com.intellij.psi.impl.light.LightModifierList;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
public abstract class KotlinLightModifierList extends LightModifierList {
public KotlinLightModifierList(PsiManager psiManager, @NotNull String[] modifiers) {
super(psiManager, JetLanguage.INSTANCE, modifiers);
super(psiManager, KotlinLanguage.INSTANCE, modifiers);
}
public abstract PsiAnnotationOwner getDelegate();
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java
+3 -3
View File
@@ -25,7 +25,7 @@ import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage;
@@ -43,7 +43,7 @@ public class KotlinLightParameter extends LightParameter implements KotlinLightE
private final KotlinLightMethod method;
public KotlinLightParameter(final PsiParameter delegate, int index, KotlinLightMethod method) {
super(getName(delegate, index), delegate.getType(), method, JetLanguage.INSTANCE);
super(getName(delegate, index), delegate.getType(), method, KotlinLanguage.INSTANCE);
this.delegate = delegate;
this.index = index;
@@ -122,7 +122,7 @@ public class KotlinLightParameter extends LightParameter implements KotlinLightE
@NotNull
@Override
public Language getLanguage() {
return JetLanguage.INSTANCE;
return KotlinLanguage.INSTANCE;
}
@NotNull
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java
+3 -3
View File
@@ -22,7 +22,7 @@ import com.intellij.psi.impl.light.AbstractLightClass;
import com.intellij.psi.search.SearchScope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.psi.JetTypeParameter;
import org.jetbrains.kotlin.psi.JetTypeParameterListOwner;
@@ -36,7 +36,7 @@ public class KotlinLightTypeParameter
@NotNull PsiTypeParameterListOwner owner,
int index,
@NotNull String name) {
super(owner.getManager(), JetLanguage.INSTANCE);
super(owner.getManager(), KotlinLanguage.INSTANCE);
this.owner = owner;
this.index = index;
this.name = name;
@@ -133,7 +133,7 @@ public class KotlinLightTypeParameter
@NotNull
@Override
public Language getLanguage() {
return JetLanguage.INSTANCE;
return KotlinLanguage.INSTANCE;
}
@NotNull
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameterListBuilder.kt
+2 -2
View File
@@ -17,13 +17,13 @@
package org.jetbrains.kotlin.asJava
import com.intellij.psi.PsiManager
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import com.intellij.psi.impl.light.LightTypeParameterListBuilder
import com.intellij.psi.scope.PsiScopeProcessor
import com.intellij.psi.ResolveState
import com.intellij.psi.PsiElement
public class KotlinLightTypeParameterListBuilder(manager: PsiManager): LightTypeParameterListBuilder(manager, JetLanguage.INSTANCE) {
public class KotlinLightTypeParameterListBuilder(manager: PsiManager): LightTypeParameterListBuilder(manager, KotlinLanguage.INSTANCE) {
override fun processDeclarations(processor: PsiScopeProcessor, state: ResolveState, lastParent: PsiElement?, place: PsiElement): Boolean {
return getTypeParameters().all { processor.execute(it, state) }
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java
+3 -3
View File
@@ -32,7 +32,7 @@ import kotlin.KotlinPackage;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage;
@@ -43,7 +43,7 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
private final ClassInnerStuffCache myInnersCache = new ClassInnerStuffCache(this);
protected KotlinWrappingLightClass(PsiManager manager) {
super(manager, JetLanguage.INSTANCE);
super(manager, KotlinLanguage.INSTANCE);
}
@Nullable
@@ -184,7 +184,7 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
@NotNull
@Override
public Language getLanguage() {
return JetLanguage.INSTANCE;
return KotlinLanguage.INSTANCE;
}
private boolean isTraitFakeOverride(@NotNull JetDeclaration originMethodDeclaration) {
compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java
+3 -4
View File
@@ -52,13 +52,12 @@ import org.jetbrains.kotlin.config.CommonConfigurationKeys;
import org.jetbrains.kotlin.config.CompilerConfiguration;
import org.jetbrains.kotlin.config.ContentRoot;
import org.jetbrains.kotlin.config.KotlinSourceRoot;
import org.jetbrains.kotlin.descriptors.ModuleParameters;
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.diagnostics.Errors;
import org.jetbrains.kotlin.diagnostics.Severity;
import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.JetExpression;
@@ -406,7 +405,7 @@ public class JetTestUtils {
public static JetFile createFile(@NotNull @NonNls final String name, @NotNull String text, @NotNull Project project) {
String shortName = name.substring(name.lastIndexOf('/') + 1);
shortName = shortName.substring(shortName.lastIndexOf('\\') + 1);
LightVirtualFile virtualFile = new LightVirtualFile(shortName, JetLanguage.INSTANCE, text) {
LightVirtualFile virtualFile = new LightVirtualFile(shortName, KotlinLanguage.INSTANCE, text) {
@NotNull
@Override
public String getPath() {
@@ -418,7 +417,7 @@ public class JetTestUtils {
virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
PsiFileFactoryImpl factory = (PsiFileFactoryImpl) PsiFileFactory.getInstance(project);
//noinspection ConstantConditions
return (JetFile) factory.trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false);
return (JetFile) factory.trySetupPsiForFile(virtualFile, KotlinLanguage.INSTANCE, true, false);
}
public static String doLoadFile(String myFullDataPath, String name) throws IOException {
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/kotlinFileViewProviders.kt
+2 -2
View File
@@ -26,13 +26,13 @@ import com.intellij.psi.PsiManager
import com.intellij.psi.SingleRootFileViewProvider
import com.intellij.psi.impl.source.PsiFileImpl
import org.jetbrains.kotlin.idea.JetFileType
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.utils.concurrent.block.LockedClearableLazyValue
abstract class KotlinClassFileViewProvider(
manager: PsiManager,
file: VirtualFile,
physical: Boolean) : SingleRootFileViewProvider(manager, file, physical, JetLanguage.INSTANCE) {
physical: Boolean) : SingleRootFileViewProvider(manager, file, physical, KotlinLanguage.INSTANCE) {
val content : LockedClearableLazyValue<String> = LockedClearableLazyValue(Any()) {
val psiFile = createFile(manager.getProject(), file, JetFileType.INSTANCE)
val text = psiFile?.getText() ?: ""
idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt
+2 -2
View File
@@ -53,7 +53,7 @@ import org.jetbrains.kotlin.console.gutter.ReplIcons
import org.jetbrains.kotlin.console.highlight.KotlinHistoryHighlighter
import org.jetbrains.kotlin.console.highlight.KotlinReplOutputHighlighter
import org.jetbrains.kotlin.console.highlight.ReplColors
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.completion.doNotComplete
import org.jetbrains.kotlin.psi.JetFile
import java.awt.Color
@@ -85,7 +85,7 @@ public class KotlinConsoleRunner(
override fun createConsoleView(): LanguageConsoleView? {
val consoleView = LanguageConsoleBuilder()
.gutterContentProvider(KotlinConsoleGutterContentProvider())
.build(project, JetLanguage.INSTANCE)
.build(project, KotlinLanguage.INSTANCE)
consoleView.prompt = null
idea/src/META-INF/i18n.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<idea-plugin>
<extensions defaultExtensionNs="com.intellij">
<psi.referenceContributor language="jet" implementation="org.jetbrains.kotlin.idea.properties.KotlinPropertiesReferenceContributor"/>
<psi.referenceContributor language="kotlin" implementation="org.jetbrains.kotlin.idea.properties.KotlinPropertiesReferenceContributor"/>
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.KotlinInvalidBundleOrPropertyInspection"
displayName="Invalid property key"
idea/src/META-INF/plugin.xml
+41 -41
View File
@@ -270,8 +270,8 @@
<gotoSymbolContributor implementation="org.jetbrains.kotlin.idea.caches.JetGotoSymbolContributor"/>
<gotoClassContributor implementation="org.jetbrains.kotlin.idea.caches.JetGotoClassContributor"/>
<lang.importOptimizer language="jet" implementationClass="org.jetbrains.kotlin.idea.imports.KotlinImportOptimizer"/>
<lang.namesValidator language="jet" implementationClass="org.jetbrains.kotlin.idea.refactoring.KotlinNamesValidator"/>
<lang.importOptimizer language="kotlin" implementationClass="org.jetbrains.kotlin.idea.imports.KotlinImportOptimizer"/>
<lang.namesValidator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.refactoring.KotlinNamesValidator"/>
<fileTypeFactory implementation="org.jetbrains.kotlin.idea.JetFileFactory"/>
<fileTypeFactory implementation="org.jetbrains.kotlin.idea.KotlinJavaScriptMetaFileTypeFactory"/>
@@ -281,26 +281,26 @@
<compiler.task execute="BEFORE" implementation="org.jetbrains.kotlin.idea.internal.makeBackup.MakeBackupCompileTask"/>
<buildProcess.parametersProvider implementation="org.jetbrains.kotlin.idea.compiler.configuration.KotlinBuildProcessParametersProvider"/>
<lang.syntaxHighlighterFactory key="jet" implementationClass="org.jetbrains.kotlin.idea.highlighter.JetSyntaxHighlighterFactory"/>
<lang.braceMatcher language="jet" implementationClass="org.jetbrains.kotlin.idea.JetPairMatcher"/>
<lang.parserDefinition language="jet" implementationClass="org.jetbrains.kotlin.parsing.JetParserDefinition"/>
<lang.commenter language="jet" implementationClass="org.jetbrains.kotlin.idea.JetCommenter"/>
<lang.psiStructureViewFactory language="jet" implementationClass="org.jetbrains.kotlin.idea.structureView.JetStructureViewFactory"/>
<lang.syntaxHighlighterFactory key="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.JetSyntaxHighlighterFactory"/>
<lang.braceMatcher language="kotlin" implementationClass="org.jetbrains.kotlin.idea.JetPairMatcher"/>
<lang.parserDefinition language="kotlin" implementationClass="org.jetbrains.kotlin.parsing.JetParserDefinition"/>
<lang.commenter language="kotlin" implementationClass="org.jetbrains.kotlin.idea.JetCommenter"/>
<lang.psiStructureViewFactory language="kotlin" implementationClass="org.jetbrains.kotlin.idea.structureView.JetStructureViewFactory"/>
<structureViewBuilder order="first" key="CLASS" factoryClass="org.jetbrains.kotlin.idea.structureView.JetClsStructureViewBuilderProvider"/>
<lang.foldingBuilder language="jet" implementationClass="org.jetbrains.kotlin.idea.KotlinFoldingBuilder"/>
<lang.formatter language="jet" implementationClass="org.jetbrains.kotlin.idea.formatter.JetFormattingModelBuilder"/>
<lang.findUsagesProvider language="jet" implementationClass="org.jetbrains.kotlin.idea.findUsages.JetFindUsagesProvider"/>
<lang.foldingBuilder language="kotlin" implementationClass="org.jetbrains.kotlin.idea.KotlinFoldingBuilder"/>
<lang.formatter language="kotlin" implementationClass="org.jetbrains.kotlin.idea.formatter.JetFormattingModelBuilder"/>
<lang.findUsagesProvider language="kotlin" implementationClass="org.jetbrains.kotlin.idea.findUsages.JetFindUsagesProvider"/>
<lang.elementManipulator forClass="org.jetbrains.kotlin.psi.JetStringTemplateExpression"
implementationClass="org.jetbrains.kotlin.psi.psiUtil.JetStringTemplateExpressionManipulator"/>
<fileStructureGroupRuleProvider implementation="org.jetbrains.kotlin.idea.findUsages.KotlinDeclarationGroupRuleProvider"/>
<importFilteringRule implementation="org.jetbrains.kotlin.idea.findUsages.JetImportFilteringRule"/>
<lang.refactoringSupport language="jet" implementationClass="org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSupportProvider"/>
<lang.surroundDescriptor language="jet"
<lang.refactoringSupport language="kotlin" implementationClass="org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSupportProvider"/>
<lang.surroundDescriptor language="kotlin"
implementationClass="org.jetbrains.kotlin.idea.codeInsight.surroundWith.expression.KotlinExpressionSurroundDescriptor"/>
<lang.surroundDescriptor language="jet"
<lang.surroundDescriptor language="kotlin"
implementationClass="org.jetbrains.kotlin.idea.codeInsight.surroundWith.statement.KotlinStatementSurroundDescriptor"/>
<lang.unwrapDescriptor language="jet" implementationClass="org.jetbrains.kotlin.idea.codeInsight.unwrap.KotlinUnwrapDescriptor"/>
<lang.unwrapDescriptor language="kotlin" implementationClass="org.jetbrains.kotlin.idea.codeInsight.unwrap.KotlinUnwrapDescriptor"/>
<quoteHandler fileType="Kotlin" className="org.jetbrains.kotlin.idea.editor.KotlinQuoteHandler"/>
<refactoring.helper implementation="org.jetbrains.kotlin.idea.codeInsight.KotlinShortenReferencesRefactoringHelper"/>
<refactoring.moveHandler
@@ -317,7 +317,7 @@
order="first" />
<refactoring.moveInnerClassUsagesHandler
implementationClass="org.jetbrains.kotlin.idea.refactoring.move.MoveJavaInnerClassKotlinUsagesHandler"
language="jet" />
language="kotlin" />
<refactoring.copyHandler implementation="org.jetbrains.kotlin.idea.refactoring.copy.CopyKotlinFileHandler" order="first" />
<refactoring.changeSignatureUsageProcessor implementation="org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeSignatureUsageProcessor"/>
<refactoring.introduceParameterMethodUsagesProcessor
@@ -340,22 +340,22 @@
<qualifiedNameProvider implementation="org.jetbrains.kotlin.idea.actions.KotlinQualifiedNameProvider"/>
<codeInsight.parameterInfo language="jet" implementationClass="org.jetbrains.kotlin.idea.parameterInfo.JetFunctionParameterInfoHandler"/>
<codeInsight.parameterInfo language="kotlin" implementationClass="org.jetbrains.kotlin.idea.parameterInfo.JetFunctionParameterInfoHandler"/>
<codeInsight.gotoSuper language="jet" implementationClass="org.jetbrains.kotlin.idea.codeInsight.GotoSuperActionHandler"/>
<codeInsight.gotoSuper language="kotlin" implementationClass="org.jetbrains.kotlin.idea.codeInsight.GotoSuperActionHandler"/>
<typeDeclarationProvider implementation="org.jetbrains.kotlin.idea.codeInsight.JetTypeDeclarationProvider"/>
<completion.contributor language="jet"
<completion.contributor language="kotlin"
id="KotlinCompletionContributor"
order="first"
implementationClass="org.jetbrains.kotlin.idea.completion.KotlinCompletionContributor"/>
<completion.contributor language="jet"
<completion.contributor language="kotlin"
implementationClass="org.jetbrains.kotlin.idea.completion.KDocCompletionContributor"/>
<completion.confidence language="jet" implementationClass="com.intellij.codeInsight.completion.UnfocusedNameIdentifier"/>
<completion.confidence language="jet"
<completion.confidence language="kotlin" implementationClass="com.intellij.codeInsight.completion.UnfocusedNameIdentifier"/>
<completion.confidence language="kotlin"
implementationClass="org.jetbrains.kotlin.idea.completion.confidence.UnfocusedPossibleFunctionParameter"/>
<completion.confidence language="jet" implementationClass="com.intellij.codeInsight.completion.AlwaysFocusLookup" order="last"/>
<completion.confidence language="kotlin" implementationClass="com.intellij.codeInsight.completion.AlwaysFocusLookup" order="last"/>
<lookup.charFilter implementation="org.jetbrains.kotlin.idea.completion.KotlinCompletionCharFilter"/>
<lookup.actionProvider implementation="org.jetbrains.kotlin.idea.completion.KotlinExcludeFromCompletionLookupActionProvider"/>
@@ -365,7 +365,7 @@
<weigher key="completion" implementationClass="org.jetbrains.kotlin.idea.completion.KotlinLookupElementProximityWeigher" id="kotlin.proximity" order="after proximity"/>
<psi.referenceContributor language="jet" implementation="org.jetbrains.kotlin.idea.references.JetReferenceContributor"/>
<psi.referenceContributor language="kotlin" implementation="org.jetbrains.kotlin.idea.references.JetReferenceContributor"/>
<renamePsiElementProcessor id="KotlinClass"
implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameKotlinClassProcessor"
@@ -391,7 +391,7 @@
<automaticRenamerFactory implementation="org.jetbrains.kotlin.idea.refactoring.rename.AutomaticOverloadsRenamerFactory"/>
<vetoRenameCondition implementation="org.jetbrains.kotlin.idea.refactoring.KotlinVetoRenameCondition"/>
<spellchecker.support implementationClass="org.jetbrains.kotlin.idea.KotlinSpellcheckingStrategy" language="jet"/>
<spellchecker.support implementationClass="org.jetbrains.kotlin.idea.KotlinSpellcheckingStrategy" language="kotlin"/>
<liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.JetTemplateContextType$Generic"/>
<liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.JetTemplateContextType$TopLevel"/>
@@ -407,11 +407,11 @@
<liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.JetSuggestVariableNameMacro"/>
<liveTemplateOptionalProcessor implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinShortenFQNamesProcessor"/>
<annotator language="jet" implementationClass="org.jetbrains.kotlin.idea.highlighter.JetPsiCheckerAndHighlightingUpdater"/>
<annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.JetPsiCheckerAndHighlightingUpdater"/>
<highlightRangeExtension implementation="org.jetbrains.kotlin.idea.highlighter.JetPsiChecker"/>
<annotator language="jet" implementationClass="org.jetbrains.kotlin.idea.highlighter.DebugInfoAnnotator"/>
<annotator language="jet" implementationClass="org.jetbrains.kotlin.idea.highlighter.DuplicateJvmSignatureAnnotator"/>
<annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.DebugInfoAnnotator"/>
<annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.DuplicateJvmSignatureAnnotator"/>
<problemHighlightFilter implementation="org.jetbrains.kotlin.idea.highlighter.KotlinProblemHighlightFilter"/>
<extendWordSelectionHandler implementation="org.jetbrains.kotlin.idea.editor.wordSelection.KotlinStatementGroupSelectioner"/>
@@ -426,7 +426,7 @@
<typedHandler implementation="org.jetbrains.kotlin.idea.kdoc.KDocTypedHandler"/>
<enterHandlerDelegate implementation="org.jetbrains.kotlin.idea.editor.KotlinEnterHandler"
id="KotlinEnterHandler" order="before EnterBetweenBracesHandler"/>
<lang.smartEnterProcessor language="jet" implementationClass="org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler"/>
<lang.smartEnterProcessor language="kotlin" implementationClass="org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler"/>
<backspaceHandlerDelegate implementation="org.jetbrains.kotlin.idea.editor.KotlinBackspaceHandler"/>
<copyPastePostProcessor implementation="org.jetbrains.kotlin.idea.conversion.copy.ConvertJavaCopyPastePostProcessor"/>
@@ -439,9 +439,9 @@
<programRunner implementation="org.jetbrains.kotlin.idea.k2jsrun.K2JSBrowserProgramRunner"/>
<runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinRunConfigurationProducer"/>
<codeInsight.lineMarkerProvider language="jet" implementationClass="org.jetbrains.kotlin.idea.highlighter.markers.KotlinLineMarkerProvider"/>
<codeInsight.lineMarkerProvider language="jet" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinRecursiveCallLineMarkerProvider"/>
<runLineMarkerContributor language="jet" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinRunLineMarkerContributor"/>
<codeInsight.lineMarkerProvider language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.markers.KotlinLineMarkerProvider"/>
<codeInsight.lineMarkerProvider language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinRecursiveCallLineMarkerProvider"/>
<runLineMarkerContributor language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinRunLineMarkerContributor"/>
<iconProvider implementation="org.jetbrains.kotlin.idea.JetIconProvider"/>
<itemPresentationProvider implementationClass="org.jetbrains.kotlin.idea.presentation.JetFunctionPresenter"
@@ -468,12 +468,12 @@
order="before javaProcessor"/>
<refactoring.safeDelete.JavaSafeDeleteDelegate
id="kotlinJavaSafeDeleteDelegate"
language="jet"
language="kotlin"
implementationClass="org.jetbrains.kotlin.idea.refactoring.safeDelete.KotlinJavaSafeDeleteDelegate"/>
<debugger.jvmSmartStepIntoHandler implementation="org.jetbrains.kotlin.idea.debugger.stepping.KotlinSmartStepIntoHandler"/>
<debugger.positionManagerFactory implementation="org.jetbrains.kotlin.idea.debugger.JetPositionManagerFactory"/>
<debugger.codeFragmentFactory implementation="org.jetbrains.kotlin.idea.debugger.evaluate.KotlinCodeFragmentFactory"/>
<debuggerEditorTextProvider language="jet" implementationClass="org.jetbrains.kotlin.idea.debugger.KotlinEditorTextProvider"/>
<debuggerEditorTextProvider language="kotlin" implementationClass="org.jetbrains.kotlin.idea.debugger.KotlinEditorTextProvider"/>
<debuggerClassFilterProvider implementation="org.jetbrains.kotlin.idea.debugger.filter.KotlinDebuggerInternalClassesFilterProvider"/>
<debugger.nodeRenderer implementation="org.jetbrains.kotlin.idea.debugger.render.KotlinClassWithDelegatedPropertyRenderer"/>
<debugger.sourcePositionProvider implementation="org.jetbrains.kotlin.idea.debugger.KotlinSourcePositionProvider"/>
@@ -488,8 +488,8 @@
<debugger.javaBreakpointHandlerFactory implementation="org.jetbrains.kotlin.idea.debugger.breakpoints.KotlinLineBreakpointHandlerFactory"/>
<debugger.jvmSteppingCommandProvider implementation="org.jetbrains.kotlin.idea.debugger.stepping.KotlinSteppingCommandProvider"/>
<codeInsight.implementMethod language="jet" implementationClass="org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMembersHandler"/>
<codeInsight.overrideMethod language="jet" implementationClass="org.jetbrains.kotlin.idea.core.overrideImplement.OverrideMembersHandler"/>
<codeInsight.implementMethod language="kotlin" implementationClass="org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMembersHandler"/>
<codeInsight.overrideMethod language="kotlin" implementationClass="org.jetbrains.kotlin.idea.core.overrideImplement.OverrideMembersHandler"/>
<framework.type implementation="org.jetbrains.kotlin.idea.framework.JavaFrameworkType"/>
<framework.type implementation="org.jetbrains.kotlin.idea.framework.JSFrameworkType"/>
@@ -498,16 +498,16 @@
<library.presentationProvider implementation="org.jetbrains.kotlin.idea.framework.JavaRuntimePresentationProvider"/>
<library.presentationProvider implementation="org.jetbrains.kotlin.idea.framework.JSLibraryStdPresentationProvider"/>
<typeHierarchyProvider language="jet" implementationClass="org.jetbrains.kotlin.idea.hierarchy.KotlinTypeHierarchyProvider"/>
<typeHierarchyProvider language="kotlin" implementationClass="org.jetbrains.kotlin.idea.hierarchy.KotlinTypeHierarchyProvider"/>
<callHierarchyProvider
language="jet"
language="kotlin"
implementationClass="org.jetbrains.kotlin.idea.hierarchy.calls.KotlinCallHierarchyProvider" />
<callHierarchyProvider
language="JAVA"
implementationClass="org.jetbrains.kotlin.idea.hierarchy.calls.KotlinCallHierarchyProvider"
order="first" />
<methodHierarchyProvider
language="jet"
language="kotlin"
implementationClass="org.jetbrains.kotlin.idea.hierarchy.overrides.KotlinOverrideHierarchyProvider" />
<java.elementFinder implementation="org.jetbrains.kotlin.asJava.JavaElementFinder"/>
@@ -584,11 +584,11 @@
<joinLinesHandler implementation="org.jetbrains.kotlin.idea.joinLines.JoinBlockIntoSingleStatementHandler"/>
<targetElementEvaluator
language="jet"
language="kotlin"
implementationClass="org.jetbrains.kotlin.idea.search.ideaExtensions.JetTargetElementEvaluator" />
<refactoring.pullUpHelperFactory
language="jet"
language="kotlin"
implementationClass="org.jetbrains.kotlin.idea.refactoring.pullUp.KotlinPullUpHelperFactory"/>
<refactoring.pullUpHelperFactory
language="JAVA"
@@ -1206,7 +1206,7 @@
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.OperatorModifierInspection"
displayName="Missing 'operator' modifier"
groupName="Kotlin"
language="jet"
language="kotlin"
enabledByDefault="true"
level="WARNING"/>
idea/src/org/jetbrains/kotlin/idea/actions/ShowExpressionTypeAction.kt
+2 -2
View File
@@ -24,7 +24,7 @@ import com.intellij.openapi.actionSystem.CommonDataKeys
import com.intellij.openapi.editor.Editor
import com.intellij.psi.PsiFile
import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.psi.JetCallableDeclaration
import org.jetbrains.kotlin.psi.JetExpression
@@ -45,7 +45,7 @@ public class ShowExpressionTypeAction : AnAction() {
val type = if (editor.getSelectionModel().hasSelection()) {
val startOffset = editor.getSelectionModel().getSelectionStart()
val endOffset = editor.getSelectionModel().getSelectionEnd()
val expression = CodeInsightUtilCore.findElementInRange<JetExpression>(psiFile, startOffset, endOffset, javaClass<JetExpression>(), JetLanguage.INSTANCE) ?: return
val expression = CodeInsightUtilCore.findElementInRange<JetExpression>(psiFile, startOffset, endOffset, javaClass<JetExpression>(), KotlinLanguage.INSTANCE) ?: return
typeByExpression(expression)
}
else {
idea/src/org/jetbrains/kotlin/idea/configuration/KotlinSetupSDKNotificationProvider.kt
+2 -2
View File
@@ -34,7 +34,7 @@ import com.intellij.psi.PsiManager
import com.intellij.ui.EditorNotificationPanel
import com.intellij.ui.EditorNotifications
import org.jetbrains.kotlin.idea.JetFileType
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.util.application.runWriteAction
// Code is very same to com.intellij.codeInsight.daemon.impl.SetupSDKNotificationProvider
@@ -58,7 +58,7 @@ public class KotlinSetupSDKNotificationProvider(
}
val psiFile = PsiManager.getInstance(myProject).findFile(file) ?: return null
if (psiFile.language !== JetLanguage.INSTANCE) {
if (psiFile.language !== KotlinLanguage.INSTANCE) {
return null
}
idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
+3 -3
View File
@@ -54,7 +54,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.diagnostics.Severity
import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.caches.resolve.KotlinCacheService
import org.jetbrains.kotlin.idea.caches.resolve.getJavaClassDescriptor
import org.jetbrains.kotlin.idea.core.refactoring.quoteIfNeeded
@@ -508,10 +508,10 @@ private fun PsiElement.createFlexibleTypesFile(): JetFile {
private fun PsiElement.createJetFile(fileName: String, fileText: String): JetFile {
// Not using JetPsiFactory because we need a virtual file attached to the JetFile
val virtualFile = LightVirtualFile(fileName, JetLanguage.INSTANCE, fileText)
val virtualFile = LightVirtualFile(fileName, KotlinLanguage.INSTANCE, fileText)
virtualFile.charset = CharsetToolkit.UTF8_CHARSET
val jetFile = (PsiFileFactory.getInstance(project) as PsiFileFactoryImpl)
.trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false) as JetFile
.trySetupPsiForFile(virtualFile, KotlinLanguage.INSTANCE, true, false) as JetFile
jetFile.analysisContext = this
return jetFile
}
idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinWordSelectionFilter.kt
+2 -2
View File
@@ -20,12 +20,12 @@ import com.intellij.openapi.util.Condition
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.JetNodeTypes.*
import org.jetbrains.kotlin.psi.JetContainerNode
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.kdoc.parser.KDocElementTypes
public class KotlinWordSelectionFilter : Condition<PsiElement>{
override fun value(e: PsiElement): Boolean {
if (e.getLanguage() != JetLanguage.INSTANCE) return true
if (e.getLanguage() != KotlinLanguage.INSTANCE) return true
if (KotlinListSelectioner.canSelect(e)) return false
if (e is JetContainerNode) return false
idea/src/org/jetbrains/kotlin/idea/formatter/JetBlock.java
+3 -3
View File
@@ -29,7 +29,7 @@ import com.intellij.psi.tree.TokenSet;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings;
import org.jetbrains.kotlin.kdoc.lexer.KDocTokens;
import org.jetbrains.kotlin.kdoc.parser.KDocElementTypes;
@@ -251,7 +251,7 @@ public class JetBlock extends AbstractBlock {
@NotNull
private WrappingStrategy getWrappingStrategy() {
CommonCodeStyleSettings commonSettings = mySettings.getCommonSettings(JetLanguage.INSTANCE);
CommonCodeStyleSettings commonSettings = mySettings.getCommonSettings(KotlinLanguage.INSTANCE);
IElementType elementType = myNode.getElementType();
if (elementType == VALUE_ARGUMENT_LIST) {
@@ -268,7 +268,7 @@ public class JetBlock extends AbstractBlock {
}
private NodeAlignmentStrategy getChildrenAlignmentStrategy() {
final CommonCodeStyleSettings jetCommonSettings = mySettings.getCommonSettings(JetLanguage.INSTANCE);
final CommonCodeStyleSettings jetCommonSettings = mySettings.getCommonSettings(KotlinLanguage.INSTANCE);
JetCodeStyleSettings jetSettings = mySettings.getCustomSettings(JetCodeStyleSettings.class);
// Redefine list of strategies for some special elements
idea/src/org/jetbrains/kotlin/idea/formatter/JetCodeStyleSettingsProvider.java
+5 -5
View File
@@ -25,19 +25,19 @@ import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CodeStyleSettingsProvider;
import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings;
public class JetCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
@Override
public String getConfigurableDisplayName() {
return JetLanguage.NAME;
return KotlinLanguage.NAME;
}
@Override
public Language getLanguage() {
return JetLanguage.INSTANCE;
return KotlinLanguage.INSTANCE;
}
@Override
@@ -48,10 +48,10 @@ public class JetCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
@NotNull
@Override
public Configurable createSettingsPage(CodeStyleSettings settings, CodeStyleSettings originalSettings) {
return new CodeStyleAbstractConfigurable(settings, originalSettings, JetLanguage.NAME) {
return new CodeStyleAbstractConfigurable(settings, originalSettings, KotlinLanguage.NAME) {
@Override
protected CodeStyleAbstractPanel createPanel(CodeStyleSettings settings) {
return new TabbedLanguageCodeStylePanel(JetLanguage.INSTANCE, getCurrentSettings(), settings) {
return new TabbedLanguageCodeStylePanel(KotlinLanguage.INSTANCE, getCurrentSettings(), settings) {
@Override
protected void initTabs(CodeStyleSettings settings) {
// TODO: activate all parent tabs
idea/src/org/jetbrains/kotlin/idea/formatter/JetFormattingModelBuilder.java
+2 -2
View File
@@ -29,13 +29,13 @@ import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.formatter.FormattingDocumentModelImpl;
import com.intellij.psi.formatter.PsiBasedFormattingModel;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
public class JetFormattingModelBuilder implements FormattingModelBuilder {
@NotNull
@Override
public FormattingModel createModel(PsiElement element, CodeStyleSettings settings) {
PsiFile containingFile = element.getContainingFile().getViewProvider().getPsi(JetLanguage.INSTANCE);
PsiFile containingFile = element.getContainingFile().getViewProvider().getPsi(KotlinLanguage.INSTANCE);
JetBlock block = new JetBlock(
containingFile.getNode(), NodeAlignmentStrategy.getNullStrategy(), Indent.getNoneIndent(), null, settings,
FormatterPackage.createSpacingBuilder(settings));
idea/src/org/jetbrains/kotlin/idea/formatter/JetLanguageCodeStyleSettingsProvider.java
+3 -3
View File
@@ -23,14 +23,14 @@ import com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings;
public class JetLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettingsProvider {
@NotNull
@Override
public Language getLanguage() {
return JetLanguage.INSTANCE;
return KotlinLanguage.INSTANCE;
}
@Override
@@ -90,7 +90,7 @@ public class JetLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSetti
@Override
public String getLanguageName() {
return JetLanguage.NAME;
return KotlinLanguage.NAME;
}
@Override
idea/src/org/jetbrains/kotlin/idea/formatter/KotlinSpacingBuilder.kt
+2 -2
View File
@@ -25,7 +25,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings
import com.intellij.psi.formatter.common.AbstractBlock
import com.intellij.psi.tree.IElementType
import org.jetbrains.kotlin.JetNodeTypes
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.lexer.JetTokens
import java.util.ArrayList
@@ -42,7 +42,7 @@ class KotlinSpacingBuilder(val codeStyleSettings: CodeStyleSettings) {
fun getSpacing(parent: ASTBlock, left: ASTBlock, right: ASTBlock): Spacing?
}
inner class BasicSpacingBuilder() : SpacingBuilder(codeStyleSettings, JetLanguage.INSTANCE), Builder {
inner class BasicSpacingBuilder() : SpacingBuilder(codeStyleSettings, KotlinLanguage.INSTANCE), Builder {
override fun getSpacing(parent: ASTBlock, left: ASTBlock, right: ASTBlock): Spacing? {
return super<SpacingBuilder>.getSpacing(parent, left, right)
}
idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+2 -2
View File
@@ -26,7 +26,7 @@ import com.intellij.psi.formatter.FormatterUtil
import com.intellij.psi.tree.IElementType
import com.intellij.psi.tree.TokenSet
import org.jetbrains.kotlin.JetNodeTypes.*
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings
import org.jetbrains.kotlin.idea.formatter.KotlinSpacingBuilder.CustomSpacingBuilder
import org.jetbrains.kotlin.lexer.JetTokens
@@ -44,7 +44,7 @@ fun SpacingBuilder.afterInside(element: IElementType, tokenSet: TokenSet, spacin
fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
val jetSettings = settings.getCustomSettings(javaClass<JetCodeStyleSettings>())!!
val jetCommonSettings = settings.getCommonSettings(JetLanguage.INSTANCE)!!
val jetCommonSettings = settings.getCommonSettings(KotlinLanguage.INSTANCE)!!
return rules(settings) {
val DECLARATIONS =
idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt
+2 -2
View File
@@ -24,7 +24,7 @@ import com.intellij.openapi.options.colors.ColorDescriptor
import com.intellij.openapi.options.colors.ColorSettingsPage
import org.jetbrains.kotlin.idea.JetBundle
import org.jetbrains.kotlin.idea.JetIcons
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import javax.swing.*
import java.lang.reflect.Field
@@ -151,5 +151,5 @@ var <PROPERTY_WITH_BACKING_FIELD><PACKAGE_PROPERTY><MUTABLE_VARIABLE>globalCount
}
override fun getColorDescriptors(): Array<ColorDescriptor> = ColorDescriptor.EMPTY_ARRAY
override fun getDisplayName(): String = JetLanguage.NAME
override fun getDisplayName(): String = KotlinLanguage.NAME
}
idea/src/org/jetbrains/kotlin/idea/j2k/IdeaReferenceSearcher.kt
+2 -2
View File
@@ -27,7 +27,7 @@ import com.intellij.psi.search.LocalSearchScope
import com.intellij.psi.search.searches.ClassInheritorsSearch
import com.intellij.psi.search.searches.OverridingMethodsSearch
import com.intellij.psi.search.searches.ReferencesSearch
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.j2k.ReferenceSearcher
import java.util.*
@@ -44,7 +44,7 @@ public object IdeaReferenceSearcher: ReferenceSearcher {
fileTypes.add(JavaLanguage.INSTANCE.getAssociatedFileType()!!)
}
if (searchKotlin) {
fileTypes.add(JetLanguage.INSTANCE.getAssociatedFileType()!!)
fileTypes.add(KotlinLanguage.INSTANCE.getAssociatedFileType()!!)
}
val searchScope = GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.projectScope(element.getProject()), *fileTypes.toTypedArray())
return ReferencesSearch.search(element, searchScope).findAll()
idea/src/org/jetbrains/kotlin/idea/liveTemplates/JetTemplateContextType.java
+3 -3
View File
@@ -30,7 +30,7 @@ import com.intellij.psi.util.PsiUtilBase;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.psi.*;
@@ -41,7 +41,7 @@ public abstract class JetTemplateContextType extends TemplateContextType {
@Override
public boolean isInContext(@NotNull PsiFile file, int offset) {
if (PsiUtilBase.getLanguageAtOffset(file, offset).isKindOf(JetLanguage.INSTANCE)) {
if (PsiUtilBase.getLanguageAtOffset(file, offset).isKindOf(KotlinLanguage.INSTANCE)) {
PsiElement element = file.findElementAt(offset);
if (element == null) {
element = file.findElementAt(offset - 1);
@@ -85,7 +85,7 @@ public abstract class JetTemplateContextType extends TemplateContextType {
public static class Generic extends JetTemplateContextType {
public Generic() {
super("KOTLIN", JetLanguage.NAME, EverywhereContextType.class);
super("KOTLIN", KotlinLanguage.NAME, EverywhereContextType.class);
}
@Override
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt
+2 -2
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.descriptors.Visibility
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.caches.resolve.getJavaMethodDescriptor
import org.jetbrains.kotlin.idea.core.refactoring.j2k
import org.jetbrains.kotlin.idea.project.ProjectStructureUtil
@@ -148,7 +148,7 @@ public open class JetChangeInfo(
fun isReceiverTypeChanged(): Boolean = receiverParameterInfo?.getTypeText() != methodDescriptor.renderOriginalReceiverType()
override fun getLanguage(): Language = JetLanguage.INSTANCE
override fun getLanguage(): Language = KotlinLanguage.INSTANCE
public var propagationTargetUsageInfos: List<UsageInfo> = ArrayList()
private set
idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java
+2 -3
View File
@@ -53,12 +53,11 @@ import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor;
import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.diagnostics.DiagnosticFactory;
import org.jetbrains.kotlin.diagnostics.Errors;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
import org.jetbrains.kotlin.idea.resolve.ResolutionFacade;
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
import org.jetbrains.kotlin.idea.util.ShortenReferences;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt;
import org.jetbrains.kotlin.resolve.BindingContext;
@@ -78,7 +77,7 @@ import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class KotlinInlineValHandler extends InlineActionHandler {
@Override
public boolean isEnabledForLanguage(Language l) {
return l.equals(JetLanguage.INSTANCE);
return l.equals(KotlinLanguage.INSTANCE);
}
@Override
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt
+2 -2
View File
@@ -22,7 +22,7 @@ import com.intellij.psi.impl.light.LightElement
import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFileHandler
import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesUtil
import com.intellij.usageView.UsageInfo
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.codeInsight.shorten.runWithElementsToShortenIsEmptyIgnored
import org.jetbrains.kotlin.idea.core.KotlinNameSuggester
import org.jetbrains.kotlin.idea.core.getPackage
@@ -44,7 +44,7 @@ public class MoveKotlinFileHandler : MoveFileHandler() {
private class MoveContext(
psiManager: PsiManager,
val declarationMoveProcessor: MoveKotlinTopLevelDeclarationsProcessor
): LightElement(psiManager, JetLanguage.INSTANCE) {
): LightElement(psiManager, KotlinLanguage.INSTANCE) {
override fun toString() = ""
}
idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt
+2 -2
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.asJava.namedUnwrappedElement
import org.jetbrains.kotlin.asJava.toLightClass
import org.jetbrains.kotlin.asJava.unwrapped
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.codeInsight.shorten.addToShorteningWaitSet
import org.jetbrains.kotlin.idea.core.refactoring.createJavaField
import org.jetbrains.kotlin.idea.core.refactoring.createJavaMethod
@@ -249,7 +249,7 @@ class KotlinPullUpHelper(
factory.createClass("Dummy")
) {
// Prevent processing by JavaPullUpHelper
override fun getLanguage() = JetLanguage.INSTANCE
override fun getLanguage() = KotlinLanguage.INSTANCE
}
javaData.movedMembers.add(dummyField)
}
idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelperFactory.kt
+2 -2
View File
@@ -25,7 +25,7 @@ import com.intellij.refactoring.memberPullUp.PullUpHelper
import com.intellij.refactoring.memberPullUp.PullUpHelperFactory
import org.jetbrains.kotlin.asJava.namedUnwrappedElement
import org.jetbrains.kotlin.asJava.unwrapped
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.core.refactoring.createJavaClass
import org.jetbrains.kotlin.psi.JetClass
import org.jetbrains.kotlin.psi.JetClassOrObject
@@ -48,7 +48,7 @@ public class KotlinPullUpHelperFactory : PullUpHelperFactory {
if (!data.sourceClass.isInheritor(data.targetClass, true)) return EmptyPullUpHelper
data.toKotlinPullUpData()?.let { return KotlinPullUpHelper(data, it) }
if (data.targetClass.language.`is`(JetLanguage.INSTANCE) && data.sourceClass.language.`is`(StdLanguages.JAVA)) {
if (data.targetClass.language.`is`(KotlinLanguage.INSTANCE) && data.sourceClass.language.`is`(StdLanguages.JAVA)) {
return JavaToKotlinPostconversionPullUpHelper(data)
}
idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationType.java
+2 -2
View File
@@ -20,7 +20,7 @@ import com.intellij.execution.configurations.*;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetIcons;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
public class JetRunConfigurationType extends ConfigurationTypeBase {
public static JetRunConfigurationType getInstance() {
@@ -28,7 +28,7 @@ public class JetRunConfigurationType extends ConfigurationTypeBase {
}
public JetRunConfigurationType() {
super("JetRunConfigurationType", JetLanguage.NAME, JetLanguage.NAME, JetIcons.LAUNCH);
super("JetRunConfigurationType", KotlinLanguage.NAME, KotlinLanguage.NAME, JetIcons.LAUNCH);
addFactory(new JetRunConfigurationFactory(this));
}
idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java
+2 -2
View File
@@ -32,7 +32,7 @@ import com.intellij.testFramework.LightIdeaTestCase;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.JetTestUtils;
@@ -145,7 +145,7 @@ public abstract class AbstractJetFormatterTest extends LightIdeaTestCase {
Integer rightMargin = InTextDirectivesUtils.getPrefixedInt(originalFileText, "// RIGHT_MARGIN: ");
if (rightMargin != null) {
codeStyleSettings.setRightMargin(JetLanguage.INSTANCE, rightMargin);
codeStyleSettings.setRightMargin(KotlinLanguage.INSTANCE, rightMargin);
}
SettingsConfigurator configurator = JetFormatSettingsUtil.createConfigurator(originalFileText, codeStyleSettings);
idea/tests/org/jetbrains/kotlin/formatter/JetFormatSettingsUtil.java
+2 -2
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.formatter;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
import com.intellij.testFramework.LightPlatformTestCase;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings;
import org.jetbrains.kotlin.test.SettingsConfigurator;
@@ -34,7 +34,7 @@ public class JetFormatSettingsUtil {
public static SettingsConfigurator createConfigurator(String fileText, CodeStyleSettings settings) {
return new SettingsConfigurator(fileText,
settings.getCustomSettings(JetCodeStyleSettings.class),
settings.getCommonSettings(JetLanguage.INSTANCE));
settings.getCommonSettings(KotlinLanguage.INSTANCE));
}
public static SettingsConfigurator createConfigurator(String fileText) {
idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java
+3 -3
View File
@@ -25,7 +25,7 @@ import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetFileType;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor;
public class NavigateToLibraryRegressionTest extends LightCodeInsightFixtureTestCase {
@@ -34,7 +34,7 @@ public class NavigateToLibraryRegressionTest extends LightCodeInsightFixtureTest
*/
public void testRefToStdlib() {
PsiElement navigationElement = configureAndResolve("fun foo() { <caret>println() }");
assertSame(JetLanguage.INSTANCE, navigationElement.getLanguage());
assertSame(KotlinLanguage.INSTANCE, navigationElement.getLanguage());
}
/**
@@ -57,7 +57,7 @@ public class NavigateToLibraryRegressionTest extends LightCodeInsightFixtureTest
public void testRefToFunctionWithVararg() {
PsiElement navigationElement = configureAndResolve("val x = <caret>arrayListOf(\"\", \"\")");
assertSame(JetLanguage.INSTANCE, navigationElement.getLanguage());
assertSame(KotlinLanguage.INSTANCE, navigationElement.getLanguage());
}
@NotNull
idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocInHierarchyTest.kt
+2 -2
View File
@@ -28,7 +28,7 @@ import com.intellij.psi.PsiClass
import com.intellij.psi.PsiElement
import com.intellij.testFramework.MapDataContext
import junit.framework.TestCase
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.KotlinQuickDocumentationProvider
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
@@ -46,7 +46,7 @@ public class QuickDocInHierarchyTest() : CodeInsightTestCase() {
val hierarchyTreeStructure = TypeHierarchyTreeStructure(
getProject(),
LanguageTypeHierarchy.INSTANCE.forLanguage(JetLanguage.INSTANCE).getTarget(context) as PsiClass?,
LanguageTypeHierarchy.INSTANCE.forLanguage(KotlinLanguage.INSTANCE).getTarget(context) as PsiClass?,
HierarchyBrowserBaseEx.SCOPE_PROJECT
)
val hierarchyNodeDescriptor = hierarchyTreeStructure.getBaseDescriptor() as TypeHierarchyNodeDescriptor
j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
+2 -2
View File
@@ -23,7 +23,7 @@ import com.intellij.openapi.progress.*
import com.intellij.openapi.project.Project
import com.intellij.psi.*
import com.intellij.psi.impl.source.DummyHolder
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.j2k.ast.Element
import org.jetbrains.kotlin.j2k.usageProcessing.ExternalCodeProcessor
import org.jetbrains.kotlin.j2k.usageProcessing.UsageProcessing
@@ -192,7 +192,7 @@ public class JavaToKotlinConverter(
for ((reference, target, file, processings) in fileRefs.sortBy(ReferenceComparator)) {
val processors = when (reference.getElement().getLanguage()) {
JavaLanguage.INSTANCE -> processings.map { it.javaCodeProcessor }.filterNotNull()
JetLanguage.INSTANCE -> processings.map { it.kotlinCodeProcessor }.filterNotNull()
KotlinLanguage.INSTANCE -> processings.map { it.kotlinCodeProcessor }.filterNotNull()
else -> continue@ReferenceLoop
}
js/js.frontend/src/org/jetbrains/kotlin/js/patterns/PatternBuilder.java
+2 -2
View File
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.resolve.DescriptorUtils;
import org.jetbrains.kotlin.resolve.OverrideResolver;
@@ -37,7 +37,7 @@ public final class PatternBuilder {
private static final NamePredicate KOTLIN_NAME_PREDICATE = new NamePredicate("kotlin");
@NotNull
private static final Name KOTLIN_NAME = Name.identifier(JetLanguage.NAME.toLowerCase());
private static final Name KOTLIN_NAME = Name.identifier(KotlinLanguage.NAME.toLowerCase());
private PatternBuilder() {
}
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java
+2 -3
View File
@@ -21,11 +21,10 @@ import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties;
import com.google.dart.compiler.backend.js.ast.metadata.TypeCheck;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.descriptors.CallableDescriptor;
import org.jetbrains.kotlin.descriptors.ClassDescriptor;
import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.js.resolve.JsPlatform;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.FqNameUnsafe;
@@ -42,7 +41,7 @@ import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getSuggested
* Encapsulates different types of constants and naming conventions.
*/
public final class Namer {
public static final String KOTLIN_NAME = JetLanguage.NAME;
public static final String KOTLIN_NAME = KotlinLanguage.NAME;
public static final String KOTLIN_LOWER_NAME = KOTLIN_NAME.toLowerCase();
public static final JsNameRef KOTLIN_OBJECT_REF = new JsNameRef(KOTLIN_NAME);
public static final JsNameRef KOTLIN_LONG_NAME_REF = new JsNameRef("Long", KOTLIN_OBJECT_REF);