From 093afeb05c2c038860d79e9788454b9d4cd7b835 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 10 Jan 2014 18:46:04 +0400 Subject: [PATCH] =?UTF-8?q?Renamed=20diagnostics=20(namespace=20=E2=86=92?= =?UTF-8?q?=20package).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jetbrains/jet/checkers/DebugInfoUtil.java | 4 ++-- .../jet/lang/diagnostics/Errors.java | 4 ++-- .../rendering/DefaultErrorMessages.java | 4 ++-- .../resolve/calls/CallExpressionResolver.java | 2 +- .../BasicExpressionTypingVisitor.java | 2 +- .../tests/NamespaceAsExpression.kt | 8 -------- .../diagnostics/tests/PackageAsExpression.kt | 8 ++++++++ ...tion.kt => PackageInExpressionPosition.kt} | 8 ++++---- .../tests/incompleteCode/kt2014.kt | 2 +- .../checkers/JetDiagnosticsTestGenerated.java | 20 +++++++++---------- 10 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 compiler/testData/diagnostics/tests/NamespaceAsExpression.kt create mode 100644 compiler/testData/diagnostics/tests/PackageAsExpression.kt rename compiler/testData/diagnostics/tests/{NamespaceInExpressionPosition.kt => PackageInExpressionPosition.kt} (72%) diff --git a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java b/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java index fb2c607005d..a6d55e6d1c1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java @@ -69,7 +69,7 @@ public class DebugInfoUtil { JetSuperExpression superExpression = (JetSuperExpression) diagnostic.getPsiElement(); markedWithErrorElements.put(superExpression.getInstanceReference(), factory); } - else if (factory == Errors.EXPRESSION_EXPECTED_NAMESPACE_FOUND) { + else if (factory == Errors.EXPRESSION_EXPECTED_PACKAGE_FOUND) { markedWithErrorElements.put((JetSimpleNameExpression) diagnostic.getPsiElement(), factory); } else if (factory == Errors.UNSUPPORTED) { @@ -134,7 +134,7 @@ public class DebugInfoUtil { DiagnosticFactory factory = markedWithErrorElements.get(expression); if (declarationDescriptor != null && (ErrorUtils.isError(declarationDescriptor) || ErrorUtils.containsErrorType(expressionType))) { - if (factory != Errors.EXPRESSION_EXPECTED_NAMESPACE_FOUND) { + if (factory != Errors.EXPRESSION_EXPECTED_PACKAGE_FOUND) { debugInfoReporter.reportElementWithErrorType(expression); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java index 17d4106a297..a9165da3e7d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java @@ -555,7 +555,7 @@ public interface Errors { DiagnosticFactory0 ASSIGNMENT_IN_EXPRESSION_CONTEXT = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 DECLARATION_IN_ILLEGAL_CONTEXT = DiagnosticFactory0.create(ERROR); - DiagnosticFactory0 EXPRESSION_EXPECTED_NAMESPACE_FOUND = DiagnosticFactory0.create(ERROR); + DiagnosticFactory0 EXPRESSION_EXPECTED_PACKAGE_FOUND = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 RETURN_NOT_ALLOWED = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED = DiagnosticFactory0.create(ERROR); @@ -566,7 +566,7 @@ public interface Errors { DiagnosticFactory0 ANONYMOUS_INITIALIZER_IN_TRAIT = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 NO_THIS = DiagnosticFactory0.create(ERROR); - DiagnosticFactory0 NAMESPACE_IS_NOT_AN_EXPRESSION = DiagnosticFactory0.create(ERROR); + DiagnosticFactory0 PACKAGE_IS_NOT_AN_EXPRESSION = DiagnosticFactory0.create(ERROR); DiagnosticFactory1 NO_CLASS_OBJECT = DiagnosticFactory1.create(ERROR); DiagnosticFactory1 TYPE_PARAMETER_IS_NOT_AN_EXPRESSION = DiagnosticFactory1.create(ERROR); DiagnosticFactory1 TYPE_PARAMETER_ON_LHS_OF_DOT = DiagnosticFactory1.create(ERROR); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java index b399e132aa2..15f22e95a35 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java @@ -88,7 +88,7 @@ public class DefaultErrorMessages { MAP.put(RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED, "'return' is only allowed in function literals that have return types specified explicitly"); MAP.put(PROJECTION_IN_IMMEDIATE_ARGUMENT_TO_SUPERTYPE, "Projections are not allowed for immediate arguments of a supertype"); MAP.put(LABEL_NAME_CLASH, "There is more than one label with such a name in this scope"); - MAP.put(EXPRESSION_EXPECTED_NAMESPACE_FOUND, "Expression expected, but a namespace name found"); + MAP.put(EXPRESSION_EXPECTED_PACKAGE_FOUND, "Expression expected, but a package name found"); MAP.put(CANNOT_IMPORT_FROM_ELEMENT, "Cannot import from ''{0}''", NAME); MAP.put(CANNOT_BE_IMPORTED, "Cannot import ''{0}'', functions and properties can be imported only from packages", NAME); @@ -216,7 +216,7 @@ public class DefaultErrorMessages { MAP.put(EQUALS_MISSING, "No method 'equals(jet.Any?) : jet.Boolean' available"); MAP.put(ASSIGNMENT_IN_EXPRESSION_CONTEXT, "Assignments are not expressions, and only expressions are allowed in this context"); - MAP.put(NAMESPACE_IS_NOT_AN_EXPRESSION, "'namespace' is not an expression, it can only be used on the left-hand side of a dot ('.')"); + 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 ('.')", TO_STRING); MAP.put(DECLARATION_IN_ILLEGAL_CONTEXT, "Declarations are not allowed in this position"); MAP.put(SETTER_PARAMETER_WITH_DEFAULT_VALUE, "Setter parameters cannot have default values"); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java index 9a88c3799d5..129953c148b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java @@ -197,7 +197,7 @@ public class CallExpressionResolver { result[0] = packageType; return true; } - context.trace.report(EXPRESSION_EXPECTED_NAMESPACE_FOUND.on(expression)); + context.trace.report(EXPRESSION_EXPECTED_PACKAGE_FOUND.on(expression)); result[0] = ErrorUtils.createErrorType("Type for " + expression.getReferencedNameAsName()); return false; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java index 00c1de0680d..78a6fe5aa71 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java @@ -1174,7 +1174,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { if (JetPsiUtil.isLHSOfDot(expression)) { return DataFlowUtils.checkType(JetModuleUtil.getRootPackageType(expression), expression, context, context.dataFlowInfo); } - context.trace.report(NAMESPACE_IS_NOT_AN_EXPRESSION.on(expression)); + context.trace.report(PACKAGE_IS_NOT_AN_EXPRESSION.on(expression)); return JetTypeInfo.create(null, context.dataFlowInfo); } diff --git a/compiler/testData/diagnostics/tests/NamespaceAsExpression.kt b/compiler/testData/diagnostics/tests/NamespaceAsExpression.kt deleted file mode 100644 index 9d2ca455811..00000000000 --- a/compiler/testData/diagnostics/tests/NamespaceAsExpression.kt +++ /dev/null @@ -1,8 +0,0 @@ -// FILE: b.kt -package root.a - -// FILE: b.kt -package root - -val x = a -val y2 = package \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/PackageAsExpression.kt b/compiler/testData/diagnostics/tests/PackageAsExpression.kt new file mode 100644 index 00000000000..bd99f996f75 --- /dev/null +++ b/compiler/testData/diagnostics/tests/PackageAsExpression.kt @@ -0,0 +1,8 @@ +// FILE: b.kt +package root.a + +// FILE: b.kt +package root + +val x = a +val y2 = package \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/NamespaceInExpressionPosition.kt b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt similarity index 72% rename from compiler/testData/diagnostics/tests/NamespaceInExpressionPosition.kt rename to compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt index 7b69e82dea8..6288201f899 100644 --- a/compiler/testData/diagnostics/tests/NamespaceInExpressionPosition.kt +++ b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt @@ -2,18 +2,18 @@ package foo class X {} -val s = java +val s = java val ss = System val sss = X val x = "${System}" -val xs = java.lang +val xs = java.lang val xss = java.lang.System val xsss = foo.X -val xssss = foo +val xssss = foo val f = { System } fun main(args : Array) { - java = null + java = null System = null System!! java.lang.System = null diff --git a/compiler/testData/diagnostics/tests/incompleteCode/kt2014.kt b/compiler/testData/diagnostics/tests/incompleteCode/kt2014.kt index e57d8b9853f..3b22ed99606 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/kt2014.kt +++ b/compiler/testData/diagnostics/tests/incompleteCode/kt2014.kt @@ -13,7 +13,7 @@ fun x(f : Foo) { f.bar f.a() - c() + c() R() } diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java index 762ec8a178c..f4f4a4926ac 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java @@ -309,16 +309,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { doTest("compiler/testData/diagnostics/tests/NamedArgumentsAndDefaultValues.kt"); } - @TestMetadata("NamespaceAsExpression.kt") - public void testNamespaceAsExpression() throws Exception { - doTest("compiler/testData/diagnostics/tests/NamespaceAsExpression.kt"); - } - - @TestMetadata("NamespaceInExpressionPosition.kt") - public void testNamespaceInExpressionPosition() throws Exception { - doTest("compiler/testData/diagnostics/tests/NamespaceInExpressionPosition.kt"); - } - @TestMetadata("NamespaceQualified.kt") public void testNamespaceQualified() throws Exception { doTest("compiler/testData/diagnostics/tests/NamespaceQualified.kt"); @@ -344,6 +334,16 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { doTest("compiler/testData/diagnostics/tests/OverridingVarByVal.kt"); } + @TestMetadata("PackageAsExpression.kt") + public void testPackageAsExpression() throws Exception { + doTest("compiler/testData/diagnostics/tests/PackageAsExpression.kt"); + } + + @TestMetadata("PackageInExpressionPosition.kt") + public void testPackageInExpressionPosition() throws Exception { + doTest("compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt"); + } + @TestMetadata("PrimaryConstructors.kt") public void testPrimaryConstructors() throws Exception { doTest("compiler/testData/diagnostics/tests/PrimaryConstructors.kt");