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
compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
+1 -1
View File
@@ -46,7 +46,7 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypesPackage;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lang.types.lang.PrimitiveType;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.org.objectweb.asm.*;
import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
import org.jetbrains.org.objectweb.asm.commons.Method;
compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+1 -1
View File
@@ -68,7 +68,7 @@ import org.jetbrains.jet.lang.types.TypeProjection;
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.kotlin.renderer.DescriptorRenderer;
import org.jetbrains.kotlin.backend.common.CodegenUtil;
import org.jetbrains.org.objectweb.asm.Label;
compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+1 -1
View File
@@ -57,7 +57,7 @@ import org.jetbrains.jet.lang.resolve.name.Name;
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.kotlin.backend.common.CodegenUtil;
import org.jetbrains.kotlin.backend.common.CodegenUtilKt;
import org.jetbrains.kotlin.backend.common.DataClassMethodGenerator;
compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
+1 -1
View File
@@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterKind;
import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterSignature;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.jet.lang.types.lang.PrimitiveType;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.org.objectweb.asm.Label;
import org.jetbrains.org.objectweb.asm.Type;
import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java
+1 -1
View File
@@ -58,7 +58,7 @@ import java.util.*;
import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*;
import static org.jetbrains.jet.lang.resolve.BindingContext.*;
import static org.jetbrains.jet.lang.resolve.name.SpecialNames.safeIdentifier;
import static org.jetbrains.jet.lexer.JetTokens.*;
import static org.jetbrains.kotlin.lexer.JetTokens.*;
class CodegenAnnotatingVisitor extends JetVisitorVoid {
private static final TokenSet BINARY_OPERATIONS = TokenSet.orSet(
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Equals.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.codegen.ExpressionCodegen
import org.jetbrains.kotlin.codegen.StackValue
import org.jetbrains.jet.lang.psi.JetCallExpression
import org.jetbrains.jet.lang.psi.JetExpression
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.codegen.AsmUtil.genEqualsForExpressionsOnStack
import org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IdentityEquals.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.codegen.StackValue;
import org.jetbrains.jet.lang.psi.JetBinaryExpression;
import org.jetbrains.jet.lang.psi.JetCallExpression;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.org.objectweb.asm.Type;
import java.util.List;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDeclarationCheckerProvider.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.psi.JetNamedFunction
import org.jetbrains.jet.lang.resolve.DescriptorUtils
import org.jetbrains.jet.lang.descriptors.ClassKind
import org.jetbrains.jet.lang.resolve.java.diagnostics.ErrorsJvm
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetProperty
import org.jetbrains.jet.lang.diagnostics.DiagnosticSink
import org.jetbrains.jet.lang.descriptors.Visibilities
compiler/frontend/buildLexer.xml
+5 -5
View File
@@ -34,15 +34,15 @@
</macrodef>
<target name="lexer">
<flex flexfile="${home}/src/org/jetbrains/jet/lexer/Jet.flex"
destdir="${home}/src/org/jetbrains/jet/lexer/"/>
<flex flexfile="${home}/src/org/jetbrains/kotlin/lexer/Kotlin.flex"
destdir="${home}/src/org/jetbrains/kotlin/lexer/"/>
<!-- This is a hack, but we don't want to alter the skeleton we are using now, because being in sync with IDEA is more important-->
<replaceregexp file="${home}/src/org/jetbrains/jet/lexer/_JetLexer.java"
<replaceregexp file="${home}/src/org/jetbrains/kotlin/lexer/_JetLexer.java"
match="throw new KotlinLexerException\(message\);"
replace="throw new KotlinLexerException(message + &quot;\\\\n at '&quot; + yytext() + &quot;'\\\\n&quot; + zzBuffer);"/>
<flex flexfile="${home}/src/org/jetbrains/jet/kdoc/lexer/KDoc.flex"
destdir="${home}/src/org/jetbrains/jet/kdoc/lexer/"/>
<flex flexfile="${home}/src/org/jetbrains/kotlin/kdoc/lexer/KDoc.flex"
destdir="${home}/src/org/jetbrains/kotlin/kdoc/lexer/"/>
</target>
</project>
compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java
+2 -2
View File
@@ -38,14 +38,14 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage;
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.util.slicedmap.WritableSlice;
import java.util.Collection;
import java.util.Map;
import static org.jetbrains.jet.lang.resolve.BindingContext.*;
import static org.jetbrains.jet.lexer.JetTokens.*;
import static org.jetbrains.kotlin.lexer.JetTokens.*;
public class DebugInfoUtil {
private static final TokenSet MAY_BE_UNRESOLVED = TokenSet.create(IN_KEYWORD, NOT_IN);
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameters.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.diagnostics;
import org.jetbrains.jet.lang.psi.JetClass;
import org.jetbrains.jet.lang.psi.JetProperty;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lexer.JetKeywordToken;
import org.jetbrains.kotlin.lexer.JetKeywordToken;
public interface DiagnosticParameters {
DiagnosticParameter<JetKeywordToken> MODIFIER = new DiagnosticParameterImpl<JetKeywordToken>("MODIFIER");
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
+3 -3
View File
@@ -29,9 +29,9 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker.VarianceConflictDiagnosticData;
import org.jetbrains.jet.lang.types.JetType;
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 java.lang.reflect.Field;
import java.lang.reflect.Modifier;
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.kt
+3 -3
View File
@@ -22,8 +22,8 @@ import com.intellij.psi.PsiNameIdentifierOwner
import com.intellij.psi.tree.TokenSet
import org.jetbrains.jet.JetNodeTypes
import org.jetbrains.jet.lang.psi.*
import org.jetbrains.jet.lexer.JetKeywordToken
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetKeywordToken
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.utils.sure
import kotlin.platform.platformStatic
@@ -370,4 +370,4 @@ public object PositioningStrategies {
return markRange(element.getOperationReference(), element)
}
}
}
}
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
+2 -2
View File
@@ -34,8 +34,8 @@ import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
import org.jetbrains.jet.lang.psi.JetTypeConstraint;
import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker.VarianceConflictDiagnosticData;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lexer.JetKeywordToken;
import org.jetbrains.jet.lexer.JetModifierKeywordToken;
import org.jetbrains.kotlin.lexer.JetKeywordToken;
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
import org.jetbrains.kotlin.renderer.MultiRenderer;
import org.jetbrains.kotlin.renderer.Renderer;
compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.constants.*
import org.jetbrains.jet.lang.types.JetType
import org.jetbrains.jet.lang.types.expressions.OperatorConventions
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind
import org.jetbrains.jet.lang.types.TypeUtils
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument
compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java
+4 -4
View File
@@ -22,15 +22,15 @@ import com.intellij.psi.tree.TokenSet;
import com.intellij.util.containers.Stack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lexer.JetKeywordToken;
import org.jetbrains.jet.lexer.JetToken;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetKeywordToken;
import org.jetbrains.kotlin.lexer.JetToken;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.utils.strings.StringsPackage;
import java.util.HashMap;
import java.util.Map;
import static org.jetbrains.jet.lexer.JetTokens.*;
import static org.jetbrains.kotlin.lexer.JetTokens.*;
/*package*/ abstract class AbstractJetParsing {
private static final Map<String, JetKeywordToken> SOFT_KEYWORD_TEXTS = new HashMap<String, JetKeywordToken>();
compiler/frontend/src/org/jetbrains/jet/lang/parsing/CommentBinders.kt
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.parsing
import com.intellij.lang.WhitespacesAndCommentsBinder
import com.intellij.psi.tree.IElementType
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import com.intellij.openapi.util.text.StringUtil
object PrecedingCommentsBinder : WhitespacesAndCommentsBinder {
compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+3 -3
View File
@@ -23,8 +23,8 @@ import com.intellij.psi.tree.TokenSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetNodeType;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetToken;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetToken;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.Arrays;
import java.util.HashSet;
@@ -33,7 +33,7 @@ import java.util.Set;
import static org.jetbrains.jet.JetNodeTypes.*;
import static org.jetbrains.jet.lang.parsing.JetParsing.AnnotationParsingMode.REGULAR_ANNOTATIONS_ALLOW_SHORTS;
import static org.jetbrains.jet.lang.parsing.JetParsing.AnnotationParsingMode.REGULAR_ANNOTATIONS_ONLY_WITH_BRACKETS;
import static org.jetbrains.jet.lexer.JetTokens.*;
import static org.jetbrains.kotlin.lexer.JetTokens.*;
public class JetExpressionParsing extends AbstractJetParsing {
private static final TokenSet WHEN_CONDITION_RECOVERY_SET = TokenSet.create(RBRACE, IN_KEYWORD, NOT_IN, IS_KEYWORD, NOT_IS, ELSE_KEYWORD);
compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParserDefinition.java
+2 -2
View File
@@ -35,8 +35,8 @@ import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementType;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
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.JetLanguage;
public class JetParserDefinition implements ParserDefinition {
compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java
+2 -2
View File
@@ -23,14 +23,14 @@ import com.intellij.psi.tree.TokenSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeType;
import org.jetbrains.jet.lexer.JetKeywordToken;
import org.jetbrains.kotlin.lexer.JetKeywordToken;
import java.util.HashMap;
import java.util.Map;
import static org.jetbrains.jet.JetNodeTypes.*;
import static org.jetbrains.jet.lang.parsing.JetParsing.AnnotationParsingMode.*;
import static org.jetbrains.jet.lexer.JetTokens.*;
import static org.jetbrains.kotlin.lexer.JetTokens.*;
public class JetParsing extends AbstractJetParsing {
private static final Logger LOG = Logger.getInstance(JetParsing.class);
compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderImpl.java
+2 -2
View File
@@ -25,12 +25,12 @@ import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import com.intellij.util.containers.Stack;
import static org.jetbrains.jet.lexer.JetTokens.*;
import static org.jetbrains.kotlin.lexer.JetTokens.*;
public class SemanticWhitespaceAwarePsiBuilderImpl extends PsiBuilderAdapter implements SemanticWhitespaceAwarePsiBuilder {
private final TokenSet complexTokens = TokenSet.create(SAFE_ACCESS, ELVIS, EXCLEXCL);
compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt
+1 -1
View File
@@ -37,7 +37,7 @@ import org.jetbrains.jet.lang.psi.JetEnumEntry
import org.jetbrains.jet.lang.psi.JetInitializerList
import org.jetbrains.jet.lang.psi.JetFunctionType
import org.jetbrains.jet.lang.psi.JetTypeReference
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.JetTypeConstraintList
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
compiler/frontend/src/org/jetbrains/jet/lang/psi/FindDocComment.kt
+2 -2
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.lang.psi.findDocComment
import org.jetbrains.jet.lang.psi.JetDeclaration
import org.jetbrains.jet.kdoc.psi.api.KDoc
import org.jetbrains.kotlin.kdoc.psi.api.KDoc
import org.jetbrains.jet.lang.psi.psiUtil.siblings
import com.intellij.psi.PsiWhiteSpace
import com.intellij.psi.PsiComment
@@ -26,4 +26,4 @@ fun findDocComment(declaration: JetDeclaration): KDoc? {
return declaration.getFirstChild().siblings()
.dropWhile { it !is KDoc && (it is PsiWhiteSpace || it is PsiComment) }
.first() as? KDoc
}
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java
+1 -1
View File
@@ -24,7 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.Collections;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java
+1 -1
View File
@@ -23,7 +23,7 @@ import com.intellij.psi.PsiModifiableCodeBlock;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.ReadOnly;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.Arrays;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableReferenceExpression.java
+1 -1
View File
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetCallableReferenceExpression extends JetExpressionImpl {
public JetCallableReferenceExpression(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java
+2 -2
View File
@@ -31,8 +31,8 @@ import org.jetbrains.jet.lang.psi.addRemoveModifier.AddRemoveModifierPackage;
import org.jetbrains.jet.lang.psi.stubs.KotlinClassStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lang.resolve.name.FqName;
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 java.util.ArrayList;
import java.util.Collections;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.Arrays;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassObject.java
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetClassObject extends JetDeclarationStub<KotlinPlaceHolderStub<JetClassObject>> implements JetStatementExpression {
public JetClassObject(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclaration.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.psi;
import com.intellij.util.ArrayFactory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.kdoc.psi.api.KDoc;
import org.jetbrains.kotlin.kdoc.psi.api.KDoc;
public interface JetDeclaration extends JetExpression, JetModifierListOwner {
JetDeclaration[] EMPTY_ARRAY = new JetDeclaration[0];
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationImpl.java
+3 -3
View File
@@ -20,11 +20,11 @@ import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.kdoc.psi.api.KDoc;
import org.jetbrains.kotlin.kdoc.psi.api.KDoc;
import org.jetbrains.jet.lang.psi.addRemoveModifier.AddRemoveModifierPackage;
import org.jetbrains.jet.lang.psi.findDocComment.FindDocCommentPackage;
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 java.util.Collections;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationStub.java
+1 -1
View File
@@ -23,7 +23,7 @@ import com.intellij.psi.stubs.IStubElementType;
import com.intellij.psi.stubs.StubElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.kdoc.psi.api.KDoc;
import org.jetbrains.kotlin.kdoc.psi.api.KDoc;
import org.jetbrains.jet.lang.psi.findDocComment.FindDocCommentPackage;
import org.jetbrains.jet.lang.psi.stubs.KotlinClassOrObjectStub;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetDoWhileExpression extends JetWhileExpressionBase {
public JetDoWhileExpression(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lexer.JetToken;
import org.jetbrains.kotlin.lexer.JetToken;
import static org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes.INSIDE_DIRECTIVE_EXPRESSIONS;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetForExpression.java
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetForExpression extends JetLoopExpression {
public JetForExpression(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteral.java
+1 -1
View File
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetFunctionLiteral extends JetFunctionNotStubbed {
public JetFunctionLiteral(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionNotStubbed.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lang.psi.typeRefHelpers.TypeRefHelpersPackage;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.Collections;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionType.java
+2 -2
View File
@@ -22,8 +22,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lexer.JetToken;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetToken;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.ArrayList;
import java.util.Collections;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIfExpression.java
+1 -1
View File
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetIfExpression extends JetExpressionImpl {
public JetIfExpression(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportDirective.java
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lang.resolve.ImportPath;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetImportDirective extends JetElementImplStub<KotlinImportDirectiveStub> {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIsExpression.java
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetIsExpression extends JetExpressionImpl implements JetOperationExpression {
public JetIsExpression(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabelReferenceExpression.kt
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.lang.psi
import com.intellij.lang.ASTNode
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
public class JetLabelReferenceExpression(node: ASTNode) : JetSimpleNameExpressionImpl(node) {
public override fun getReferencedNameElement() = findChildByType(JetTokens.LABEL_IDENTIFIER) ?: this
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLoopExpression.java
+1 -1
View File
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public abstract class JetLoopExpression extends JetExpressionImpl implements JetStatementExpression {
public JetLoopExpression(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierList.java
+2 -2
View File
@@ -24,8 +24,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.stubs.KotlinModifierListStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lexer.JetModifierKeywordToken;
import org.jetbrains.jet.lexer.JetToken;
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
import org.jetbrains.kotlin.lexer.JetToken;
import java.util.ArrayList;
import java.util.Collections;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierListOwner.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.psi;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lexer.JetModifierKeywordToken;
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
public interface JetModifierListOwner extends PsiElement, JetAnnotated {
@Nullable
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierListOwnerStub.java
+2 -2
View File
@@ -23,8 +23,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.addRemoveModifier.AddRemoveModifierPackage;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
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 java.util.Collections;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclaration.java
+2 -2
View File
@@ -23,11 +23,11 @@ import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.List;
import static org.jetbrains.jet.lexer.JetTokens.*;
import static org.jetbrains.kotlin.lexer.JetTokens.*;
public class JetMultiDeclaration extends JetDeclarationImpl {
public JetMultiDeclaration(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java
+3 -3
View File
@@ -24,13 +24,13 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lang.psi.typeRefHelpers.TypeRefHelpersPackage;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.jet.lexer.JetTokens.VAL_KEYWORD;
import static org.jetbrains.jet.lexer.JetTokens.VAR_KEYWORD;
import static org.jetbrains.kotlin.lexer.JetTokens.VAL_KEYWORD;
import static org.jetbrains.kotlin.lexer.JetTokens.VAR_KEYWORD;
public class JetMultiDeclarationEntry extends JetNamedDeclarationNotStubbed implements JetVariableDeclaration {
public JetMultiDeclarationEntry(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNameReferenceExpression.java
+2 -2
View File
@@ -25,9 +25,9 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.stubs.KotlinNameReferenceExpressionStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import static org.jetbrains.jet.lexer.JetTokens.*;
import static org.jetbrains.kotlin.lexer.JetTokens.*;
public class JetNameReferenceExpression extends JetExpressionImplStub<KotlinNameReferenceExpressionStub> implements JetSimpleNameExpression {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedArgumentImpl.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetNamedArgumentImpl extends JetValueArgument {
public JetNamedArgumentImpl(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationNotStubbed.java
+1 -1
View File
@@ -22,7 +22,7 @@ import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationStub.java
+1 -1
View File
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.stubs.KotlinStubWithFqName;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.stubs.KotlinFunctionStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lang.psi.typeRefHelpers.TypeRefHelpersPackage;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.Collections;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNullableType.java
+1 -1
View File
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.stubs.KotlinPlaceHolderStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.Collections;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
+2 -2
View File
@@ -27,8 +27,8 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lang.psi.stubs.KotlinObjectStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
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 java.util.Collections;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclarationName.java
+1 -1
View File
@@ -24,7 +24,7 @@ import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.stubs.KotlinParameterStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lang.psi.typeRefHelpers.TypeRefHelpersPackage;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.Collections;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProjectionKind.java
+2 -2
View File
@@ -17,8 +17,8 @@
package org.jetbrains.jet.lang.psi;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lexer.JetSingleValueToken;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetSingleValueToken;
import org.jetbrains.kotlin.lexer.JetTokens;
public enum JetProjectionKind {
IN(JetTokens.IN_KEYWORD), OUT(JetTokens.OUT_KEYWORD), STAR(JetTokens.MUL), NONE(null);
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
+2 -2
View File
@@ -31,13 +31,13 @@ import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lang.psi.stubs.KotlinPropertyStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lang.psi.typeRefHelpers.TypeRefHelpersPackage;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.jet.JetNodeTypes.PROPERTY_DELEGATE;
import static org.jetbrains.jet.lexer.JetTokens.*;
import static org.jetbrains.kotlin.lexer.JetTokens.*;
public class JetProperty extends JetTypeParameterListOwnerStub<KotlinPropertyStub>
implements JetVariableDeclaration, PsiModifiableCodeBlock {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.stubs.KotlinPropertyAccessorStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.Collections;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyDelegate.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetPropertyDelegate extends JetElementImpl {
public JetPropertyDelegate(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.kt
+1 -1
View File
@@ -23,7 +23,7 @@ import com.intellij.psi.PsiFileFactory
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.util.LocalTimeCounter
import org.jetbrains.jet.lang.resolve.ImportPath
import org.jetbrains.jet.lexer.JetKeywordToken
import org.jetbrains.kotlin.lexer.JetKeywordToken
import org.jetbrains.jet.plugin.JetFileType
import org.jetbrains.jet.lang.psi.JetPsiFactory.CallableBuilder.Target
import com.intellij.openapi.util.Key
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
+3 -3
View File
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.kdoc.psi.api.KDocElement;
import org.jetbrains.kotlin.kdoc.psi.api.KDocElement;
import org.jetbrains.jet.lang.parsing.JetExpressionParsing;
import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage;
import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -43,8 +43,8 @@ import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.name.SpecialNames;
import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetToken;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetToken;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.Collection;
import java.util.HashSet;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetQualifiedExpression.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lexer.JetToken;
import org.jetbrains.kotlin.lexer.JetToken;
public interface JetQualifiedExpression extends JetExpression {
@NotNull
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetQualifiedExpressionImpl.kt
+3 -3
View File
@@ -19,8 +19,8 @@ package org.jetbrains.jet.lang.psi
import com.intellij.lang.ASTNode
import com.intellij.psi.PsiElement
import org.jetbrains.annotations.Nullable
import org.jetbrains.jet.lexer.JetToken
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetToken
import org.jetbrains.kotlin.lexer.JetTokens
import com.intellij.psi.util.PsiTreeUtil
object JetQualifiedExpressionImpl {
@@ -49,4 +49,4 @@ object JetQualifiedExpressionImpl {
}
return null
}
}
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lexer.JetToken;
import org.jetbrains.kotlin.lexer.JetToken;
public class JetSafeQualifiedExpression extends JetExpressionImpl implements JetQualifiedExpression {
public JetSafeQualifiedExpression(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.kt
+2 -2
View File
@@ -23,8 +23,8 @@ import com.intellij.psi.tree.TokenSet
import org.jetbrains.annotations.Nullable
import org.jetbrains.jet.lang.parsing.JetExpressionParsing
import org.jetbrains.jet.lang.resolve.name.Name
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.jet.lexer.JetTokens.*
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens.*
public trait JetSimpleNameExpression : JetReferenceExpression {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java
+1 -1
View File
@@ -23,7 +23,7 @@ import com.intellij.psi.PsiLanguageInjectionHost;
import com.intellij.psi.tree.TokenSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetStringTemplateExpression extends JetExpressionImpl implements PsiLanguageInjectionHost {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java
+1 -1
View File
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.stubs.KotlinTypeConstraintStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetTypeConstraint extends JetElementImplStub<KotlinTypeConstraintStub> {
public JetTypeConstraint(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.stubs.KotlinTypeParameterStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lang.types.Variance;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetTypeParameter extends JetNamedDeclarationStub<KotlinTypeParameterStub> {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.stubs.KotlinTypeProjectionStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetTypeProjection extends JetModifierListOwnerStub<KotlinTypeProjectionStub> {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetUserType.java
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.stubs.KotlinUserTypeStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.Collections;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgument.java
+1 -1
View File
@@ -21,7 +21,7 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetValueArgument extends JetElementImpl implements ValueArgument {
public JetValueArgument(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java
+1 -1
View File
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java
+1 -1
View File
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetWhenConditionInRange extends JetWhenCondition {
public JetWhenConditionInRange(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetWhenConditionIsPattern extends JetWhenCondition {
public JetWhenConditionIsPattern(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
public class JetWhenEntry extends JetElementImpl {
public JetWhenEntry(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java
+1 -1
View File
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/psi/TypeRefHelpers.kt
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.lang.psi.typeRefHelpers
import org.jetbrains.jet.lang.psi.JetTypeReference
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.psi.psiUtil.siblings
import com.intellij.psi.PsiElement
import org.jetbrains.jet.lang.psi.JetPsiFactory
compiler/frontend/src/org/jetbrains/jet/lang/psi/addRemoveModifier.kt
+2 -2
View File
@@ -16,8 +16,8 @@
package org.jetbrains.jet.lang.psi.addRemoveModifier
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 com.intellij.psi.PsiComment
import com.intellij.psi.PsiWhiteSpace
import org.jetbrains.jet.lang.psi.JetModifierListOwner
compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/jetPsiUtil.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import org.jetbrains.jet.lang.psi.*
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import java.util.Collections
import com.intellij.extapi.psi.StubBasedPsiElementBase
import java.util.ArrayList
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/StubInterfaces.kt
+2 -2
View File
@@ -21,7 +21,7 @@ import com.intellij.psi.stubs.NamedStub
import org.jetbrains.jet.lang.resolve.name.FqName
import com.intellij.psi.stubs.StubElement
import com.intellij.psi.stubs.PsiFileStub
import org.jetbrains.jet.lexer.JetModifierKeywordToken
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken
import org.jetbrains.jet.lang.psi.*
public trait KotlinFileStub : PsiFileStub<JetFile> {
@@ -118,4 +118,4 @@ public trait KotlinTypeProjectionStub : StubElement<JetTypeProjection> {
public trait KotlinUserTypeStub : StubElement<JetUserType> {
public fun isAbsoluteInRootPackage(): Boolean
}
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinModifierListStubImpl.java
+1 -1
View File
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetModifierList;
import org.jetbrains.jet.lang.psi.stubs.KotlinModifierListStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetModifierListElementType;
import org.jetbrains.jet.lexer.JetModifierKeywordToken;
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
public class KotlinModifierListStubImpl extends KotlinStubBaseImpl<JetModifierList> implements KotlinModifierListStub {
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/ModifierMaskUtils.kt
+3 -3
View File
@@ -18,8 +18,8 @@ package org.jetbrains.jet.lang.psi.stubs.impl
import org.jetbrains.jet.lang.psi.JetModifierList
import org.jetbrains.jet.lexer.JetTokens.MODIFIER_KEYWORDS_ARRAY
import org.jetbrains.jet.lexer.JetModifierKeywordToken
import org.jetbrains.kotlin.lexer.JetTokens.MODIFIER_KEYWORDS_ARRAY
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken
import kotlin.platform.platformStatic
public object ModifierMaskUtils {
@@ -62,4 +62,4 @@ public object ModifierMaskUtils {
return sb.toString()
}
}
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
+1 -1
View File
@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.scopes.*;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.jet.util.Box;
import org.jetbrains.jet.util.ReenteringLazyValueComputationException;
import org.jetbrains.jet.util.slicedmap.WritableSlice;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java
+2 -2
View File
@@ -29,8 +29,8 @@ import org.jetbrains.jet.lang.types.SubstitutionUtils;
import org.jetbrains.jet.lang.types.TypeConstructor;
import org.jetbrains.jet.lang.types.TypeProjection;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
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 javax.inject.Inject;
import java.util.*;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+5 -5
View File
@@ -45,9 +45,9 @@ import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
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.kotlin.storage.StorageManager;
import javax.inject.Inject;
@@ -59,8 +59,8 @@ import static org.jetbrains.jet.lang.resolve.BindingContext.*;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*;
import static org.jetbrains.jet.lang.resolve.ModifiersChecker.*;
import static org.jetbrains.jet.lang.resolve.source.SourcePackage.toSourceElement;
import static org.jetbrains.jet.lexer.JetTokens.OVERRIDE_KEYWORD;
import static org.jetbrains.jet.lexer.JetTokens.VARARG_KEYWORD;
import static org.jetbrains.kotlin.lexer.JetTokens.OVERRIDE_KEYWORD;
import static org.jetbrains.kotlin.lexer.JetTokens.VARARG_KEYWORD;
public class DescriptorResolver {
public static final Name COPY_METHOD_NAME = Name.identifier("copy");
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java
+3 -3
View File
@@ -32,13 +32,13 @@ import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
import org.jetbrains.jet.lang.resolve.constants.StringValue;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
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 java.util.*;
import static org.jetbrains.jet.lang.diagnostics.Errors.*;
import static org.jetbrains.jet.lexer.JetTokens.*;
import static org.jetbrains.kotlin.lexer.JetTokens.*;
public class ModifiersChecker {
private static final Collection<JetModifierKeywordToken> MODALITY_MODIFIERS =
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+1 -1
View File
@@ -41,7 +41,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.jet.lang.types.*;
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.kotlin.utils.HashSetUtil;
import javax.inject.Inject;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt
+1 -1
View File
@@ -35,7 +35,7 @@ import org.jetbrains.jet.context.LazinessToken
import org.jetbrains.jet.lang.resolve.lazy.LazyEntity
import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
public class TypeResolver(
private val annotationResolver: AnnotationResolver,
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java
+1 -1
View File
@@ -49,7 +49,7 @@ import org.jetbrains.jet.lang.types.expressions.DataFlowUtils;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingContext;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import javax.inject.Inject;
import java.util.Collections;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java
+1 -1
View File
@@ -43,7 +43,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingContext;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import javax.inject.Inject;
import java.util.Collection;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/InlineCallResolverExtension.java
+2 -2
View File
@@ -37,8 +37,8 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.InlineUtil;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetToken;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetToken;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.HashSet;
import java.util.Map;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java
+2 -2
View File
@@ -35,8 +35,8 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.Variance;
import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
import org.jetbrains.jet.lexer.JetToken;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetToken;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.Collection;
import java.util.List;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt
+1 -1
View File
@@ -45,7 +45,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScopeImpl
import org.jetbrains.kotlin.utils.Printer
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
import org.jetbrains.jet.lang.descriptors.VariableDescriptor
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.jet.lang.types.expressions.OperatorConventions
import org.jetbrains.jet.lang.psi.JetOperationReferenceExpression
import org.jetbrains.jet.lang.resolve.DescriptorFactory
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil;
import org.jetbrains.jet.lang.resolve.lazy.LazyEntity;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.Set;
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
+3 -3
View File
@@ -61,7 +61,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.TransientReceiver;
import org.jetbrains.jet.lang.types.*;
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.util.slicedmap.WritableSlice;
import org.jetbrains.kotlin.utils.ThrowingList;
@@ -82,8 +82,8 @@ import static org.jetbrains.jet.lang.types.TypeUtils.noExpectedType;
import static org.jetbrains.jet.lang.types.expressions.ControlStructureTypingUtils.createCallForSpecialConstruction;
import static org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils.*;
import static org.jetbrains.jet.lang.types.expressions.TypeReconstructionUtil.reconstructBareType;
import static org.jetbrains.jet.lexer.JetTokens.AS_KEYWORD;
import static org.jetbrains.jet.lexer.JetTokens.AS_SAFE;
import static org.jetbrains.kotlin.lexer.JetTokens.AS_KEYWORD;
import static org.jetbrains.kotlin.lexer.JetTokens.AS_SAFE;
@SuppressWarnings("SuspiciousMethodCalls")
public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingUtils.java
+1 -1
View File
@@ -46,7 +46,7 @@ import org.jetbrains.jet.lang.resolve.calls.util.CallMaker;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.JetTokens;
import java.util.*;
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java
+1 -1
View File
@@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant;
import org.jetbrains.jet.lang.types.*;
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 java.util.Collection;
import java.util.Set;

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