Skip to content

Commit 103eb79

Browse files
committed
Fix sonarcloud issues
1 parent d816afe commit 103eb79

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

community-rust-frontend/src/main/java/org/sonar/rust/RustGrammar.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2056,12 +2056,15 @@ private static void identifiers(LexerlessGrammarBuilder b) {
20562056
}
20572057

20582058
private static String exceptKeywords() {
2059-
StringBuilder sb = new StringBuilder("(?<!(");
20602059
String[] values = RustKeyword.keywordValues();
2060+
if (values.length == 0) {
2061+
return "";
2062+
}
2063+
2064+
StringBuilder sb = new StringBuilder("(?<!(");
20612065
sb.append("^").append(values[0]).append("$");
2062-
for (String kw : values) {
2063-
sb.append("|^");
2064-
sb.append(kw).append("$");
2066+
for (int i = 1; i < values.length; i++) {
2067+
sb.append("|^").append(values[i]).append("$");
20652068
}
20662069
sb.append("))");
20672070

community-rust-frontend/src/test/java/org/sonar/rust/RustLexerTest.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void testParsing() {
8484
assertThat(rootNode.getType()).isSameAs(RustGrammar.COMPILATION_UNIT);
8585
AstNode astNode = rootNode;
8686
// org.fest.assertions.Assertions.assertThat(astNode.getNumberOfChildren()).isEqualTo(4);
87-
System.out.println(AstXmlPrinter.print(astNode));
87+
// System.out.println(AstXmlPrinter.print(astNode));
8888

8989
}
9090

@@ -104,7 +104,8 @@ private void testImportParsing(String filename) {
104104
ParserAdapter<LexerlessGrammar> parser = new ParserAdapter<>(
105105
StandardCharsets.UTF_8, RustGrammar.create().build());
106106

107-
parser.parse(sexpr);
107+
AstNode rootNode = parser.parse(sexpr);
108+
assertThat(rootNode).isNotNull();
108109
}
109110

110111
@Test
@@ -121,7 +122,8 @@ void testNumRange() {
121122
ParserAdapter<LexerlessGrammar> parser = new ParserAdapter<>(
122123
StandardCharsets.UTF_8, RustGrammar.create().build());
123124

124-
parser.parse(sexpr);
125+
AstNode rootNode = parser.parse(sexpr);
126+
assertThat(rootNode).isNotNull();
125127
}
126128

127129
@Test
@@ -150,10 +152,6 @@ void testContinueProcessingCondition() {
150152

151153
// Expect this to be parsed successfully or reproduce the issue
152154
AstNode rootNode = parser.parse(source);
153-
154-
// Debug output
155-
System.out.println(AstXmlPrinter.print(rootNode));
156-
157155
// Ensure parsing is successful
158156
assertThat(rootNode).isNotNull();
159157
}

0 commit comments

Comments
 (0)