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

fix(KT-52339): add newlines to SourceMap to calculate multiline comments in a right way.

Browse Source
This commit is contained in:
Artem Kobzar
2022-05-20 13:35:54 +00:00
committed by Space
parent 84ed3ff5b0
commit 8bc5508f5c
4 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/testOld/utils/DirectiveTestUtils.java
+17 -7
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.js.testOld.utils;
import com.intellij.openapi.util.text.StringUtil;
import kotlin.text.StringsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.js.backend.ast.*;
@@ -308,14 +309,14 @@ public class DirectiveTestUtils {
return isMultiLine ? new RecursiveJsVisitor() {
@Override
public void visitMultiLineComment(@NotNull JsMultiLineComment comment) {
if (comment.getText().trim().equals(text)) {
if (isTheSameText(comment.getText(), text)) {
setElementExists(true);
}
}
} : new RecursiveJsVisitor() {
@Override
public void visitSingleLineComment(@NotNull JsSingleLineComment comment) {
if (comment.getText().trim().equals(text)) {
if (isTheSameText(comment.getText(), text)) {
setElementExists(true);
}
}
@@ -324,9 +325,22 @@ public class DirectiveTestUtils {
@Override
protected void loadArguments(@NotNull ArgumentsHelper arguments) {
this.text = arguments.findNamedArgument("text");
this.text = arguments.findNamedArgument("text").replace("\\n", System.lineSeparator());
this.isMultiLine = Boolean.parseBoolean(arguments.findNamedArgument("multiline"));
}
private boolean isTheSameText(String str1, String str2) {
List<String> lines1 = StringsKt.lines(str1);
List<String> lines2 = StringsKt.lines(str2);
if (lines1.size() != lines2.size()) return false;
for (int i = 0; i < lines1.size(); i++) {
if (!lines1.get(i).trim().equals(lines2.get(i).trim())) return false;
}
return true;
}
};
private static final DirectiveHandler CHECK_COMMENT_DOESNT_EXIST = new NodeExistenceDirective("CHECK_COMMENT_DOESNT_EXIST", false) {
@@ -531,10 +545,6 @@ public class DirectiveTestUtils {
return node;
}
public static void checkCommentExists(JsNode node, String content, boolean isMultiline) {
}
public static void checkPropertyNotUsed(JsNode node, String propertyName, String scope, boolean isGetAllowed, boolean isSetAllowed)
throws Exception {
PropertyReferenceCollector counter = PropertyReferenceCollector.Companion.collect(findScope(node, scope));