From 8cbea903f4d751ddf69428bcc227604460b84f71 Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Tue, 24 Jan 2017 16:14:12 +0300 Subject: [PATCH] JS: add checker that checks if JsQualifier has wrong format --- .../qualifier/wrongQualifier.kt | 17 +++++++ .../qualifier/wrongQualifier.txt | 1 + .../DiagnosticsTestWithJsStdLibGenerated.java | 21 ++++++++ .../js/resolve/JsPlatformConfigurator.kt | 1 + .../resolve/diagnostics/JsQualifierChecker.kt | 49 +++++++++++++++++++ 5 files changed, 89 insertions(+) create mode 100644 compiler/testData/diagnostics/testsWithJsStdLib/qualifier/wrongQualifier.kt create mode 100644 compiler/testData/diagnostics/testsWithJsStdLib/qualifier/wrongQualifier.txt create mode 100644 js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsQualifierChecker.kt diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/qualifier/wrongQualifier.kt b/compiler/testData/diagnostics/testsWithJsStdLib/qualifier/wrongQualifier.kt new file mode 100644 index 00000000000..a45793e2ac5 --- /dev/null +++ b/compiler/testData/diagnostics/testsWithJsStdLib/qualifier/wrongQualifier.kt @@ -0,0 +1,17 @@ +// FILE: a.kt +@file:JsQualifier("") + +// FILE: b.kt +@file:JsQualifier("a..b") + +// FILE: c.kt +@file:JsQualifier("a.") + +// FILE: d.kt +@file:JsQualifier(".a") + +// FILE: e.kt +@file:JsQualifier("%^&") + +// FILE: f.kt +@file:JsQualifier("a.bc.d23._$") \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/qualifier/wrongQualifier.txt b/compiler/testData/diagnostics/testsWithJsStdLib/qualifier/wrongQualifier.txt new file mode 100644 index 00000000000..ba3bd787383 --- /dev/null +++ b/compiler/testData/diagnostics/testsWithJsStdLib/qualifier/wrongQualifier.txt @@ -0,0 +1 @@ +package diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java index ec5fa64f499..f9928d49e08 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java @@ -996,6 +996,27 @@ public class DiagnosticsTestWithJsStdLibGenerated extends AbstractDiagnosticsTes } } + @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/qualifier") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Qualifier extends AbstractDiagnosticsTestWithJsStdLib { + public void testAllFilesPresentInQualifier() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/qualifier"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + } + + @TestMetadata("jsQualifierNonExternal.kt") + public void testJsQualifierNonExternal() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/qualifier/jsQualifierNonExternal.kt"); + doTest(fileName); + } + + @TestMetadata("wrongQualifier.kt") + public void testWrongQualifier() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/qualifier/wrongQualifier.kt"); + doTest(fileName); + } + } + @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/reflection") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsPlatformConfigurator.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsPlatformConfigurator.kt index 44d640cf604..33e3e9d5e9c 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsPlatformConfigurator.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsPlatformConfigurator.kt @@ -68,5 +68,6 @@ object JsPlatformConfigurator : PlatformConfigurator( container.useImpl() container.useImpl() container.useInstance(ExtensionFunctionToExternalIsInlinable) + container.useInstance(JsQualifierChecker) } } diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsQualifierChecker.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsQualifierChecker.kt new file mode 100644 index 00000000000..9af25d00528 --- /dev/null +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsQualifierChecker.kt @@ -0,0 +1,49 @@ +/* + * Copyright 2010-2017 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.js.resolve.diagnostics + +import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget +import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils +import org.jetbrains.kotlin.psi.KtAnnotationEntry +import org.jetbrains.kotlin.resolve.AdditionalAnnotationChecker +import org.jetbrains.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingTrace +import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe + +object JsQualifierChecker : AdditionalAnnotationChecker { + override fun checkEntries(entries: List, actualTargets: List, trace: BindingTrace) { + val bindingContext = trace.bindingContext + for (entry in entries) { + val annotation = bindingContext[BindingContext.ANNOTATION, entry] ?: continue + if (annotation.type.constructor.declarationDescriptor?.fqNameSafe != AnnotationsUtils.JS_QUALIFIER_ANNOTATION) continue + val argument = annotation.allValueArguments.values.singleOrNull()?.value as? String ?: continue + if (!validateQualifier(argument)) { + val argumentPsi = entry.valueArgumentList!!.arguments[0] + trace.report(ErrorsJs.WRONG_JS_QUALIFIER.on(argumentPsi)) + } + } + } + + private fun validateQualifier(qualifier: String): Boolean { + val parts = qualifier.split('.') + if (parts.isEmpty()) return false + + return parts.all { part -> + part.isNotEmpty() && part[0].isJavaIdentifierStart() && part.drop(1).all(Char::isJavaIdentifierPart) + } + } +}