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

remove support for "package.foo.bar" syntax inside files

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-12-10 16:12:55 +01:00
parent 19084b8182
commit 8db3fb03f9
27 changed files with 0 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/KtNodeTypes.java
-1
View File
@@ -144,7 +144,6 @@ public interface KtNodeTypes {
KtNodeType SAFE_ACCESS_EXPRESSION = new KtNodeType("SAFE_ACCESS_EXPRESSION", KtSafeQualifiedExpression.class);
KtNodeType OBJECT_LITERAL = new KtNodeType("OBJECT_LITERAL", KtObjectLiteralExpression.class);
KtNodeType ROOT_PACKAGE = new KtNodeType("ROOT_PACKAGE", KtRootPackageExpression.class);
KtNodeType WHEN = new KtNodeType("WHEN", KtWhenExpression.class);
KtNodeType WHEN_ENTRY = new KtNodeType("WHEN_ENTRY", KtWhenEntry.class);
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
-1
View File
@@ -743,7 +743,6 @@ public interface Errors {
DiagnosticFactory0<KtAnonymousInitializer> ANONYMOUS_INITIALIZER_IN_INTERFACE = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<KtThisExpression> NO_THIS = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<KtRootPackageExpression> PACKAGE_IS_NOT_AN_EXPRESSION = DiagnosticFactory0.create(ERROR);
DiagnosticFactory1<KtSimpleNameExpression, ClassifierDescriptor> NO_COMPANION_OBJECT = DiagnosticFactory1.create(ERROR);
DiagnosticFactory1<KtSimpleNameExpression, TypeParameterDescriptor> TYPE_PARAMETER_IS_NOT_AN_EXPRESSION = DiagnosticFactory1.create(ERROR);
DiagnosticFactory1<KtSimpleNameExpression, TypeParameterDescriptor> TYPE_PARAMETER_ON_LHS_OF_DOT = DiagnosticFactory1.create(ERROR);
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
-1
View File
@@ -305,7 +305,6 @@ public class DefaultErrorMessages {
MAP.put(EQUALS_MISSING, "No method 'equals(kotlin.Any?): kotlin.Boolean' available");
MAP.put(ASSIGNMENT_IN_EXPRESSION_CONTEXT, "Assignments are not expressions, and only expressions are allowed in this context");
MAP.put(PACKAGE_IS_NOT_AN_EXPRESSION, "'package' is not an expression, it can only be used on the left-hand side of a dot ('.')");
MAP.put(SUPER_IS_NOT_AN_EXPRESSION, "''{0}'' is not an expression, it can only be used on the left-hand side of a dot ('.')", STRING);
MAP.put(SUPER_CANT_BE_EXTENSION_RECEIVER, "''{0}'' is not an expression, it can not be used as a receiver for extension functions", STRING);
MAP.put(DECLARATION_IN_ILLEGAL_CONTEXT, "Declarations are not allowed in this position");
compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java
-4
View File
@@ -620,7 +620,6 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
* : functionLiteral
* : declaration
* : SimpleName
* : "package" // for the root package
* ;
*/
private boolean parseAtomicExpression() {
@@ -631,9 +630,6 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
if (at(LPAR)) {
parseParenthesizedExpression();
}
else if (at(PACKAGE_KEYWORD)) {
parseOneTokenExpression(ROOT_PACKAGE);
}
else if (at(THIS_KEYWORD)) {
parseThisExpression();
}
compiler/frontend/src/org/jetbrains/kotlin/psi/KtRootPackageExpression.java
-31
View File
@@ -1,31 +0,0 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.psi;
import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
public class KtRootPackageExpression extends KtExpressionImpl {
public KtRootPackageExpression(@NotNull ASTNode node) {
super(node);
}
@Override
public <R, D> R accept(@NotNull KtVisitor<R, D> visitor, D data) {
return visitor.visitRootPackageExpression(this, data);
}
}
compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitor.java
-4
View File
@@ -302,10 +302,6 @@ public class KtVisitor<R, D> extends PsiElementVisitor {
return visitExpression(expression, data);
}
public R visitRootPackageExpression(@NotNull KtRootPackageExpression expression, D data) {
return visitExpression(expression, data);
}
public R visitBlockExpression(@NotNull KtBlockExpression expression, D data) {
return visitExpression(expression, data);
}
compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoid.java
-10
View File
@@ -289,10 +289,6 @@ public class KtVisitorVoid extends KtVisitor<Void, Void> {
super.visitObjectLiteralExpression(expression, null);
}
public void visitRootPackageExpression(@NotNull KtRootPackageExpression expression) {
super.visitRootPackageExpression(expression, null);
}
public void visitBlockExpression(@NotNull KtBlockExpression expression) {
super.visitBlockExpression(expression, null);
}
@@ -842,12 +838,6 @@ public class KtVisitorVoid extends KtVisitor<Void, Void> {
return null;
}
@Override
public final Void visitRootPackageExpression(@NotNull KtRootPackageExpression expression, Void data) {
visitRootPackageExpression(expression);
return null;
}
@Override
public final Void visitBlockExpression(@NotNull KtBlockExpression expression, Void data) {
visitBlockExpression(expression);
compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoidWithParameter.java
-10
View File
@@ -286,10 +286,6 @@ public class KtVisitorVoidWithParameter<P> extends KtVisitor<Void, P> {
super.visitObjectLiteralExpression(expression, data);
}
public void visitRootPackageExpressionVoid(@NotNull KtRootPackageExpression expression, P data) {
super.visitRootPackageExpression(expression, data);
}
public void visitBlockExpressionVoid(@NotNull KtBlockExpression expression, P data) {
super.visitBlockExpression(expression, data);
}
@@ -809,12 +805,6 @@ public class KtVisitorVoidWithParameter<P> extends KtVisitor<Void, P> {
return null;
}
@Override
public final Void visitRootPackageExpression(@NotNull KtRootPackageExpression expression, P data) {
visitRootPackageExpressionVoid(expression, data);
return null;
}
@Override
public final Void visitBlockExpression(@NotNull KtBlockExpression expression, P data) {
visitBlockExpressionVoid(expression, data);
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java
-3
View File
@@ -279,9 +279,6 @@ public class DataFlowValueFactory {
getIdForStableIdentifier(postfixExpression.getBaseExpression(), bindingContext, containingDeclarationOrModule));
}
}
else if (expression instanceof KtRootPackageExpression) {
//todo return createPackageInfo());
}
return NO_IDENTIFIER_INFO;
}
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java
-8
View File
@@ -1486,14 +1486,6 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
return TypeInfoFactoryKt.noTypeInfo(context);
}
@Override
public KotlinTypeInfo visitRootPackageExpression(@NotNull KtRootPackageExpression expression, ExpressionTypingContext context) {
if (!KtPsiUtil.isLHSOfDot(expression)) {
context.trace.report(PACKAGE_IS_NOT_AN_EXPRESSION.on(expression));
}
return TypeInfoFactoryKt.noTypeInfo(context);
}
@Override
public KotlinTypeInfo visitStringTemplateExpression(
@NotNull KtStringTemplateExpression expression,
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java
-5
View File
@@ -384,11 +384,6 @@ public abstract class ExpressionTypingVisitorDispatcher extends KtVisitor<Kotlin
return basic.visitDeclaration(dcl, data);
}
@Override
public KotlinTypeInfo visitRootPackageExpression(@NotNull KtRootPackageExpression expression, ExpressionTypingContext data) {
return basic.visitRootPackageExpression(expression, data);
}
@Override
public KotlinTypeInfo visitStringTemplateExpression(@NotNull KtStringTemplateExpression expression, ExpressionTypingContext data) {
return basic.visitStringTemplateExpression(expression, data);