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

Rename jet -> kotlin in frontend: lexer, kdoc

Browse Source 
org.jetbrains.jet.lexer -> org.jetbrains.kotlin.lexer
org.jetbrains.jet.kdoc -> org.jetbrains.kotlin.kdoc

Also rename Jet.flex -> Kotlin.flex
This commit is contained in:
Alexander Udalov
2015-01-10 12:53:54 +03:00
parent cb649dd204
commit ead8c8ac1d
258 changed files with 424 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.lazy
import java.util.HashSet
import org.jetbrains.jet.lang.psi.*
import org.jetbrains.jet.lang.psi.psiUtil.siblings
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.utils.addIfNotNull
import java.util.ArrayList
import java.util.HashMap
idea/ide-common/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt
+1 -1
View File
@@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindExclude
import org.jetbrains.jet.lang.types.JetType
import org.jetbrains.jet.lang.types.TypeUtils
import org.jetbrains.jet.lang.types.checker.JetTypeChecker
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.plugin.util.CallType
import org.jetbrains.jet.plugin.util.substituteExtensionIfCallable
import org.jetbrains.jet.plugin.util.getImplicitReceiversWithInstance
idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java
+1 -1
View File
@@ -29,7 +29,7 @@ import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.caches.resolve.KotlinLightClassForDecompiledDeclaration;
import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration;
import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage;
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java
+1 -1
View File
@@ -58,7 +58,7 @@ import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.DynamicTypesSettings;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex;
import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionFqnNameIndex;
import org.jetbrains.jet.plugin.stubindex.JetTopLevelPropertyFqnNameIndex;
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.renderer.DescriptorRenderer;
import java.util.Collections;
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt
+2 -2
View File
@@ -30,12 +30,12 @@ import org.jetbrains.jet.lang.psi.JetParameterList
import org.jetbrains.jet.lang.resolve.name.ClassId
import org.jetbrains.jet.lang.psi.JetDelegationSpecifierList
import org.jetbrains.jet.lang.psi.JetDelegatorToSuperClass
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName
import org.jetbrains.jet.lang.psi.JetClassObject
import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl
import org.jetbrains.jet.lexer.JetModifierKeywordToken
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken
import org.jetbrains.kotlin.serialization.ProtoBuf.Type
import org.jetbrains.jet.plugin.decompiler.stubBuilder.FlagsToModifiers.*
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt
+2 -2
View File
@@ -24,8 +24,8 @@ import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPlaceHolderStubImpl
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinNameReferenceExpressionStubImpl
import org.jetbrains.jet.lang.psi.JetTypeReference
import org.jetbrains.jet.lexer.JetModifierKeywordToken
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetParameterList
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinParameterStubImpl
import org.jetbrains.jet.lang.resolve.name.Name
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt
+2 -2
View File
@@ -29,9 +29,9 @@ import org.jetbrains.jet.lang.resolve.name.ClassId
import org.jetbrains.jet.lang.psi.stubs.KotlinUserTypeStub
import org.jetbrains.jet.lang.resolve.name.SpecialNames
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinUserTypeStubImpl
import org.jetbrains.jet.lexer.JetModifierKeywordToken
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken
import org.jetbrains.kotlin.serialization.Flags
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl
import org.jetbrains.jet.lang.psi.stubs.impl.ModifierMaskUtils
import org.jetbrains.kotlin.serialization.ProtoBuf
idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/KotlinWordsScanner.kt
+2 -2
View File
@@ -19,9 +19,9 @@ package org.jetbrains.jet.plugin.findUsages
import org.jetbrains.jet.plugin.search.usagesSearch.*
import com.intellij.lang.cacheBuilder.WordsScanner
import com.intellij.util.Processor
import org.jetbrains.jet.lexer.JetLexer
import org.jetbrains.kotlin.lexer.JetLexer
import com.intellij.lang.cacheBuilder.WordOccurrence
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import com.intellij.lang.cacheBuilder.SimpleWordsScanner
import org.jetbrains.jet.lang.types.expressions.OperatorConventions
idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/UsageTypeUtils.kt
+2 -2
View File
@@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.psi.JetTypeProjection
import org.jetbrains.jet.lang.psi.JetParameter
import org.jetbrains.jet.lang.psi.JetIsExpression
import org.jetbrains.jet.lang.psi.JetBinaryExpressionWithTypeRHS
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression
import org.jetbrains.jet.lang.psi.JetSuperExpression
import org.jetbrains.jet.lang.psi.JetDelegatorByExpressionSpecifier
@@ -278,4 +278,4 @@ enum class UsageTypeEnum {
CLASS_CAST_TO
ANNOTATION
CLASS_NEW_OPERATOR
}
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java
+1 -1
View File
@@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.types.TypeUtils;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.renderer.DescriptorRenderer;
import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.DEFAULT_ANNOTATION_MEMBER_NAME;
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java
+2 -2
View File
@@ -23,8 +23,8 @@ import com.intellij.psi.TokenType;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.kdoc.lexer.KDocTokens;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.kdoc.lexer.KDocTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.HashMap;
import java.util.Map;
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetHighlightingLexer.java
+3 -3
View File
@@ -18,9 +18,9 @@ package org.jetbrains.jet.plugin.highlighter;
import com.intellij.lexer.LayeredLexer;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.jet.kdoc.lexer.KDocLexer;
import org.jetbrains.jet.lexer.JetLexer;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.kdoc.lexer.KDocLexer;
import org.jetbrains.kotlin.lexer.JetLexer;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetHighlightingLexer extends LayeredLexer {
public JetHighlightingLexer() {
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java
+1 -1
View File
@@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.psi.JetThisExpression;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
class PropertiesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
PropertiesHighlightingVisitor(AnnotationHolder holder, BindingContext bindingContext) {
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/SoftKeywordsHighlightingVisitor.java
+1 -1
View File
@@ -26,7 +26,7 @@ import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetFunctionLiteral;
import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
class SoftKeywordsHighlightingVisitor extends HighlightingVisitor {
SoftKeywordsHighlightingVisitor(AnnotationHolder holder) {
idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/OperatorToFunctionIntention.kt
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.psi.JetPostfixExpression
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lang.psi.JetArrayAccessExpression
import org.jetbrains.jet.lang.psi.JetCallExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetPsiFactory
import org.jetbrains.jet.lang.psi.JetElement
import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression
idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt
+3 -3
View File
@@ -19,13 +19,13 @@ package org.jetbrains.jet.plugin.intentions
import org.jetbrains.jet.lang.psi.JetPrefixExpression
import org.jetbrains.jet.lang.psi.JetExpression
import org.jetbrains.jet.lang.psi.JetParenthesizedExpression
import org.jetbrains.jet.lexer.JetToken
import org.jetbrains.jet.lexer.JetSingleValueToken
import org.jetbrains.kotlin.lexer.JetToken
import org.jetbrains.kotlin.lexer.JetSingleValueToken
import org.jetbrains.jet.lang.psi.JetOperationExpression
import org.jetbrains.jet.lang.psi.JetIsExpression
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetPsiUtil
import org.jetbrains.jet.plugin.JetBundle
import org.jetbrains.jet.lang.psi.JetPsiFactory
idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java
+1 -1
View File
@@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.psi.JetArrayAccessExpression;
import org.jetbrains.jet.lang.psi.JetContainerNode;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.ArrayList;
import java.util.Collection;
idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetInvokeFunctionReference.java
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage;
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.ArrayList;
import java.util.Collection;
idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt
+2 -2
View File
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.jet.lang.psi.*
import org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.plugin.codeInsight.ShortenReferences
import org.jetbrains.jet.plugin.refactoring.fqName.changeQualifiedName
import org.jetbrains.jet.lang.psi.psiUtil.getQualifiedElementSelector
@@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.psi.psiUtil.getOutermostNonInterleavingQualifiedEl
import org.jetbrains.jet.plugin.codeInsight.shorten.addToShorteningWaitSet
import org.jetbrains.jet.plugin.refactoring.fqName.getKotlinFqName
import org.jetbrains.jet.lang.types.expressions.OperatorConventions
import org.jetbrains.jet.lexer.JetToken
import org.jetbrains.kotlin.lexer.JetToken
import org.jetbrains.jet.plugin.intentions.OperatorToFunctionIntention
import org.jetbrains.jet.lang.resolve.BindingContext
import com.intellij.util.IncorrectOperationException
idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/conventions.kt
+3 -3
View File
@@ -17,11 +17,11 @@
package org.jetbrains.jet.plugin.search.usagesSearch
import org.jetbrains.jet.lang.resolve.name.Name
import org.jetbrains.jet.lexer.JetToken
import org.jetbrains.kotlin.lexer.JetToken
import org.jetbrains.jet.lang.types.expressions.OperatorConventions.*
import com.google.common.collect.ImmutableSet
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.jet.lexer.JetSingleValueToken
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetSingleValueToken
import org.jetbrains.jet.lang.resolve.dataClassUtils.isComponentLike
public val ALL_SEARCHABLE_OPERATIONS: ImmutableSet<JetToken> = ImmutableSet
idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt
+2 -2
View File
@@ -32,10 +32,10 @@ import org.jetbrains.jet.lang.psi.JetPsiUtil
import org.jetbrains.kotlin.asJava.LightClassUtil.PropertyAccessorsPsiMethods
import org.jetbrains.jet.lang.psi.psiUtil.*
import org.jetbrains.jet.lang.resolve.name.Name
import org.jetbrains.jet.lexer.JetSingleValueToken
import org.jetbrains.kotlin.lexer.JetSingleValueToken
import org.jetbrains.jet.lang.resolve.BindingContext
import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.plugin.references.*
import org.jetbrains.jet.lang.psi.JetDeclaration
import com.intellij.util.containers.ContainerUtil
idea/src/org/jetbrains/jet/plugin/JetCommenter.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.jetbrains.jet.plugin;
import com.intellij.lang.CodeDocumentationAwareCommenter;
import com.intellij.psi.PsiComment;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.jet.kdoc.psi.api.KDoc;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.kdoc.psi.api.KDoc;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetCommenter implements CodeDocumentationAwareCommenter {
@Override
idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java
+2 -2
View File
@@ -28,11 +28,11 @@ import com.intellij.psi.PsiWhiteSpace;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.kdoc.lexer.KDocTokens;
import org.jetbrains.kotlin.kdoc.lexer.KDocTokens;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetImportDirective;
import org.jetbrains.jet.lang.psi.JetImportList;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.ArrayList;
import java.util.List;
idea/src/org/jetbrains/jet/plugin/JetPairMatcher.java
+2 -2
View File
@@ -22,8 +22,8 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.kdoc.lexer.KDocTokens;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.kdoc.lexer.KDocTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetPairMatcher implements PairedBraceMatcher {
private final BracePair[] pairs = new BracePair[]{
idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java
+2 -2
View File
@@ -25,8 +25,8 @@ import com.intellij.psi.PsiWhiteSpace;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.kdoc.lexer.KDocTokens;
import org.jetbrains.jet.kdoc.psi.api.KDoc;
import org.jetbrains.kotlin.kdoc.lexer.KDocTokens;
import org.jetbrains.kotlin.kdoc.psi.api.KDoc;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.psi.JetDeclaration;
import org.jetbrains.jet.lang.psi.JetPackageDirective;
idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetDeclarationMover.java
+1 -1
View File
@@ -28,7 +28,7 @@ import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.ArrayList;
import java.util.List;
idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetExpressionMover.java
+2 -2
View File
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.refactoring.RefactoringPackage;
import java.util.List;
@@ -568,4 +568,4 @@ public class JetExpressionMover extends AbstractJetUpDownMover {
PsiDocumentManager.getInstance(editor.getProject()).doPostponedOperationsAndUnblockDocument(editor.getDocument());
}
}
}
}
idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt
+1 -1
View File
@@ -36,7 +36,7 @@ import java.util.HashSet
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall
import org.jetbrains.jet.lang.types.JetType
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetIfExpression
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
import org.jetbrains.jet.lang.psi.JetContainerNode
idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt
+2 -2
View File
@@ -25,12 +25,12 @@ import com.intellij.codeInsight.completion.*
import org.jetbrains.jet.plugin.completion.handlers.KotlinFunctionInsertHandler
import com.intellij.codeInsight.lookup.LookupElementBuilder
import com.intellij.psi.PsiErrorElement
import org.jetbrains.jet.lexer.JetKeywordToken
import org.jetbrains.kotlin.lexer.JetKeywordToken
import com.intellij.openapi.project.Project
import org.jetbrains.jet.plugin.completion.handlers.KotlinKeywordInsertHandler
import org.jetbrains.jet.lang.psi.psiUtil.siblings
import org.jetbrains.jet.lexer.JetTokens.*
import org.jetbrains.kotlin.lexer.JetTokens.*
import org.jetbrains.jet.lang.psi.psiUtil.prevLeafSkipWhitespacesAndComments
import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType
import com.intellij.psi.tree.IElementType
idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.psi.JetBlockExpression
import org.jetbrains.jet.lang.psi.JetCallExpression
import org.jetbrains.jet.lang.psi.JetExpression
import org.jetbrains.jet.lang.psi.JetFile
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.plugin.completion.smart.SmartCompletion
import com.intellij.patterns.PsiJavaPatterns.elementType
idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.plugin.completion
import org.jetbrains.jet.lang.psi.JetValueArgument
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetCallElement
import org.jetbrains.jet.plugin.references.JetReference
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt
+2 -2
View File
@@ -44,7 +44,7 @@ import org.jetbrains.jet.plugin.codeInsight.ShortenReferences
import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.jet.plugin.completion.qualifiedNameForSourceCode
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetTypeArgumentList
import com.intellij.codeInsight.lookup.Lookup
import org.jetbrains.jet.plugin.completion.isAfterDot
@@ -272,4 +272,4 @@ object CastReceiverInsertHandler : KotlinCallableInsertHandler() {
ShortenReferences.process((expr.getExpression() as JetBinaryExpressionWithTypeRHS).getRight())
}
}
}
}
idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinKeywordInsertHandler.kt
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.completion.handlers
import com.intellij.codeInsight.completion.InsertHandler
import com.intellij.codeInsight.completion.InsertionContext
import com.intellij.codeInsight.lookup.LookupElement
import org.jetbrains.jet.lexer.JetTokens.*
import org.jetbrains.kotlin.lexer.JetTokens.*
public object KotlinKeywordInsertHandler : InsertHandler<LookupElement> {
private val NO_SPACE_AFTER = listOf(THIS_KEYWORD,
idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.completion.smart
import org.jetbrains.jet.lang.descriptors.*
import org.jetbrains.jet.lang.resolve.*
import org.jetbrains.jet.lang.psi.*
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.types.*
import com.intellij.codeInsight.lookup.*
import com.intellij.codeInsight.completion.*
idea/src/org/jetbrains/jet/plugin/editor/JetLtGtTypingUtils.java
+1 -1
View File
@@ -22,7 +22,7 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.editor.highlighter.HighlighterIterator;
import com.intellij.psi.tree.TokenSet;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
final class JetLtGtTypingUtils {
private static final TokenSet INVALID_INSIDE_REFERENCE = TokenSet.create(JetTokens.SEMICOLON, JetTokens.LBRACE, JetTokens.RBRACE);
idea/src/org/jetbrains/jet/plugin/editor/KotlinEnterHandler.kt
+2 -2
View File
@@ -28,7 +28,7 @@ import com.intellij.psi.PsiDocumentManager
import com.intellij.psi.codeStyle.CodeStyleManager
import org.jetbrains.jet.lang.psi.JetFile
import com.intellij.util.IncorrectOperationException
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetFunctionLiteral
import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils
import com.intellij.openapi.diagnostic.Logger
@@ -84,4 +84,4 @@ public class KotlinEnterHandler: EnterHandlerDelegateAdapter() {
return EnterHandlerDelegate.Result.Continue
}
}
}
idea/src/org/jetbrains/jet/plugin/editor/KotlinQuoteHandler.java
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.codeInsight.editorActions.QuoteHandler;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.highlighter.HighlighterIterator;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class KotlinQuoteHandler implements QuoteHandler {
@Override
idea/src/org/jetbrains/jet/plugin/editor/KotlinSmartEnterHandler.kt
+1 -1
View File
@@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.psi.JetFunctionLiteral
import com.intellij.psi.tree.TokenSet
import org.jetbrains.jet.JetNodeTypes
import org.jetbrains.jet.lang.psi.JetLoopExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType
public class KotlinSmartEnterHandler: SmartEnterProcessorWithFixers() {
idea/src/org/jetbrains/jet/plugin/editor/KotlinTypedHandler.java
+1 -1
View File
@@ -45,7 +45,7 @@ import com.intellij.util.text.CharArrayUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class KotlinTypedHandler extends TypedHandlerDelegate {
private final static TokenSet CONTROL_FLOW_EXPRESSIONS = TokenSet.create(
idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinFunctionDeclarationBodyFixer.kt
+2 -2
View File
@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.psi.JetDeclaration
import org.jetbrains.jet.lang.psi.JetFunction
import org.jetbrains.jet.lang.psi.JetClassOrObject
import org.jetbrains.jet.lang.psi.JetPsiUtil
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetNamedFunction
import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType
@@ -51,4 +51,4 @@ public class KotlinFunctionDeclarationBodyFixer : SmartEnterProcessorWithFixers.
doc.insertString(endOffset, "{}")
}
}
}
idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinCodeBlockSelectioner.kt
+1 -1
View File
@@ -25,7 +25,7 @@ import com.intellij.psi.PsiWhiteSpace
import com.intellij.psi.impl.source.tree.LeafPsiElement
import org.jetbrains.jet.lang.psi.JetBlockExpression
import org.jetbrains.jet.lang.psi.JetWhenExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import java.util.ArrayList
import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase
idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinDocCommentSelectioner.kt
+2 -2
View File
@@ -22,11 +22,11 @@ import com.intellij.openapi.editor.Editor
import com.intellij.openapi.util.TextRange
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiWhiteSpace
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import java.util.ArrayList
import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase
import org.jetbrains.jet.kdoc.psi.api.KDoc
import org.jetbrains.kotlin.kdoc.psi.api.KDoc
public class KotlinDocCommentSelectioner : ExtendWordSelectionHandlerBase() {
override fun canSelect(e: PsiElement)
idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinListSelectioner.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.psi.JetParameterList
import org.jetbrains.jet.lang.psi.JetTypeArgumentList
import org.jetbrains.jet.lang.psi.JetTypeParameterList
import org.jetbrains.jet.lang.psi.JetValueArgumentList
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase
public class KotlinListSelectioner : ExtendWordSelectionHandlerBase() {
idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinStatementGroupSelectioner.kt
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.psi.JetBlockExpression
import org.jetbrains.jet.lang.psi.JetExpression
import org.jetbrains.jet.lang.psi.JetWhenEntry
import org.jetbrains.jet.lang.psi.JetWhenExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase
import org.jetbrains.jet.lang.psi.psiUtil.siblings
idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java
+1 -1
View File
@@ -27,7 +27,7 @@ import com.intellij.ui.SimpleColoredComponent;
import com.intellij.ui.StateRestoringCheckBox;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetNamedDeclaration;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.findUsages.KotlinPropertyFindUsagesOptions;
idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java
+3 -3
View File
@@ -29,9 +29,9 @@ import com.intellij.psi.tree.TokenSet;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.kdoc.lexer.KDocTokens;
import org.jetbrains.kotlin.kdoc.lexer.KDocTokens;
import org.jetbrains.jet.lang.psi.JetDeclaration;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetLanguage;
import java.util.ArrayList;
@@ -40,7 +40,7 @@ import java.util.Collections;
import java.util.List;
import static org.jetbrains.jet.JetNodeTypes.*;
import static org.jetbrains.jet.lexer.JetTokens.*;
import static org.jetbrains.kotlin.lexer.JetTokens.*;
import static org.jetbrains.jet.plugin.formatter.NodeIndentStrategy.strategy;
/**
idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt
+2 -2
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.plugin.formatter
import org.jetbrains.jet.JetNodeTypes.*
import org.jetbrains.jet.lexer.JetTokens.*
import org.jetbrains.kotlin.lexer.JetTokens.*
import com.intellij.psi.tree.TokenSet
import com.intellij.psi.formatter.FormatterUtil
import com.intellij.psi.tree.IElementType
@@ -29,7 +29,7 @@ import com.intellij.formatting.ASTBlock
import org.jetbrains.jet.plugin.formatter.KotlinSpacingBuilder.CustomSpacingBuilder
import com.intellij.formatting.SpacingBuilder
import com.intellij.formatting.SpacingBuilder.RuleBuilder
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
val MODIFIERS_LIST_ENTRIES = TokenSet.orSet(TokenSet.create(ANNOTATION_ENTRY, ANNOTATION), MODIFIER_KEYWORDS)
idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
+1 -1
View File
@@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor;
import org.jetbrains.jet.lang.descriptors.Modality;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.highlighter.markers.MarkersPackage;
import org.jetbrains.jet.plugin.highlighter.markers.ResolveWithParentsResult;
import org.jetbrains.jet.plugin.highlighter.markers.SuperDeclarationMarkerNavigationHandler;
idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedBooleanSequenceIntention.kt
+2 -2
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.intentions
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.lang.psi.JetPrefixExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetPsiFactory
import org.jetbrains.jet.lang.psi.JetParenthesizedExpression
import org.jetbrains.jet.lang.psi.JetPsiUtil
@@ -88,4 +88,4 @@ public class ConvertNegatedBooleanSequenceIntention : JetSelfTargetingIntention<
return itemList
}
}
}
idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.intentions
import org.jetbrains.jet.lang.psi.JetParenthesizedExpression
import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetPrefixExpression
import org.jetbrains.jet.lang.psi.JetPsiFactory
import com.intellij.psi.impl.source.tree.PsiErrorElementImpl
idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt
+1 -1
View File
@@ -23,7 +23,7 @@ import com.intellij.psi.PsiElement
import org.jetbrains.jet.plugin.JetBundle
import org.jetbrains.jet.lang.psi.*
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import com.intellij.openapi.util.TextRange
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorWithVisibility
import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor
idea/src/org/jetbrains/jet/plugin/intentions/ConvertToStringTemplateIntention.kt
+1 -1
View File
@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.psi.JetStringTemplateExpression
import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator
import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace
import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetPsiUtil
import com.intellij.openapi.util.text.StringUtil
import com.intellij.psi.util.PsiUtilCore
idea/src/org/jetbrains/jet/plugin/intentions/InvertIfConditionIntention.kt
+5 -5
View File
@@ -21,15 +21,15 @@ import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.lang.psi.JetExpression
import org.jetbrains.jet.lang.psi.JetUnaryExpression
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.jet.lexer.JetToken
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetToken
import com.intellij.psi.tree.IElementType
import org.jetbrains.jet.lang.psi.JetConstantExpression
import org.jetbrains.jet.lang.psi.JetPsiFactory
import org.jetbrains.jet.lang.psi.JetPsiUtil
import org.jetbrains.jet.lang.psi.JetParenthesizedExpression
import org.jetbrains.jet.lexer.JetSingleValueToken
import org.jetbrains.jet.lexer.JetKeywordToken
import org.jetbrains.kotlin.lexer.JetSingleValueToken
import org.jetbrains.kotlin.lexer.JetKeywordToken
import org.jetbrains.jet.lang.psi.JetNamedFunction
import org.jetbrains.jet.lang.psi.JetBlockExpression
@@ -165,4 +165,4 @@ public class InvertIfConditionIntention : JetSelfTargetingIntention<JetIfExpress
else -> elseBranch
}, if (thenBranch is JetBlockExpression && thenBranch.getStatements().isEmpty()) null else thenBranch))
}
}
}
idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeImplicitInLambdaIntention.kt
+2 -2
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.intentions
import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression
import org.jetbrains.jet.lang.psi.JetPsiFactory
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
public class MakeTypeImplicitInLambdaIntention : JetSelfTargetingIntention<JetFunctionLiteralExpression>(
"make.type.implicit.in.lambda", javaClass()) {
@@ -93,4 +93,4 @@ public class MakeTypeImplicitInLambdaIntention : JetSelfTargetingIntention<JetFu
}
return hasExplicitParamType
}
}
}
idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithDotQualifiedMethodCallIntention.kt
+2 -2
View File
@@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lang.psi.JetPsiFactory
import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression
import org.jetbrains.jet.lang.psi.JetParenthesizedExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
public class ReplaceWithDotQualifiedMethodCallIntention : JetSelfTargetingIntention<JetBinaryExpression>("replace.with.dot.qualified.method.call.intention", javaClass()) {
override fun isApplicableTo(element: JetBinaryExpression): Boolean {
@@ -45,4 +45,4 @@ public class ReplaceWithDotQualifiedMethodCallIntention : JetSelfTargetingIntent
val replacement = JetPsiFactory(element).createExpression(replacementExpressionStringBuilder.toString())
element.replace(replacement)
}
}
}
idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt
+2 -2
View File
@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.intentions
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetPsiFactory
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
import org.jetbrains.jet.lang.resolve.BindingContext
@@ -117,4 +117,4 @@ public class ReplaceWithOperatorAssignIntention : JetSelfTargetingIntention<JetB
)
element.replace(JetPsiFactory(element).createExpression(replacement))
}
}
}
idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithTraditionalAssignmentIntention.kt
+2 -2
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.intentions
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetPsiFactory
import org.jetbrains.jet.lang.psi.JetPsiUnparsingUtils
@@ -55,4 +55,4 @@ public class ReplaceWithTraditionalAssignmentIntention : JetSelfTargetingIntenti
element.replace(JetPsiFactory(element).createExpression(buildReplacement(element)))
}
}
}
idea/src/org/jetbrains/jet/plugin/intentions/SimplifyBooleanWithConstantsIntention.kt
+1 -1
View File
@@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lang.psi.JetExpression
import org.jetbrains.jet.lang.psi.JetPsiFactory
import org.jetbrains.jet.lang.psi.JetParenthesizedExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.resolve.CompileTimeConstantUtils
import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace
import com.intellij.psi.tree.IElementType
idea/src/org/jetbrains/jet/plugin/intentions/SplitIfIntention.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import org.jetbrains.jet.lang.psi.JetIfExpression
import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lang.psi.JetPsiFactory
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
idea/src/org/jetbrains/jet/plugin/intentions/SwapBinaryExpression.kt
+1 -1
View File
@@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lang.psi.JetPsiFactory
import org.jetbrains.jet.lang.psi.JetExpression
import org.jetbrains.jet.plugin.util.JetPsiPrecedences
import org.jetbrains.jet.lexer.JetTokens.*
import org.jetbrains.kotlin.lexer.JetTokens.*
import org.jetbrains.jet.lang.types.expressions.OperatorConventions
public class SwapBinaryExpression : JetSelfTargetingIntention<JetBinaryExpression>(
idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
import org.jetbrains.jet.plugin.codeInsight.ShortenReferences
import org.jetbrains.jet.JetNodeTypes
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
import org.jetbrains.jet.plugin.caches.resolve.analyze
idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceContainsIntention.kt
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.plugin.intentions.attributeCallReplacements
import org.jetbrains.jet.lang.psi.JetExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.lang.types.checker.JetTypeChecker
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfThenUtils.kt
+1 -1
View File
@@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.psi.JetBlockExpression
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lang.psi.JetIfExpression
import org.jetbrains.jet.lang.psi.JetPsiUtil
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetPsiFactory
import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.plugin.refactoring.introduce.introduceVariable.KotlinIntroduceVariableHandler
idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/branchedTransformationUtils.kt
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.plugin.intentions.branchedTransformations
import org.jetbrains.jet.lang.psi.*
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetPsiUnparsingUtils.*
import org.jetbrains.jet.lang.psi.psiUtil.*
import java.util.ArrayList
idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions
import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention
import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetPsiUtil
import org.jetbrains.jet.lang.psi.JetPostfixExpression
import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStableVariable
idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/ElvisToIfThenIntention.kt
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention
import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetPsiUtil
import org.jetbrains.jet.plugin.intentions.branchedTransformations.convertToIfNotNullExpression
import org.jetbrains.jet.plugin.intentions.branchedTransformations.introduceValueForCondition
idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention
import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.lang.psi.JetIfExpression
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.plugin.intentions.branchedTransformations.evaluatesTo
import org.jetbrains.jet.plugin.intentions.branchedTransformations.comparesNonNullToNull
import org.jetbrains.jet.plugin.intentions.branchedTransformations.getNonNullExpression
idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention
import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.lang.psi.JetIfExpression
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.plugin.intentions.branchedTransformations.extractExpressionIfSingle
import org.jetbrains.jet.plugin.intentions.branchedTransformations.evaluatesTo
import org.jetbrains.jet.plugin.intentions.branchedTransformations.comparesNonNullToNull
idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.psi.JetExpression
import org.jetbrains.jet.lang.psi.JetIfExpression
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.plugin.intentions.branchedTransformations.extractExpressionIfSingle
import org.jetbrains.jet.plugin.intentions.branchedTransformations.comparesNonNullToNull
import org.jetbrains.jet.plugin.intentions.branchedTransformations.getNonNullExpression
idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java
+2 -2
View File
@@ -35,8 +35,8 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lexer.JetModifierKeywordToken;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
idea/src/org/jetbrains/jet/plugin/joinLines/JoinBlockIntoSingleStatementHandler.kt
+2 -2
View File
@@ -20,7 +20,7 @@ import com.intellij.codeInsight.editorActions.JoinRawLinesHandlerDelegate
import com.intellij.openapi.editor.Document
import com.intellij.psi.PsiFile
import org.jetbrains.jet.lang.psi.JetFile
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetBlockExpression
import org.jetbrains.jet.lang.psi.JetContainerNode
import org.jetbrains.jet.lang.psi.JetWhenEntry
@@ -67,4 +67,4 @@ public class JoinBlockIntoSingleStatementHandler : JoinRawLinesHandlerDelegate {
override fun tryJoinLines(document: Document, file: PsiFile, start: Int, end: Int)
= - 1
}
}
idea/src/org/jetbrains/jet/plugin/joinLines/JoinDeclarationAndAssignmentHandler.kt
+2 -2
View File
@@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
import com.intellij.psi.PsiWhiteSpace
import com.intellij.psi.PsiComment
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import com.intellij.openapi.util.text.StringUtil
public class JoinDeclarationAndAssignmentHandler : JoinRawLinesHandlerDelegate {
@@ -79,4 +79,4 @@ public class JoinDeclarationAndAssignmentHandler : JoinRawLinesHandlerDelegate {
else -> element.getNode()!!.getElementType() == JetTokens.SEMICOLON
}
}
}
}
idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetLanguage;
public abstract class JetTemplateContextType extends TemplateContextType {
idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
+1 -1
View File
@@ -47,7 +47,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.codeInsight.ReferenceVariantsHelper;
idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java
+3 -3
View File
@@ -27,11 +27,11 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetModifierListOwner;
import org.jetbrains.jet.lang.psi.JetPropertyAccessor;
import org.jetbrains.jet.lexer.JetModifierKeywordToken;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle;
import static org.jetbrains.jet.lexer.JetTokens.ABSTRACT_KEYWORD;
import static org.jetbrains.kotlin.lexer.JetTokens.ABSTRACT_KEYWORD;
public class AddModifierFix extends JetIntentionAction<JetModifierListOwner> {
@NotNull private final JetModifierKeywordToken modifier;
idea/src/org/jetbrains/jet/plugin/quickfix/AddOpenModifierToClassDeclarationFix.java
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.psi.JetClass;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
import org.jetbrains.jet.lang.psi.JetTypeReference;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle;
public class AddOpenModifierToClassDeclarationFix extends JetIntentionAction<JetTypeReference> {
idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java
+2 -2
View File
@@ -33,8 +33,8 @@ import org.jetbrains.jet.plugin.project.PluginJetFilesProvider;
import java.util.Collection;
import java.util.List;
import static org.jetbrains.jet.lexer.JetTokens.OVERRIDE_KEYWORD;
import static org.jetbrains.jet.lexer.JetTokens.PUBLIC_KEYWORD;
import static org.jetbrains.kotlin.lexer.JetTokens.OVERRIDE_KEYWORD;
import static org.jetbrains.kotlin.lexer.JetTokens.PUBLIC_KEYWORD;
public class AddOverrideToEqualsHashCodeToStringFix extends JetIntentionAction<PsiElement> {
public AddOverrideToEqualsHashCodeToStringFix(@NotNull PsiElement element) {
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java
+2 -2
View File
@@ -32,8 +32,8 @@ import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetModifierListOwner;
import org.jetbrains.jet.lang.psi.JetParameter;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lexer.JetModifierKeywordToken;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetPostfixExpression;
import org.jetbrains.jet.lang.psi.JetPsiFactory;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.plugin.JetBundle;
import static org.jetbrains.jet.lexer.JetTokens.ANNOTATION_KEYWORD;
import static org.jetbrains.kotlin.lexer.JetTokens.ANNOTATION_KEYWORD;
public class MakeClassAnAnnotationClassFix extends JetIntentionAction<JetAnnotationEntry> {
private final JetAnnotationEntry annotationEntry;
idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java
+1 -1
View File
@@ -40,7 +40,7 @@ import java.util.*;
import static org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.*;
import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration;
import static org.jetbrains.jet.lexer.JetTokens.OPEN_KEYWORD;
import static org.jetbrains.kotlin.lexer.JetTokens.OPEN_KEYWORD;
public class MakeOverriddenMemberOpenFix extends JetIntentionAction<JetDeclaration> {
private final List<JetCallableDeclaration> overriddenNonOverridableMembers = new ArrayList<JetCallableDeclaration>();
idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction.*;
import org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable.*;
import static org.jetbrains.jet.lang.diagnostics.Errors.*;
import static org.jetbrains.jet.lexer.JetTokens.*;
import static org.jetbrains.kotlin.lexer.JetTokens.*;
public class QuickFixRegistrar {
public static void registerQuickFixes() {
idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java
+1 -1
View File
@@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetFunction;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle;
public class RemoveFunctionBodyFix extends JetIntentionAction<JetFunction> {
idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java
+3 -3
View File
@@ -28,9 +28,9 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.types.Variance;
import org.jetbrains.jet.lexer.JetKeywordToken;
import org.jetbrains.jet.lexer.JetModifierKeywordToken;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetKeywordToken;
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle;
public class RemoveModifierFix extends JetIntentionAction<JetModifierListOwner> {
idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java
+2 -2
View File
@@ -24,7 +24,7 @@ import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle;
public class RemovePsiElementSimpleFix extends JetIntentionAction<PsiElement> {
@@ -122,4 +122,4 @@ public class RemovePsiElementSimpleFix extends JetIntentionAction<PsiElement> {
}
};
}
}
}
idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.psi.JetDelegationSpecifier;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle;
public class RemoveSupertypeFix extends JetIntentionAction<JetDelegationSpecifier> {
idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+1 -1
View File
@@ -51,7 +51,7 @@ import org.jetbrains.jet.plugin.refactoring.CollectingValidator
import org.jetbrains.jet.plugin.util.isUnit
import com.intellij.psi.PsiWhiteSpace
import com.intellij.psi.PsiElement
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.plugin.util.application.runWriteAction
import org.jetbrains.jet.plugin.refactoring.isMultiLine
import org.jetbrains.jet.lang.types.checker.JetTypeChecker
idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt
+3 -3
View File
@@ -5,11 +5,11 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic
import com.intellij.codeInsight.intention.IntentionAction
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lang.types.expressions.OperatorConventions
import org.jetbrains.jet.lexer.JetToken
import org.jetbrains.kotlin.lexer.JetToken
import org.jetbrains.jet.lang.types.Variance
import java.util.Collections
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.*
public object CreateBinaryOperationActionFactory: JetSingleIntentionActionFactory() {
@@ -40,4 +40,4 @@ public object CreateBinaryOperationActionFactory: JetSingleIntentionActionFactor
val parameters = Collections.singletonList(ParameterInfo(TypeInfo(argumentExpr, Variance.IN_VARIANCE)))
return CreateCallableFromUsageFix(callExpr, FunctionInfo(operationName, receiverType, returnType, Collections.emptyList(), parameters))
}
}
}
idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt
+2 -2
View File
@@ -7,7 +7,7 @@ import org.jetbrains.jet.lang.psi.JetCallExpression
import org.jetbrains.jet.lang.types.Variance
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetQualifiedExpression
import org.jetbrains.jet.lang.resolve.calls.callUtil.getCall
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
@@ -105,4 +105,4 @@ object CreateFunctionOrPropertyFromCallActionFactory : JetSingleIntentionActionF
return CreateCallableFromUsageFix(callExpr, callableInfo)
}
}
}
idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt
+1 -1
View File
@@ -5,7 +5,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic
import com.intellij.codeInsight.intention.IntentionAction
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
import org.jetbrains.jet.lang.types.expressions.OperatorConventions
import org.jetbrains.jet.lexer.JetToken
import org.jetbrains.kotlin.lexer.JetToken
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lang.types.Variance
import java.util.Collections
idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java
+2 -2
View File
@@ -31,8 +31,8 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypeUtils;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetLexer;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetLexer;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import java.util.ArrayList;
idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
+2 -2
View File
@@ -46,8 +46,8 @@ import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetModifierKeywordToken;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils;
idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt
+1 -1
View File
@@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.psi.JetFunctionLiteral
import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils
import org.jetbrains.jet.lang.types.JetType
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.plugin.JetLanguage
import org.jetbrains.jet.plugin.caches.resolve.*
import org.jetbrains.jet.plugin.refactoring.changeSignature.usages.JetFunctionDefinitionUsage
idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetValVar.kt
+2 -2
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.plugin.refactoring.changeSignature
import com.intellij.lang.ASTNode
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
public enum class JetValVar(val name: String) {
None: JetValVar("none")
@@ -34,4 +34,4 @@ fun ASTNode?.toValVar(): JetValVar {
getElementType() == JetTokens.VAR_KEYWORD -> JetValVar.Var
else -> throw IllegalArgumentException("Unknown val/var token: " + getText())
}
}
}
idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java
+1 -1
View File
@@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypeSubstitutor;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetModifierKeywordToken;
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.codeInsight.shorten.ShortenPackage;
import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java
+1 -1
View File
@@ -58,7 +58,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode;
import org.jetbrains.jet.lang.types.ErrorUtils;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetLanguage;
import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java
+1 -1
View File
@@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.psi.JetProperty;
import org.jetbrains.jet.lang.psi.JetPsiFactory;
import org.jetbrains.jet.lang.psi.JetTypeReference;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction;
import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
+1 -1
View File
@@ -48,7 +48,7 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypeUtils;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils;
import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt
+1 -1
View File
@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.name.Name
import com.intellij.usageView.UsageInfo
import com.intellij.refactoring.listeners.RefactoringElementListener
import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.resolve.BindingContext
import org.jetbrains.jet.lang.psi.JetClassOrObject
import com.intellij.openapi.ui.Messages

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