Fix issue with num ranges

Author: C4tWithShell

community-rust-checks/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elegoff</groupId>
         <artifactId>community-rust</artifactId>
-        <version>0.3.0</version>
+        <version>0.2.6</version>
     </parent>
 
     <artifactId>community-rust-checks</artifactId>

community-rust-frontend/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elegoff</groupId>
         <artifactId>community-rust</artifactId>
-        <version>0.3.0</version>
+        <version>0.2.6</version>
     </parent>
 
     <artifactId>community-rust-frontend</artifactId>

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

@@ -908,9 +908,14 @@ private static void patterns(LexerlessGrammarBuilder b) {
       PATTERN_NO_TOP_ALT, SPC,
       b.zeroOrMore(b.sequence(RustPunctuator.OR, SPC, PATTERN_NO_TOP_ALT, SPC)));
     b.rule(PATTERN_NO_TOP_ALT).is(b.firstOf(
-      RANGE_PATTERN,
-      PATTERN_WITHOUT_RANGE));
-
+        b.sequence(
+            INTEGER_LITERAL,
+            RustPunctuator.DOTDOT,
+            INTEGER_LITERAL
+        ),
+        RANGE_PATTERN,
+        PATTERN_WITHOUT_RANGE
+    ));
     b.rule(PATTERN_WITHOUT_RANGE).is(b.firstOf(
       TUPLE_STRUCT_PATTERN,
       STRUCT_PATTERN,
@@ -961,7 +966,26 @@ private static void patterns(LexerlessGrammarBuilder b) {
     b.rule(WILDCARD_PATTERN).is(RustPunctuator.UNDERSCORE);
     b.rule(REST_PATTERN).is(RustPunctuator.DOTDOT);
 
-    b.rule(RANGE_PATTERN).is(b.firstOf(OBSOLETE_RANGE_PATTERN, INCLUSIVE_RANGE_PATTERN, HALF_OPEN_RANGE_PATTERN));
+    b.rule(RANGE_PATTERN).is(b.firstOf(
+        OBSOLETE_RANGE_PATTERN,
+        INCLUSIVE_RANGE_PATTERN,
+        HALF_OPEN_RANGE_PATTERN,
+        b.sequence(
+            INTEGER_LITERAL,
+            RustPunctuator.DOTDOT,
+            INTEGER_LITERAL
+        ),
+        // Left-unbounded range: ..5
+        b.sequence(
+            RustPunctuator.DOTDOT,
+            INTEGER_LITERAL
+        ),
+        // Right-unbounded range: 5..
+        b.sequence(
+            INTEGER_LITERAL,
+            RustPunctuator.DOTDOT
+        )
+    ));
     b.rule(INCLUSIVE_RANGE_PATTERN).is(b.sequence(RANGE_PATTERN_BOUND, SPC, RustPunctuator.DOTDOTEQ, SPC, RANGE_PATTERN_BOUND));
     b.rule(HALF_OPEN_RANGE_PATTERN).is(b.sequence(RANGE_PATTERN_BOUND, SPC, RustPunctuator.DOTDOT));
     b.rule(OBSOLETE_RANGE_PATTERN).is(b.sequence(RANGE_PATTERN_BOUND, SPC, RustPunctuator.DOTDOTDOT, SPC, RANGE_PATTERN_BOUND));

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

@@ -106,4 +106,21 @@ private void testImportParsing(String filename) {
 
     parser.parse(sexpr);
   }
+
+  @Test
+  void testNumRange() {
+    String sexpr = "\n" +
+        "fn get_referral_tier(referrals_count: i64) -> Result<i64, CustomError> {\n" +
+        "       match referrals_count {\n" +
+        "             ..0 => Ok(0),\n" +
+        "             1 => Ok(1),\n" +
+        "             2..5 => Ok(2)\n" +
+        "             5.. => Ok(3)\n" +
+        "       }\n" +
+        "}";
+    ParserAdapter<LexerlessGrammar> parser = new ParserAdapter<>(
+        StandardCharsets.UTF_8, RustGrammar.create().build());
+    
+    parser.parse(sexpr);
+  }
 }

community-rust-plugin/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elegoff</groupId>
         <artifactId>community-rust</artifactId>
-        <version>0.3.0</version>
+        <version>0.2.6</version>
     </parent>
     <artifactId>community-rust-plugin</artifactId>
     <packaging>sonar-plugin</packaging>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.elegoff</groupId>
     <artifactId>community-rust</artifactId>
-    <version>0.3.0</version>
+    <version>0.2.6</version>
 
     <packaging>pom</packaging>
 
@@ -62,7 +62,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <sonar.version>10.7.0.96327</sonar.version>
-        <sonar.plugin.api.version>11.1.0.2693</sonar.plugin.api.version>
+        <sonar.plugin.api.version>10.11.0.2468</sonar.plugin.api.version>
 
 
       <!-- Advertise minimal required JRE version -->