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

Rename jet -> kotlin in idea: JetBundle

Browse Source
This commit is contained in:
Alexander Udalov
2015-01-11 04:16:34 +03:00
parent 9f4513dd75
commit 36a469ccd5
105 changed files with 141 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.psi.PsiFile import com.intellij.psi.PsiFile
import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetElement
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypesAndPredicate import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypesAndPredicate
import com.intellij.codeInsight.intention.IntentionAction import com.intellij.codeInsight.intention.IntentionAction
idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt
+1 -2
View File
@@ -27,9 +27,8 @@ import org.jetbrains.kotlin.psi.JetBinaryExpression
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.psi.JetPsiUtil
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetPsiFactory
import com.intellij.psi.PsiElement
public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingIntention<JetPrefixExpression>("simplify.negated.binary.expression", javaClass()) { public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingIntention<JetPrefixExpression>("simplify.negated.binary.expression", javaClass()) {
idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt
+1 -1
View File
@@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.diagnostics.DiagnosticFactory import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import com.intellij.codeInspection.SuppressIntentionAction import com.intellij.codeInspection.SuppressIntentionAction
idea/idea-analysis/src/org/jetbrains/jet/plugin/JetBundle.java → idea/idea-analysis/src/org/jetbrains/kotlin/plugin/JetBundle.java
+12 -12
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2013 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.plugin; package org.jetbrains.kotlin.plugin;
import com.intellij.CommonBundle; import com.intellij.CommonBundle;
import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NonNls;
@@ -29,23 +29,23 @@ public class JetBundle {
private static Reference<ResourceBundle> ourBundle; private static Reference<ResourceBundle> ourBundle;
@NonNls @NonNls
private static final String BUNDLE = "org.jetbrains.jet.plugin.JetBundle"; private static final String BUNDLE = "org.jetbrains.kotlin.plugin.JetBundle";
private JetBundle() { private JetBundle() {
} }
@NotNull @NotNull
public static String message(@NonNls @PropertyKey(resourceBundle = BUNDLE)String key, Object... params) { public static String message(@NonNls @PropertyKey(resourceBundle = BUNDLE) String key, Object... params) {
return CommonBundle.message(getBundle(), key, params); return CommonBundle.message(getBundle(), key, params);
} }
private static ResourceBundle getBundle() { private static ResourceBundle getBundle() {
ResourceBundle bundle = null; ResourceBundle bundle = null;
if (ourBundle != null) bundle = ourBundle.get(); if (ourBundle != null) bundle = ourBundle.get();
if (bundle == null) { if (bundle == null) {
bundle = ResourceBundle.getBundle(BUNDLE); bundle = ResourceBundle.getBundle(BUNDLE);
ourBundle = new SoftReference<ResourceBundle>(bundle); ourBundle = new SoftReference<ResourceBundle>(bundle);
} }
return bundle; return bundle;
} }
} }
idea/idea-analysis/src/org/jetbrains/jet/plugin/JetBundle.properties → idea/idea-analysis/src/org/jetbrains/kotlin/plugin/JetBundle.properties
View File
idea/resources/liveTemplates/Kotlin.xml
+18 -18
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<templateSet group="Kotlin"> <templateSet group="Kotlin">
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.main" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.main"
name="main" toReformat="true" toShortenFQNames="true" name="main" toReformat="true" toShortenFQNames="true"
value="fun main(args : Array&lt;String&gt;) {&#10; $END$&#10;}"> value="fun main(args : Array&lt;String&gt;) {&#10; $END$&#10;}">
<context> <context>
@@ -31,7 +31,7 @@
<option name="KOTLIN_STATEMENT" value="true" /> <option name="KOTLIN_STATEMENT" value="true" />
</context> </context>
</template> </template>
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.soutp" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.soutp"
name="soutp" toReformat="true" toShortenFQNames="true" value="println($FORMAT$)"> name="soutp" toReformat="true" toShortenFQNames="true" value="println($FORMAT$)">
<variable alwaysStopAt="false" defaultValue="" expression="groovyScript(&quot;'\&quot;' + _1.collect { it + ' = [${' + it + '}]'}.join(', ') + '\&quot;'&quot;, functionParameters())" <variable alwaysStopAt="false" defaultValue="" expression="groovyScript(&quot;'\&quot;' + _1.collect { it + ' = [${' + it + '}]'}.join(', ') + '\&quot;'&quot;, functionParameters())"
name="FORMAT" /> name="FORMAT" />
@@ -39,7 +39,7 @@
<option name="KOTLIN_STATEMENT" value="true"/> <option name="KOTLIN_STATEMENT" value="true"/>
</context> </context>
</template> </template>
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.iter" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.iter"
name="iter" toReformat="true" toShortenFQNames="true" name="iter" toReformat="true" toShortenFQNames="true"
value="for ($VAR$ in $ITERABLE$) {&#10;$END$&#10;}"> value="for ($VAR$ in $ITERABLE$) {&#10;$END$&#10;}">
<variable alwaysStopAt="true" defaultValue="&quot;iterable&quot;" expression="kotlinIterableVariable()" name="ITERABLE" /> <variable alwaysStopAt="true" defaultValue="&quot;iterable&quot;" expression="kotlinIterableVariable()" name="ITERABLE" />
@@ -48,7 +48,7 @@
<option name="KOTLIN_STATEMENT" value="true" /> <option name="KOTLIN_STATEMENT" value="true" />
</context> </context>
</template> </template>
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.ifn" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.ifn"
name="ifn" toReformat="true" toShortenFQNames="true" name="ifn" toReformat="true" toShortenFQNames="true"
value="if ($VAR$ == null) {&#10;$END$&#10;}"> value="if ($VAR$ == null) {&#10;$END$&#10;}">
<variable alwaysStopAt="true" defaultValue="&quot;i&quot;" expression="kotlinSuggestVariableName()" name="VAR" /> <variable alwaysStopAt="true" defaultValue="&quot;i&quot;" expression="kotlinSuggestVariableName()" name="VAR" />
@@ -56,7 +56,7 @@
<option name="KOTLIN_EXPRESSION" value="true" /> <option name="KOTLIN_EXPRESSION" value="true" />
</context> </context>
</template> </template>
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.inn" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.inn"
name="inn" toReformat="true" toShortenFQNames="true" name="inn" toReformat="true" toShortenFQNames="true"
value="if ($VAR$ != null) {&#10;$END$&#10;}"> value="if ($VAR$ != null) {&#10;$END$&#10;}">
<variable alwaysStopAt="true" defaultValue="&quot;i&quot;" expression="kotlinSuggestVariableName()" name="VAR" /> <variable alwaysStopAt="true" defaultValue="&quot;i&quot;" expression="kotlinSuggestVariableName()" name="VAR" />
@@ -64,7 +64,7 @@
<option name="KOTLIN_EXPRESSION" value="true" /> <option name="KOTLIN_EXPRESSION" value="true" />
</context> </context>
</template> </template>
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.void" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.void"
name="void" toReformat="true" toShortenFQNames="true" value="fun $NAME$($PARAMS$) {&#10;$END$&#10;}"> name="void" toReformat="true" toShortenFQNames="true" value="fun $NAME$($PARAMS$) {&#10;$END$&#10;}">
<variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" /> <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
<variable alwaysStopAt="true" defaultValue="" expression="" name="PARAMS" /> <variable alwaysStopAt="true" defaultValue="" expression="" name="PARAMS" />
@@ -74,7 +74,7 @@
<option name="KOTLIN_TOPLEVEL" value="true"/> <option name="KOTLIN_TOPLEVEL" value="true"/>
</context> </context>
</template> </template>
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.fun0" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.fun0"
name="fun0" toReformat="true" toShortenFQNames="true" value="fun $NAME$() : $RETURN$ {&#10;$END$&#10;}"> name="fun0" toReformat="true" toShortenFQNames="true" value="fun $NAME$() : $RETURN$ {&#10;$END$&#10;}">
<variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" /> <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
<variable alwaysStopAt="true" defaultValue="&quot;Unit&quot;" expression="" name="RETURN" /> <variable alwaysStopAt="true" defaultValue="&quot;Unit&quot;" expression="" name="RETURN" />
@@ -84,7 +84,7 @@
<option name="KOTLIN_TOPLEVEL" value="true"/> <option name="KOTLIN_TOPLEVEL" value="true"/>
</context> </context>
</template> </template>
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.fun1" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.fun1"
name="fun1" toReformat="true" toShortenFQNames="true" name="fun1" toReformat="true" toShortenFQNames="true"
value="fun $NAME$($PARAM1$ : $PARAM1TYPE$) : $RETURN$ {&#10;$END$&#10;}"> value="fun $NAME$($PARAM1$ : $PARAM1TYPE$) : $RETURN$ {&#10;$END$&#10;}">
<variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" /> <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
@@ -97,7 +97,7 @@
<option name="KOTLIN_TOPLEVEL" value="true"/> <option name="KOTLIN_TOPLEVEL" value="true"/>
</context> </context>
</template> </template>
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.fun2" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.fun2"
name="fun2" toReformat="true" toShortenFQNames="true" name="fun2" toReformat="true" toShortenFQNames="true"
value="fun $NAME$($PARAM1$ : $PARAM1TYPE$, $PARAM2$ : $PARAM2TYPE$) : $RETURN$ {&#10;$END$&#10;}"> value="fun $NAME$($PARAM1$ : $PARAM1TYPE$, $PARAM2$ : $PARAM2TYPE$) : $RETURN$ {&#10;$END$&#10;}">
<variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" /> <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
@@ -113,7 +113,7 @@
</context> </context>
</template> </template>
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.interface" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.interface"
name="interface" toReformat="true" toShortenFQNames="true" value="trait $NAME$ {&#10;$END$&#10;}"> name="interface" toReformat="true" toShortenFQNames="true" value="trait $NAME$ {&#10;$END$&#10;}">
<variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" /> <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
<context> <context>
@@ -122,7 +122,7 @@
<option name="KOTLIN_TOPLEVEL" value="true"/> <option name="KOTLIN_TOPLEVEL" value="true"/>
</context> </context>
</template> </template>
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.singleton" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.singleton"
name="singleton" toReformat="true" toShortenFQNames="true" value="object $NAME$ {&#10;$END$&#10;}"> name="singleton" toReformat="true" toShortenFQNames="true" value="object $NAME$ {&#10;$END$&#10;}">
<variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" /> <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
<context> <context>
@@ -132,7 +132,7 @@
</context> </context>
</template> </template>
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.closure" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.closure"
name="closure" toReformat="true" toShortenFQNames="true" value="{$PARAM$ -> $PARAM_COPY$}"> name="closure" toReformat="true" toShortenFQNames="true" value="{$PARAM$ -> $PARAM_COPY$}">
<variable alwaysStopAt="true" defaultValue="&quot;x&quot;" expression="" name="PARAM" /> <variable alwaysStopAt="true" defaultValue="&quot;x&quot;" expression="" name="PARAM" />
<variable alwaysStopAt="true" defaultValue="" expression="PARAM" name="PARAM_COPY" /> <variable alwaysStopAt="true" defaultValue="" expression="PARAM" name="PARAM_COPY" />
@@ -141,7 +141,7 @@
<option name="KOTLIN_EXPRESSION" value="true"/> <option name="KOTLIN_EXPRESSION" value="true"/>
</context> </context>
</template> </template>
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.anonymous" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.anonymous"
name="anonymous" toReformat="true" toShortenFQNames="true" value="object : $SUPERTYPE$ {&#10;$END$&#10;}"> name="anonymous" toReformat="true" toShortenFQNames="true" value="object : $SUPERTYPE$ {&#10;$END$&#10;}">
<variable alwaysStopAt="true" defaultValue="&quot;Object&quot;" expression="anonymousSuper()" name="SUPERTYPE" /> <variable alwaysStopAt="true" defaultValue="&quot;Object&quot;" expression="anonymousSuper()" name="SUPERTYPE" />
<context> <context>
@@ -150,7 +150,7 @@
</context> </context>
</template> </template>
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.exfun" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.exfun"
name="exfun" toReformat="true" toShortenFQNames="true" name="exfun" toReformat="true" toShortenFQNames="true"
value="fun $RECEIVER$.$NAME$($PARAMS$) : $RETURN$ {&#10;$END$&#10;}"> value="fun $RECEIVER$.$NAME$($PARAMS$) : $RETURN$ {&#10;$END$&#10;}">
<variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" /> <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
@@ -162,7 +162,7 @@
<option name="KOTLIN_TOPLEVEL" value="true"/> <option name="KOTLIN_TOPLEVEL" value="true"/>
</context> </context>
</template> </template>
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.exval" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.exval"
name="exval" toReformat="true" toShortenFQNames="true" name="exval" toReformat="true" toShortenFQNames="true"
value="val $RECEIVER$.$NAME$ : $TYPE$&#10;get() {&#10;$END$&#10;}"> value="val $RECEIVER$.$NAME$ : $TYPE$&#10;get() {&#10;$END$&#10;}">
<variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" /> <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
@@ -173,7 +173,7 @@
<option name="KOTLIN_TOPLEVEL" value="true"/> <option name="KOTLIN_TOPLEVEL" value="true"/>
</context> </context>
</template> </template>
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.exvar" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.exvar"
name="exvar" toReformat="true" toShortenFQNames="true" name="exvar" toReformat="true" toShortenFQNames="true"
value="var $RECEIVER$.$NAME$ : $TYPE$&#10;get() {&#10;$END$&#10;}&#10;set(value) {&#10; &#10;}"> value="var $RECEIVER$.$NAME$ : $TYPE$&#10;get() {&#10;$END$&#10;}&#10;set(value) {&#10; &#10;}">
<variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" /> <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
@@ -189,7 +189,7 @@
<!-- Synonyms --> <!-- Synonyms -->
<!-- Synonym for main --> <!-- Synonym for main -->
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.main" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.main"
name="psvm" toReformat="true" toShortenFQNames="true" name="psvm" toReformat="true" toShortenFQNames="true"
value="fun main(args : Array&lt;String&gt;) {&#10; $END$&#10;}"> value="fun main(args : Array&lt;String&gt;) {&#10; $END$&#10;}">
<context> <context>
@@ -198,7 +198,7 @@
</template> </template>
<!-- Synonym for anonymous --> <!-- Synonym for anonymous -->
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.anonymous" <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.anonymous"
name="object" id="kt-object" toReformat="true" toShortenFQNames="true" value="object : $SUPERTYPE$ {&#10;$END$&#10;}"> name="object" id="kt-object" toReformat="true" toShortenFQNames="true" value="object : $SUPERTYPE$ {&#10;$END$&#10;}">
<variable alwaysStopAt="true" defaultValue="&quot;Object&quot;" expression="anonymousSuper()" name="SUPERTYPE" /> <variable alwaysStopAt="true" defaultValue="&quot;Object&quot;" expression="anonymousSuper()" name="SUPERTYPE" />
<context> <context>
idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java
+1 -1
View File
@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.psi.JetNamedFunction;
import org.jetbrains.kotlin.psi.JetPsiFactory; import org.jetbrains.kotlin.psi.JetPsiFactory;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil; import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil;
import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java
+1 -1
View File
@@ -34,7 +34,7 @@ import com.intellij.util.PlatformIcons;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper; import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper;
import javax.swing.*; import javax.swing.*;
idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java
+1 -1
View File
@@ -30,7 +30,7 @@ import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFile;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.plugin.JetFileType;
import org.jetbrains.jet.plugin.JetIcons; import org.jetbrains.jet.plugin.JetIcons;
import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils; import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils;
idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java
+1 -1
View File
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
import org.jetbrains.kotlin.resolve.OverrideResolver; import org.jetbrains.kotlin.resolve.OverrideResolver;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import java.util.Collection; import java.util.Collection;
idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor;
import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassDescriptor;
import org.jetbrains.kotlin.resolve.OverrideResolver; import org.jetbrains.kotlin.resolve.OverrideResolver;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import java.util.Set; import java.util.Set;
idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinSurrounderUtils.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetBlockExpression;
import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetExpression;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils; import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils;
idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt
+1 -1
View File
@@ -42,7 +42,7 @@ import org.jetbrains.jet.plugin.caches.resolve.analyzeFully
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.TypeUtils
import org.jetbrains.kotlin.types.checker.JetTypeChecker import org.jetbrains.kotlin.types.checker.JetTypeChecker
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
public class KotlinRuntimeTypeCastSurrounder: KotlinExpressionSurrounder() { public class KotlinRuntimeTypeCastSurrounder: KotlinExpressionSurrounder() {
idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetConstantExpression;
import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetExpression;
import org.jetbrains.kotlin.psi.JetStringTemplateEntry; import org.jetbrains.kotlin.psi.JetStringTemplateEntry;
import org.jetbrains.kotlin.psi.JetStringTemplateExpression; import org.jetbrains.kotlin.psi.JetStringTemplateExpression;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.JetWhenCondition;
import org.jetbrains.kotlin.psi.JetWhenEntry; import org.jetbrains.kotlin.psi.JetWhenEntry;
import org.jetbrains.kotlin.psi.JetWhenExpression; import org.jetbrains.kotlin.psi.JetWhenExpression;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils; import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java
+1 -1
View File
@@ -23,7 +23,7 @@ import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils; import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils;
import org.jetbrains.jet.plugin.codeInsight.surroundWith.MoveDeclarationsOutHelper; import org.jetbrains.jet.plugin.codeInsight.surroundWith.MoveDeclarationsOutHelper;
idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinUnwrapRemoveBase.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.psi.JetBlockExpression; import org.jetbrains.kotlin.psi.JetBlockExpression;
import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetElement;
import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetExpression;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil; import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
import java.util.List; import java.util.List;
idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.form
+10 -10
View File
@@ -27,7 +27,7 @@
</constraints> </constraints>
<properties> <properties>
<selected value="false"/> <selected value="false"/>
<text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.option.generate.no.warnings"/> <text resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="kotlin.compiler.option.generate.no.warnings"/>
</properties> </properties>
</component> </component>
<component id="ba279" class="javax.swing.JLabel" binding="additionalArgsLabel"> <component id="ba279" class="javax.swing.JLabel" binding="additionalArgsLabel">
@@ -35,7 +35,7 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/> <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints> </constraints>
<properties> <properties>
<text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters"/> <text resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters"/>
</properties> </properties>
</component> </component>
<component id="7a827" class="com.intellij.ui.RawCommandLineEditor" binding="additionalArgsOptionsField"> <component id="7a827" class="com.intellij.ui.RawCommandLineEditor" binding="additionalArgsOptionsField">
@@ -45,7 +45,7 @@
</grid> </grid>
</constraints> </constraints>
<properties> <properties>
<dialogCaption resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters.dialog.title"/> <dialogCaption resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters.dialog.title"/>
</properties> </properties>
</component> </component>
</children> </children>
@@ -61,7 +61,7 @@
<clientProperties> <clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/> <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
</clientProperties> </clientProperties>
<border type="etched" title-resource-bundle="org/jetbrains/jet/plugin/JetBundle" title-key="kotlin.compiler.jvm.option.panel.title"/> <border type="etched" title-resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" title-key="kotlin.compiler.jvm.option.panel.title"/>
<children> <children>
<component id="c6928" class="javax.swing.JCheckBox" binding="incrementalCompilationCheckBox"> <component id="c6928" class="javax.swing.JCheckBox" binding="incrementalCompilationCheckBox">
<constraints> <constraints>
@@ -84,14 +84,14 @@
<clientProperties> <clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/> <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
</clientProperties> </clientProperties>
<border type="etched" title-resource-bundle="org/jetbrains/jet/plugin/JetBundle" title-key="kotlin.compiler.js.option.panel.title"/> <border type="etched" title-resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" title-key="kotlin.compiler.js.option.panel.title"/>
<children> <children>
<component id="1fbe0" class="javax.swing.JCheckBox" binding="generateSourceMapsCheckBox" default-binding="true"> <component id="1fbe0" class="javax.swing.JCheckBox" binding="generateSourceMapsCheckBox" default-binding="true">
<constraints> <constraints>
<grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/> <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints> </constraints>
<properties> <properties>
<text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.js.option.generate.sourcemaps"/> <text resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="kotlin.compiler.js.option.generate.sourcemaps"/>
</properties> </properties>
</component> </component>
<component id="3ac8f" class="javax.swing.JLabel" binding="labelForOutputPrefixFile"> <component id="3ac8f" class="javax.swing.JLabel" binding="labelForOutputPrefixFile">
@@ -101,7 +101,7 @@
</grid> </grid>
</constraints> </constraints>
<properties> <properties>
<text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.js.option.output.prefix"/> <text resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="kotlin.compiler.js.option.output.prefix"/>
</properties> </properties>
</component> </component>
<component id="2d5b" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="outputPrefixFile"> <component id="2d5b" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="outputPrefixFile">
@@ -117,7 +117,7 @@
</grid> </grid>
</constraints> </constraints>
<properties> <properties>
<text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.js.option.output.postfix"/> <text resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="kotlin.compiler.js.option.output.postfix"/>
</properties> </properties>
</component> </component>
<component id="1292b" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="outputPostfixFile"> <component id="1292b" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="outputPostfixFile">
@@ -131,7 +131,7 @@
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/> <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints> </constraints>
<properties> <properties>
<text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.js.option.output.copy.dir"/> <text resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="kotlin.compiler.js.option.output.copy.dir"/>
</properties> </properties>
</component> </component>
<component id="f1f6b" class="javax.swing.JTextField" binding="outputDirectory"> <component id="f1f6b" class="javax.swing.JTextField" binding="outputDirectory">
@@ -149,7 +149,7 @@
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/> <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints> </constraints>
<properties> <properties>
<text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.js.option.output.copy.files"/> <text resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="kotlin.compiler.js.option.output.copy.files"/>
</properties> </properties>
</component> </component>
</children> </children>
idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java
+1 -1
View File
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments;
import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.kotlin.config.CompilerSettings; import org.jetbrains.kotlin.config.CompilerSettings;
import javax.swing.*; import javax.swing.*;
idea/src/org/jetbrains/jet/plugin/debugger/KotlinSteppingConfigurableUi.form
+1 -1
View File
@@ -14,7 +14,7 @@
</constraints> </constraints>
<properties> <properties>
<selected value="false"/> <selected value="false"/>
<text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="debugger.filter.ignore.internal.classes"/> <text resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="debugger.filter.ignore.internal.classes"/>
</properties> </properties>
</component> </component>
<vspacer id="c37da"> <vspacer id="c37da">
idea/src/org/jetbrains/jet/plugin/findUsages/JetUsageTypeProvider.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement
import com.intellij.usages.UsageTarget import com.intellij.usages.UsageTarget
import com.intellij.usages.impl.rules.UsageType import com.intellij.usages.impl.rules.UsageType
import com.intellij.usages.impl.rules.UsageTypeProviderEx import com.intellij.usages.impl.rules.UsageTypeProviderEx
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import org.jetbrains.jet.plugin.findUsages.UsageTypeEnum.* import org.jetbrains.jet.plugin.findUsages.UsageTypeEnum.*
public object JetUsageTypeProvider : UsageTypeProviderEx { public object JetUsageTypeProvider : UsageTypeProviderEx {
idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindClassUsagesDialog.java
+1 -1
View File
@@ -26,7 +26,7 @@ import com.intellij.psi.PsiClass;
import com.intellij.ui.SimpleColoredComponent; import com.intellij.ui.SimpleColoredComponent;
import com.intellij.ui.StateRestoringCheckBox; import com.intellij.ui.StateRestoringCheckBox;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.findUsages.KotlinClassFindUsagesOptions; import org.jetbrains.jet.plugin.findUsages.KotlinClassFindUsagesOptions;
import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil; import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration;
idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java
+1 -2
View File
@@ -24,8 +24,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiMethod;
import com.intellij.ui.SimpleColoredComponent; import com.intellij.ui.SimpleColoredComponent;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.findUsages.KotlinFunctionFindUsagesOptions; import org.jetbrains.jet.plugin.findUsages.KotlinFunctionFindUsagesOptions;
import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil; import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java
+1 -1
View File
@@ -28,7 +28,7 @@ import com.intellij.ui.StateRestoringCheckBox;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.kotlin.psi.JetNamedDeclaration;
import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.findUsages.KotlinPropertyFindUsagesOptions; import org.jetbrains.jet.plugin.findUsages.KotlinPropertyFindUsagesOptions;
import javax.swing.*; import javax.swing.*;
idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import javax.swing.JPanel
import com.intellij.ide.hierarchy.HierarchyTreeStructure import com.intellij.ide.hierarchy.HierarchyTreeStructure
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import org.jetbrains.jet.plugin.hierarchy.HierarchyUtils import org.jetbrains.jet.plugin.hierarchy.HierarchyUtils
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import com.intellij.ide.hierarchy.method.MethodHierarchyBrowser import com.intellij.ide.hierarchy.method.MethodHierarchyBrowser
import org.jetbrains.kotlin.asJava.getRepresentativeLightMethod import org.jetbrains.kotlin.asJava.getRepresentativeLightMethod
import com.intellij.psi.PsiMethod import com.intellij.psi.PsiMethod
idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java
+1 -1
View File
@@ -23,7 +23,7 @@ import com.intellij.openapi.options.colors.AttributesDescriptor;
import com.intellij.openapi.options.colors.ColorDescriptor; import com.intellij.openapi.options.colors.ColorDescriptor;
import com.intellij.openapi.options.colors.ColorSettingsPage; import com.intellij.openapi.options.colors.ColorSettingsPage;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.JetIcons; import org.jetbrains.jet.plugin.JetIcons;
import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.jet.plugin.JetLanguage;
idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.highlighter.markers
import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.psi.JetProperty
import com.intellij.psi.search.PsiElementProcessor import com.intellij.psi.search.PsiElementProcessor
import com.intellij.psi.PsiClass import com.intellij.psi.PsiClass
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import com.intellij.psi.search.searches.OverridingMethodsSearch import com.intellij.psi.search.searches.OverridingMethodsSearch
import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.kotlin.asJava.LightClassUtil
import com.intellij.psi.PsiMethod import com.intellij.psi.PsiMethod
idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt
+1 -1
View File
@@ -28,7 +28,7 @@ import java.awt.event.MouseEvent
import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.codeInsight.daemon.impl.PsiElementListNavigator import com.intellij.codeInsight.daemon.impl.PsiElementListNavigator
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import org.jetbrains.jet.plugin.codeInsight.JetFunctionPsiElementCellRenderer import org.jetbrains.jet.plugin.codeInsight.JetFunctionPsiElementCellRenderer
import org.jetbrains.annotations.TestOnly import org.jetbrains.annotations.TestOnly
import com.intellij.codeInsight.daemon.GutterIconNavigationHandler import com.intellij.codeInsight.daemon.GutterIconNavigationHandler
idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt
+1 -1
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.JetExpression
import org.jetbrains.kotlin.psi.JetConstantExpression import org.jetbrains.kotlin.psi.JetConstantExpression
import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.JetSimpleNameExpression
import java.util.LinkedList import java.util.LinkedList
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
public class ConvertNegatedExpressionWithDemorgansLawIntention : JetSelfTargetingIntention<JetPrefixExpression>( public class ConvertNegatedExpressionWithDemorgansLawIntention : JetSelfTargetingIntention<JetPrefixExpression>(
"convert.negated.expression.with.demorgans.law", javaClass() "convert.negated.expression.with.demorgans.law", javaClass()
idea/src/org/jetbrains/jet/plugin/intentions/ConvertToBlockBodyAction.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.lexer.JetTokens
idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
idea/src/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import com.intellij.util.IncorrectOperationException
import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetExpression
import org.jetbrains.kotlin.psi.JetParenthesizedExpression import org.jetbrains.kotlin.psi.JetParenthesizedExpression
import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.psi.JetPsiUtil
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
public class RemoveUnnecessaryParenthesesIntention : JetSelfTargetingIntention<JetParenthesizedExpression>( public class RemoveUnnecessaryParenthesesIntention : JetSelfTargetingIntention<JetParenthesizedExpression>(
"remove.unnecessary.parentheses", javaClass() "remove.unnecessary.parentheses", javaClass()
idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil
import com.intellij.refactoring.rename.RenameProcessor import com.intellij.refactoring.rename.RenameProcessor
import com.intellij.usageView.UsageInfo import com.intellij.usageView.UsageInfo
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import com.intellij.psi.codeStyle.CodeStyleManager import com.intellij.psi.codeStyle.CodeStyleManager
import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor
import org.jetbrains.jet.plugin.references.JetReference import org.jetbrains.jet.plugin.references.JetReference
idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt
+1 -1
View File
@@ -25,7 +25,7 @@ import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler
import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression
import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetPsiFactory
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.JetSimpleNameExpression
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.kotlin.psi.JetFunctionLiteral
idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt
+1 -1
View File
@@ -21,7 +21,7 @@ import com.intellij.openapi.editor.Editor
import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.kotlin.psi.JetDotQualifiedExpression
import org.jetbrains.jet.plugin.caches.resolve.analyzeFully import org.jetbrains.jet.plugin.caches.resolve.analyzeFully
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import org.jetbrains.kotlin.psi.JetValueArgument import org.jetbrains.kotlin.psi.JetValueArgument
import org.jetbrains.kotlin.psi.JetPsiUnparsingUtils import org.jetbrains.kotlin.psi.JetPsiUnparsingUtils
import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetPsiFactory
idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
+1 -1
View File
@@ -40,7 +40,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils;
import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.ErrorUtils;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.TypeUtils;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.psi.ValueArgument import org.jetbrains.kotlin.psi.ValueArgument
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument
import org.jetbrains.kotlin.resolve.calls.model.VarargValueArgument import org.jetbrains.kotlin.resolve.calls.model.VarargValueArgument
import org.jetbrains.jet.plugin.util.Maybe import org.jetbrains.jet.plugin.util.Maybe
idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.jet.plugin.intentions.JetTypeLookupExpression
import com.intellij.codeInsight.template.TemplateEditingAdapter import com.intellij.codeInsight.template.TemplateEditingAdapter
import com.intellij.codeInsight.template.impl.TemplateManagerImpl import com.intellij.codeInsight.template.impl.TemplateManagerImpl
import com.intellij.codeInsight.template.Template import com.intellij.codeInsight.template.Template
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import org.jetbrains.jet.plugin.intentions.branchedTransformations.convertToIfNotNullExpression import org.jetbrains.jet.plugin.intentions.branchedTransformations.convertToIfNotNullExpression
import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetPsiFactory
import org.jetbrains.jet.plugin.intentions.branchedTransformations.introduceValueForCondition import org.jetbrains.jet.plugin.intentions.branchedTransformations.introduceValueForCondition
idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.JetPostfixExpression
import org.jetbrains.jet.plugin.intentions.branchedTransformations.inlineBaseExpressionIfApplicableWithPrompt import org.jetbrains.jet.plugin.intentions.branchedTransformations.inlineBaseExpressionIfApplicableWithPrompt
import org.jetbrains.jet.plugin.intentions.branchedTransformations.extractExpressionIfSingle import org.jetbrains.jet.plugin.intentions.branchedTransformations.extractExpressionIfSingle
import org.jetbrains.kotlin.psi.JetThrowExpression import org.jetbrains.kotlin.psi.JetThrowExpression
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import org.jetbrains.jet.plugin.intentions.branchedTransformations.isNullExpressionOrEmptyBlock import org.jetbrains.jet.plugin.intentions.branchedTransformations.isNullExpressionOrEmptyBlock
import org.jetbrains.jet.plugin.intentions.branchedTransformations.throwsNullPointerExceptionWithNoArguments import org.jetbrains.jet.plugin.intentions.branchedTransformations.throwsNullPointerExceptionWithNoArguments
import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStatement import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStatement
idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java
+1 -1
View File
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import java.util.List; import java.util.List;
idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java
+1 -1
View File
@@ -41,7 +41,7 @@ import org.jetbrains.kotlin.resolve.jvm.JvmPackage;
import org.jetbrains.kotlin.load.java.structure.impl.JavaConstructorImpl; import org.jetbrains.kotlin.load.java.structure.impl.JavaConstructorImpl;
import org.jetbrains.kotlin.load.java.structure.impl.JavaFieldImpl; import org.jetbrains.kotlin.load.java.structure.impl.JavaFieldImpl;
import org.jetbrains.kotlin.load.java.structure.impl.JavaMethodImpl; import org.jetbrains.kotlin.load.java.structure.impl.JavaMethodImpl;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.JetIcons; import org.jetbrains.jet.plugin.JetIcons;
import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension; import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension;
import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java
+1 -1
View File
@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter;
import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.resolve.scopes.JetScope;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import java.util.ArrayList; import java.util.ArrayList;
idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java
+1 -1
View File
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.descriptors.VariableDescriptor;
import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.resolve.scopes.JetScope;
import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
public class JetAnyVariableMacro extends BaseJetVariableMacro { public class JetAnyVariableMacro extends BaseJetVariableMacro {
@Override @Override
idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetFunctionParametersMacro.java
+1 -1
View File
@@ -24,7 +24,7 @@ import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.psi.JetFunction; import org.jetbrains.kotlin.psi.JetFunction;
import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.psi.JetParameter;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java
+1 -1
View File
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.descriptors.VariableDescriptor;
import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.resolve.scopes.JetScope;
import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
public class JetIterableVariableMacro extends BaseJetVariableMacro { public class JetIterableVariableMacro extends BaseJetVariableMacro {
idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java
+1 -1
View File
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.descriptors.VariableDescriptor;
import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.resolve.scopes.JetScope;
import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
public class JetSuggestVariableNameMacro extends BaseJetVariableMacro { public class JetSuggestVariableNameMacro extends BaseJetVariableMacro {
@Override @Override
idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionBodyFix.java
+1 -1
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetFunction; import org.jetbrains.kotlin.psi.JetFunction;
import org.jetbrains.kotlin.psi.JetPsiFactory; import org.jetbrains.kotlin.psi.JetPsiFactory;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java
+1 -1
View File
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.psi.ValueArgument;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.types.checker.JetTypeChecker;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.refactoring.JetNameValidator; import org.jetbrains.jet.plugin.refactoring.JetNameValidator;
import org.jetbrains.jet.plugin.refactoring.SimpleCollectingValidator; import org.jetbrains.jet.plugin.refactoring.SimpleCollectingValidator;
idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java
+1 -1
View File
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.TypeUtils;
import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.types.checker.JetTypeChecker;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.actions.JetAddFunctionToClassifierAction; import org.jetbrains.jet.plugin.actions.JetAddFunctionToClassifierAction;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java
+1 -1
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.JetModifierListOwner;
import org.jetbrains.kotlin.psi.JetPropertyAccessor; import org.jetbrains.kotlin.psi.JetPropertyAccessor;
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.kotlin.lexer.JetTokens.ABSTRACT_KEYWORD; import static org.jetbrains.kotlin.lexer.JetTokens.ABSTRACT_KEYWORD;
idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java
+1 -1
View File
@@ -42,7 +42,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage;
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.types.checker.JetTypeChecker;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.JetIcons; import org.jetbrains.jet.plugin.JetIcons;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
idea/src/org/jetbrains/jet/plugin/quickfix/AddOpenModifierToClassDeclarationFix.java
+1 -1
View File
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.kotlin.psi.JetSimpleNameExpression;
import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.kotlin.psi.JetTypeReference;
import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
public class AddOpenModifierToClassDeclarationFix extends JetIntentionAction<JetTypeReference> { public class AddOpenModifierToClassDeclarationFix extends JetIntentionAction<JetTypeReference> {
private JetClass classDeclaration; private JetClass classDeclaration;
idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.Errors;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.project.PluginJetFilesProvider; import org.jetbrains.jet.plugin.project.PluginJetFilesProvider;
idea/src/org/jetbrains/jet/plugin/quickfix/AddSemicolonAfterFunctionCallFix.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/AddStarProjectionsFix.java
+1 -1
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2;
import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.Errors;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.types.expressions.TypeReconstructionUtil; import org.jetbrains.kotlin.types.expressions.TypeReconstructionUtil;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetPsiFactory; import org.jetbrains.kotlin.psi.JetPsiFactory;
import org.jetbrains.kotlin.psi.JetWhenEntry; import org.jetbrains.kotlin.psi.JetWhenEntry;
import org.jetbrains.kotlin.psi.JetWhenExpression; import org.jetbrains.kotlin.psi.JetWhenExpression;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt
+1 -1
View File
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.psi.psiUtil.*
import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.resolve.ImportPath
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import org.jetbrains.jet.plugin.actions.JetAddImportAction import org.jetbrains.jet.plugin.actions.JetAddImportAction
import org.jetbrains.jet.plugin.caches.JetShortNamesCache import org.jetbrains.jet.plugin.caches.JetShortNamesCache
import org.jetbrains.jet.plugin.caches.KotlinIndicesHelper import org.jetbrains.jet.plugin.caches.KotlinIndicesHelper
idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.types.checker.JetTypeChecker;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeAccessorTypeFix.java
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java
+1 -1
View File
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.types.TypeProjection;
import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.TypeUtils;
import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.types.checker.JetTypeChecker;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetFunctionLiteral; import org.jetbrains.kotlin.psi.JetFunctionLiteral;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.refactoring.SimpleCollectingValidator; import org.jetbrains.jet.plugin.refactoring.SimpleCollectingValidator;
import org.jetbrains.jet.plugin.refactoring.JetNameSuggester; import org.jetbrains.jet.plugin.refactoring.JetNameSuggester;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java
+1 -1
View File
@@ -40,7 +40,7 @@ import org.jetbrains.kotlin.types.ErrorUtils;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.types.checker.JetTypeChecker;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java
+1 -1
View File
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.types.checker.JetTypeChecker;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.refactoring.JetNameSuggester; import org.jetbrains.jet.plugin.refactoring.JetNameSuggester;
import org.jetbrains.jet.plugin.refactoring.JetNameValidator; import org.jetbrains.jet.plugin.refactoring.JetNameValidator;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java
+1 -1
View File
@@ -47,7 +47,7 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.TypeUtils;
import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.types.checker.JetTypeChecker;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.JetNamedDeclaration;
import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.psi.JetParameter;
import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToBackingFieldFix.java
+1 -1
View File
@@ -23,7 +23,7 @@ import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java
+1 -1
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.TypeUtils;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import java.util.List; import java.util.List;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToFunctionInvocationFix.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetExpression;
import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToPropertyNameFix.java
+1 -1
View File
@@ -23,7 +23,7 @@ import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java
+1 -1
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetTypeElement; import org.jetbrains.kotlin.psi.JetTypeElement;
import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.kotlin.psi.JetTypeReference;
import org.jetbrains.kotlin.types.expressions.TypeReconstructionUtil; import org.jetbrains.kotlin.types.expressions.TypeReconstructionUtil;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java
+1 -1
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.psi.JetParameter;
import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.kotlin.psi.JetTypeReference;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.resolve.BindingContextUtils; import org.jetbrains.kotlin.resolve.BindingContextUtils;
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java
+1 -1
View File
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.ErrorUtils;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.types.checker.JetTypeChecker;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java
+1 -1
View File
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.psi.JetParameter;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil; import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java
+1 -1
View File
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetPostfixExpression; import org.jetbrains.kotlin.psi.JetPostfixExpression;
import org.jetbrains.kotlin.psi.JetPsiFactory; import org.jetbrains.kotlin.psi.JetPsiFactory;
import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.kotlin.lexer.JetTokens.ANNOTATION_KEYWORD; import static org.jetbrains.kotlin.lexer.JetTokens.ANNOTATION_KEYWORD;
idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java
+1 -1
View File
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.psi.JetCallableDeclaration; import org.jetbrains.kotlin.psi.JetCallableDeclaration;
import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetDeclaration;
import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import java.util.*; import java.util.*;
idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java
+1 -1
View File
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1;
import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.Errors;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.DescriptorRenderer;
idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetPsiUtil; import org.jetbrains.kotlin.psi.JetPsiUtil;
import org.jetbrains.kotlin.psi.JetWhenEntry; import org.jetbrains.kotlin.psi.JetWhenEntry;
import org.jetbrains.kotlin.psi.JetWhenExpression; import org.jetbrains.kotlin.psi.JetWhenExpression;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.JetExpression;
import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetFunction; import org.jetbrains.kotlin.psi.JetFunction;
import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
public class RemoveFunctionBodyFix extends JetIntentionAction<JetFunction> { public class RemoveFunctionBodyFix extends JetIntentionAction<JetFunction> {
idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor;
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor;
import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureConfiguration; import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureConfiguration;
import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureData; import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureData;
idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.types.Variance;
import org.jetbrains.kotlin.lexer.JetKeywordToken; import org.jetbrains.kotlin.lexer.JetKeywordToken;
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
public class RemoveModifierFix extends JetIntentionAction<JetModifierListOwner> { public class RemoveModifierFix extends JetIntentionAction<JetModifierListOwner> {
private final JetModifierKeywordToken modifier; private final JetModifierKeywordToken modifier;
idea/src/org/jetbrains/jet/plugin/quickfix/RemoveNullableFix.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetNullableType; import org.jetbrains.kotlin.psi.JetNullableType;
import org.jetbrains.kotlin.psi.JetTypeElement; import org.jetbrains.kotlin.psi.JetTypeElement;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
public class RemoveNullableFix extends JetIntentionAction<JetNullableType> { public class RemoveNullableFix extends JetIntentionAction<JetNullableType> {
public enum NullableKind { public enum NullableKind {
idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction; import org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction;
public class RemovePartsFromPropertyFix extends JetIntentionAction<JetProperty> { public class RemovePartsFromPropertyFix extends JetIntentionAction<JetProperty> {
idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
public class RemovePsiElementSimpleFix extends JetIntentionAction<PsiElement> { public class RemovePsiElementSimpleFix extends JetIntentionAction<PsiElement> {
idea/src/org/jetbrains/jet/plugin/quickfix/RemoveRightPartOfBinaryExpressionFix.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetBinaryExpression;
import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS; import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS;
import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetExpression;
import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
public class RemoveRightPartOfBinaryExpressionFix<T extends JetExpression> extends JetIntentionAction<T> { public class RemoveRightPartOfBinaryExpressionFix<T extends JetExpression> extends JetIntentionAction<T> {
private final String message; private final String message;
idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java
+1 -1
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.psi.JetDelegationSpecifier; import org.jetbrains.kotlin.psi.JetDelegationSpecifier;
import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
public class RemoveSupertypeFix extends JetIntentionAction<JetDelegationSpecifier> { public class RemoveSupertypeFix extends JetIntentionAction<JetDelegationSpecifier> {
private final JetDelegationSpecifier superClass; private final JetDelegationSpecifier superClass;
idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.psi.JetParameter;
import org.jetbrains.kotlin.psi.JetPsiUtil; import org.jetbrains.kotlin.psi.JetPsiUtil;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
public class RemoveValVarFromParameterFix extends JetIntentionAction<JetParameter> { public class RemoveValVarFromParameterFix extends JetIntentionAction<JetParameter> {
private final String varOrVal; private final String varOrVal;
idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.psi.JetParameter;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
public class RenameParameterToMatchOverriddenMethodFix extends JetIntentionAction<JetParameter>{ public class RenameParameterToMatchOverriddenMethodFix extends JetIntentionAction<JetParameter>{
idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceCallFix.java
+1 -1
View File
@@ -25,7 +25,7 @@ import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException; import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceInfixCallFix.java
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetBinaryExpression;
import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetExpression;
import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetQualifiedExpression; import org.jetbrains.kotlin.psi.JetQualifiedExpression;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java
+1 -1
View File
@@ -22,7 +22,7 @@ import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java
+1 -1
View File
@@ -24,7 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.plugin.JetBundle;
import static org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction.addTypeAnnotation; import static org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction.addTypeAnnotation;
import static org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction.getTypeForDeclaration; import static org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction.getTypeForDeclaration;
idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFromUsageFixBase.kt
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.plugin.quickfix.createFromUsage package org.jetbrains.jet.plugin.quickfix.createFromUsage
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import org.jetbrains.jet.plugin.quickfix.JetIntentionAction import org.jetbrains.jet.plugin.quickfix.JetIntentionAction
public abstract class CreateFromUsageFixBase(element: PsiElement) : JetIntentionAction<PsiElement>(element) { public abstract class CreateFromUsageFixBase(element: PsiElement) : JetIntentionAction<PsiElement>(element) {
idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass
import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase
import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetElement
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetFile
idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import com.intellij.codeInsight.intention.IntentionAction
import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.JetSimpleNameExpression
import com.intellij.codeInsight.daemon.quickFix.CreateClassOrPackageFix import com.intellij.codeInsight.daemon.quickFix.CreateClassOrPackageFix
import org.jetbrains.jet.plugin.quickfix.DelegatingIntentionAction import org.jetbrains.jet.plugin.quickfix.DelegatingIntentionAction
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import com.intellij.psi.PsiPackage import com.intellij.psi.PsiPackage
import org.jetbrains.jet.plugin.refactoring.canRefactor import org.jetbrains.jet.plugin.refactoring.canRefactor
idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction
import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase
import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetFile
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.command.CommandProcessor import com.intellij.openapi.command.CommandProcessor
import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.DescriptorUtils
idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable package org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable
import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetFile
idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable
import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetElement
import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase
import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.plugin.JetBundle
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetFile

Some files were not shown because too many files have changed in this diff Show More