fix: more parser fixes

Signed-off-by: Chao Wang <chaowan@redhat.com>

Author: soul2zimate

src/main/gen/org/jboss/tools/intellij/componentanalysis/golang/build/lexer/GoModLexer.java

@@ -97,13 +97,13 @@ private static int zzUnpackcmap_blocks(String packed, int offset, int [] result)
   private static final int [] ZZ_ACTION = zzUnpackAction();
 
   private static final String ZZ_ACTION_PACKED_0 =
-    "\1\0\1\1\1\2\1\3\1\1\1\4\1\5\1\1"+
-    "\1\6\1\1\7\7\1\10\3\0\1\11\1\7\1\12"+
-    "\3\7\3\6\13\7\1\6\7\7\1\13\2\7\1\14"+
-    "\1\7\1\15\1\16\1\17";
+    "\1\0\1\1\1\2\1\3\1\1\1\4\1\5\2\1"+
+    "\1\6\1\1\7\7\1\0\1\10\3\0\1\11\1\7"+
+    "\1\12\3\7\3\6\13\7\1\6\7\7\1\13\2\7"+
+    "\1\14\1\7\1\15\1\16\1\17";
 
   private static int [] zzUnpackAction() {
-    int [] result = new int[57];
+    int [] result = new int[59];
     int offset = 0;
     offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
     return result;
@@ -130,15 +130,15 @@ private static int zzUnpackAction(String packed, int offset, int [] result) {
   private static final String ZZ_ROWMAP_PACKED_0 =
     "\0\0\0\37\0\76\0\37\0\135\0\37\0\37\0\174"+
     "\0\233\0\272\0\331\0\370\0\u0117\0\u0136\0\u0155\0\u0174"+
-    "\0\u0193\0\u01b2\0\u01d1\0\u01f0\0\u020f\0\37\0\u022e\0\331"+
-    "\0\u024d\0\u026c\0\u028b\0\u02aa\0\u01d1\0\u02c9\0\u02e8\0\u0307"+
+    "\0\u0193\0\u01b2\0\u01d1\0\u01f0\0\u020f\0\u022e\0\u024d\0\37"+
+    "\0\u026c\0\370\0\u028b\0\u02aa\0\u02c9\0\u02e8\0\u020f\0\u0307"+
     "\0\u0326\0\u0345\0\u0364\0\u0383\0\u03a2\0\u03c1\0\u03e0\0\u03ff"+
     "\0\u041e\0\u043d\0\u045c\0\u047b\0\u049a\0\u04b9\0\u04d8\0\u04f7"+
-    "\0\u0516\0\331\0\u0535\0\u0554\0\331\0\u0573\0\331\0\331"+
-    "\0\331";
+    "\0\u0516\0\u0535\0\u0554\0\370\0\u0573\0\u0592\0\370\0\u05b1"+
+    "\0\370\0\370\0\370";
 
   private static int [] zzUnpackRowMap() {
-    int [] result = new int[57];
+    int [] result = new int[59];
     int offset = 0;
     offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
     return result;
@@ -161,42 +161,44 @@ private static int zzUnpackRowMap(String packed, int offset, int [] result) {
   private static final int [] ZZ_TRANS = zzUnpacktrans();
 
   private static final String ZZ_TRANS_PACKED_0 =
-    "\1\2\1\3\1\4\1\5\1\6\1\7\3\2\1\10"+
-    "\1\11\1\12\1\2\4\13\1\14\1\15\1\16\1\13"+
-    "\1\17\4\13\1\20\2\13\1\21\1\13\40\0\1\3"+
-    "\37\0\1\4\45\0\1\22\33\0\1\23\1\24\1\25"+
-    "\1\0\1\11\40\0\1\26\31\0\4\13\2\0\22\13"+
-    "\7\0\4\13\2\0\21\13\1\27\7\0\4\13\2\0"+
-    "\12\13\1\30\7\13\7\0\4\13\2\0\11\13\1\31"+
-    "\10\13\7\0\4\13\2\0\12\13\1\32\7\13\7\0"+
-    "\4\13\2\0\4\13\1\33\15\13\7\0\3\13\1\34"+
-    "\2\0\22\13\2\22\2\0\33\22\7\0\2\35\1\0"+
-    "\1\35\2\0\22\35\7\0\2\36\1\0\1\36\2\0"+
-    "\22\36\12\0\1\11\33\0\4\13\2\0\2\13\1\37"+
-    "\17\13\7\0\4\13\2\0\3\13\1\40\16\13\7\0"+
-    "\4\13\2\0\3\13\1\41\16\13\7\0\4\13\2\0"+
-    "\13\13\1\42\1\43\5\13\6\0\1\23\1\44\1\21"+
-    "\1\13\1\34\2\0\22\13\6\0\1\23\2\36\1\0"+
-    "\1\36\2\0\22\36\7\0\4\13\2\0\7\13\1\45"+
-    "\12\13\7\0\4\13\2\0\6\13\1\46\13\13\7\0"+
-    "\4\13\2\0\17\13\1\47\2\13\7\0\4\13\2\0"+
-    "\7\13\1\50\12\13\7\0\4\13\2\0\17\13\1\51"+
-    "\2\13\7\0\2\52\1\13\1\52\2\0\22\52\7\0"+
-    "\4\13\2\0\17\13\1\53\2\13\7\0\4\13\2\0"+
-    "\15\13\1\54\4\13\7\0\4\13\2\0\7\13\1\55"+
-    "\12\13\7\0\4\13\2\0\1\13\1\56\20\13\7\0"+
-    "\4\13\2\0\6\13\1\57\13\13\6\0\1\23\2\52"+
-    "\1\13\1\52\2\0\22\52\7\0\4\13\2\0\3\13"+
-    "\1\60\16\13\7\0\4\13\2\0\4\13\1\61\15\13"+
-    "\7\0\4\13\2\0\4\13\1\62\15\13\7\0\4\13"+
-    "\2\0\2\13\1\63\17\13\7\0\4\13\2\0\15\13"+
-    "\1\64\4\13\7\0\4\13\2\0\4\13\1\65\15\13"+
-    "\7\0\4\13\2\0\2\13\1\66\17\13\7\0\4\13"+
-    "\2\0\4\13\1\67\15\13\7\0\4\13\2\0\4\13"+
-    "\1\70\15\13\7\0\4\13\2\0\16\13\1\71\3\13";
+    "\1\2\1\3\1\4\1\5\1\6\1\7\2\2\1\10"+
+    "\1\11\1\12\1\13\1\2\4\14\1\15\1\16\1\17"+
+    "\1\14\1\20\4\14\1\21\2\14\1\22\1\14\40\0"+
+    "\1\3\37\0\1\4\44\0\1\23\35\0\2\14\1\24"+
+    "\1\14\2\0\22\14\6\0\1\25\1\26\1\27\1\0"+
+    "\1\12\40\0\1\30\31\0\4\14\2\0\22\14\7\0"+
+    "\4\14\2\0\21\14\1\31\7\0\4\14\2\0\12\14"+
+    "\1\32\7\14\7\0\4\14\2\0\11\14\1\33\10\14"+
+    "\7\0\4\14\2\0\12\14\1\34\7\14\7\0\4\14"+
+    "\2\0\4\14\1\35\15\14\7\0\3\14\1\36\2\0"+
+    "\22\14\11\0\1\14\25\0\2\24\2\0\33\24\7\0"+
+    "\2\37\1\0\1\37\2\0\22\37\7\0\2\40\1\0"+
+    "\1\40\2\0\22\40\12\0\1\12\33\0\4\14\2\0"+
+    "\2\14\1\41\17\14\7\0\4\14\2\0\3\14\1\42"+
+    "\16\14\7\0\4\14\2\0\3\14\1\43\16\14\7\0"+
+    "\4\14\2\0\13\14\1\44\1\45\5\14\6\0\1\25"+
+    "\1\46\1\22\1\14\1\36\2\0\22\14\6\0\1\25"+
+    "\2\40\1\0\1\40\2\0\22\40\7\0\4\14\2\0"+
+    "\7\14\1\47\12\14\7\0\4\14\2\0\6\14\1\50"+
+    "\13\14\7\0\4\14\2\0\17\14\1\51\2\14\7\0"+
+    "\4\14\2\0\7\14\1\52\12\14\7\0\4\14\2\0"+
+    "\17\14\1\53\2\14\7\0\2\54\1\14\1\54\2\0"+
+    "\22\54\7\0\4\14\2\0\17\14\1\55\2\14\7\0"+
+    "\4\14\2\0\15\14\1\56\4\14\7\0\4\14\2\0"+
+    "\7\14\1\57\12\14\7\0\4\14\2\0\1\14\1\60"+
+    "\20\14\7\0\4\14\2\0\6\14\1\61\13\14\6\0"+
+    "\1\25\2\54\1\14\1\54\2\0\22\54\7\0\4\14"+
+    "\2\0\3\14\1\62\16\14\7\0\4\14\2\0\4\14"+
+    "\1\63\15\14\7\0\4\14\2\0\4\14\1\64\15\14"+
+    "\7\0\4\14\2\0\2\14\1\65\17\14\7\0\4\14"+
+    "\2\0\15\14\1\66\4\14\7\0\4\14\2\0\4\14"+
+    "\1\67\15\14\7\0\4\14\2\0\2\14\1\70\17\14"+
+    "\7\0\4\14\2\0\4\14\1\71\15\14\7\0\4\14"+
+    "\2\0\4\14\1\72\15\14\7\0\4\14\2\0\16\14"+
+    "\1\73\3\14";
 
   private static int [] zzUnpacktrans() {
-    int [] result = new int[1426];
+    int [] result = new int[1488];
     int offset = 0;
     offset = zzUnpacktrans(ZZ_TRANS_PACKED_0, offset, result);
     return result;
@@ -234,11 +236,11 @@ private static int zzUnpacktrans(String packed, int offset, int [] result) {
   private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
 
   private static final String ZZ_ATTRIBUTE_PACKED_0 =
-    "\1\0\1\11\1\1\1\11\1\1\2\11\13\1\3\0"+
-    "\1\11\43\1";
+    "\1\0\1\11\1\1\1\11\1\1\2\11\13\1\1\0"+
+    "\1\1\3\0\1\11\43\1";
 
   private static int [] zzUnpackAttribute() {
-    int [] result = new int[57];
+    int [] result = new int[59];
     int offset = 0;
     offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
     return result;

src/main/gen/org/jboss/tools/intellij/componentanalysis/golang/build/parser/GoModParser.java

@@ -31,8 +31,8 @@
 import static org.jboss.tools.intellij.componentanalysis.CAUtil.EXHORT_IGNORE;
 
 public class GoCAAnnotator extends CAAnnotator {
-    private static final Pattern REQUIRE_PATTERN = Pattern.compile("^\\s*([a-zA-Z0-9._/-]+)\\s+(v?[0-9]+\\.[0-9]+\\.[0-9]+\\S*)(?:\\s*//.*)?$");
-    private static final Pattern REPLACE_PATTERN = Pattern.compile("^\\s*([a-zA-Z0-9._/-]+)\\s*=>\\s*([a-zA-Z0-9._/-]+)\\s+(v?[0-9]+\\.[0-9]+\\.[0-9]+\\S*)(?:\\s*//.*)?$");
+    public static final Pattern REQUIRE_PATTERN = Pattern.compile("^\\s*([a-zA-Z0-9._/-]+)\\s+(v?[0-9]+(?:\\.[0-9]+)*[0-9a-zA-Z\\-+._]*)(?:\\s*//.*)?$");
+    public static final Pattern REPLACE_PATTERN = Pattern.compile("^\\s*([a-zA-Z0-9._/-]+)\\s+(?:(v?[0-9]+(?:\\.[0-9]+)*[0-9a-zA-Z\\-+._]*)\\s+)?=>\\s*([a-zA-Z0-9._/:-]+|\\.\\.?/[a-zA-Z0-9._/-]*|/[a-zA-Z0-9._/-]*)(?:\\s+(v?[0-9]+(?:\\.[0-9]+)*[0-9a-zA-Z\\-+._]*))?(?:\\s*//.*)?$");
 
     @Override
     protected String getInspectionShortName() {
@@ -89,10 +89,13 @@ protected Map<Dependency, List<PsiElement>> getDependencies(PsiFile file) {
             } else if (inReplaceBlock) {
                 Matcher replaceMatcher = REPLACE_PATTERN.matcher(line);
                 if (replaceMatcher.matches()) {
-                    String targetPath = replaceMatcher.group(2);
-                    String version = replaceMatcher.group(3);
-                    Dependency dependency = createDependency(targetPath, version);
-                    resultMap.computeIfAbsent(dependency, k -> new LinkedList<>()).add(lineElement);
+                    String targetPath = replaceMatcher.group(3);
+                    String version = replaceMatcher.group(4) != null ? replaceMatcher.group(4) : replaceMatcher.group(2);
+                    // Only analyze if target is not a local path and has a version
+                    if (version != null && !targetPath.startsWith("./") && !targetPath.startsWith("../") && !targetPath.startsWith("/")) {
+                        Dependency dependency = createDependency(targetPath, version);
+                        resultMap.computeIfAbsent(dependency, k -> new LinkedList<>()).add(lineElement);
+                    }
                 }
             } else {
                 // Single line require/replace
@@ -109,10 +112,13 @@ protected Map<Dependency, List<PsiElement>> getDependencies(PsiFile file) {
                     String replaceLine = line.substring(8).trim();
                     Matcher replaceMatcher = REPLACE_PATTERN.matcher(replaceLine);
                     if (replaceMatcher.matches()) {
-                        String targetPath = replaceMatcher.group(2);
-                        String version = replaceMatcher.group(3);
-                        Dependency dependency = createDependency(targetPath, version);
-                        resultMap.computeIfAbsent(dependency, k -> new LinkedList<>()).add(lineElement);
+                        String targetPath = replaceMatcher.group(3);
+                        String version = replaceMatcher.group(4) != null ? replaceMatcher.group(4) : replaceMatcher.group(2);
+                        // Only analyze if target is not a local path and has a version
+                        if (version != null && !targetPath.startsWith("./") && !targetPath.startsWith("../") && !targetPath.startsWith("/")) {
+                            Dependency dependency = createDependency(targetPath, version);
+                            resultMap.computeIfAbsent(dependency, k -> new LinkedList<>()).add(lineElement);
+                        }
                     }
                 }
             }
@@ -148,7 +154,7 @@ private PsiElement findElementAtLine(PsiFile file, int lineNumber) {
         String line = lines[lineNumber];
 
         // Find version in the line using regex to get precise position
-        Matcher versionMatcher = Pattern.compile("(v?[0-9]+\\.[0-9]+\\.[0-9]+\\S*)").matcher(line);
+        Matcher versionMatcher = Pattern.compile("(v?[0-9]+(?:\\.[0-9]+)*[0-9a-zA-Z\\-+._]*)").matcher(line);
         if (versionMatcher.find()) {
             int versionStart = lineStartOffset + versionMatcher.start();
             int versionEnd = lineStartOffset + versionMatcher.end();

src/main/gen/org/jboss/tools/intellij/componentanalysis/golang/build/psi/GoModReplaceSpec.java

@@ -28,7 +28,7 @@
 import java.util.regex.Pattern;
 
 public final class GoCAIntentionAction extends CAIntentionAction {
-    private static final Pattern VERSION_PATTERN = Pattern.compile("(\\s+)(v?[0-9]+\\.[0-9]+\\.[0-9]+\\S*)");
+    public static final Pattern VERSION_PATTERN = Pattern.compile("(\\s+)(v?[0-9]+\\.[0-9]+\\.[0-9]+\\S*)");
 
     GoCAIntentionAction(PsiElement element, VulnerabilitySource source, DependencyReport report) {
         super(element, source, report);

src/main/gen/org/jboss/tools/intellij/componentanalysis/golang/build/psi/impl/GoModReplaceSpecImpl.java

@@ -13,24 +13,23 @@
   tokenTypeClass="org.jboss.tools.intellij.componentanalysis.golang.build.psi.GoModTokenType"
 
   tokens=[
-    COMMENT='regexp://.*'
-    
+    COMMENT
+
     MODULE='module'
     GO='go'
     REQUIRE='require'
     REPLACE='replace'
     EXCLUDE='exclude'
     INDIRECT='indirect'
-    
+
     LPAREN='('
     RPAREN=')'
     ARROW='=>'
-    
-    IDENTIFIER='regexp:[a-zA-Z_][a-zA-Z0-9_./\-]*'
-    VERSION='regexp:v?[0-9]+(\.[0-9]+)*(\-[a-zA-Z0-9\-_.]+)?(\+[a-zA-Z0-9\-_.]+)?'
-    
-    WHITESPACE='regexp:\s+'
-    NEWLINE='regexp:\r?\n'
+
+    IDENTIFIER
+    VERSION
+
+    NEWLINE
   ]
 }
 
@@ -54,7 +53,7 @@ replaceStatement ::= REPLACE (replaceSpec | replaceBlock)
 
 replaceBlock ::= LPAREN (replaceSpec | COMMENT | NEWLINE)* RPAREN
 
-replaceSpec ::= IDENTIFIER ARROW IDENTIFIER VERSION (COMMENT)*
+replaceSpec ::= IDENTIFIER VERSION? ARROW IDENTIFIER VERSION? (COMMENT)*
 
 excludeStatement ::= EXCLUDE (excludeSpec | excludeBlock)
 

src/main/java/org/jboss/tools/intellij/componentanalysis/golang/GoCAAnnotator.java

@@ -39,9 +39,9 @@ LPAREN = "("
 RPAREN = ")"
 ARROW = "=>"
 
-// Identifiers and versions
-IDENTIFIER = [a-zA-Z_][a-zA-Z0-9_./\-]*
-VERSION = v?[0-9]+(\.[0-9]+)*(\-[a-zA-Z0-9\-_.]+)?(\+[a-zA-Z0-9\-_.]+)?
+// Identifiers and versions - VERSION must come before IDENTIFIER to avoid conflicts
+VERSION = v?[0-9]+(\.[0-9]+)*(-[0-9a-zA-Z\-_.]+)?(\+[0-9a-zA-Z\-_.]+)?
+IDENTIFIER = (\.\.\/[a-zA-Z0-9_\.\/\-]*|\/[a-zA-Z0-9_\.\/\-]+|[a-zA-Z_][a-zA-Z0-9_\.\/\-]*)
 
 %%
 
@@ -56,7 +56,7 @@ VERSION = v?[0-9]+(\.[0-9]+)*(\-[a-zA-Z0-9\-_.]+)?(\+[a-zA-Z0-9\-_.]+)?
   {REPLACE}           { return GoModTypes.REPLACE; }
   {EXCLUDE}           { return GoModTypes.EXCLUDE; }
   {INDIRECT}          { return GoModTypes.INDIRECT; }
-  
+
   {LPAREN}            { return GoModTypes.LPAREN; }
   {RPAREN}            { return GoModTypes.RPAREN; }
   {ARROW}             { return GoModTypes.ARROW; }

src/main/java/org/jboss/tools/intellij/componentanalysis/golang/GoCAIntentionAction.java

@@ -411,7 +411,7 @@
 
     <change-notes><![CDATA[
   <p><b>1.2.0</b></p>
-  <p>Go Plugin dependency removal. Golang projects now can be analyzed with IntelliJ Community Edition.</p>
+  <p>Go Plugin dependency removal. Golang projects now can be analyzed with IntelliJ Community Edition (no longer requires Ultimate Edition).</p>
   <p>Add support for user-configurable patterns/globs for excluding manifests from Component Analysis.</p>
   <p><b>1.1.0</b></p>
   <p>Added support for Gradle manifest files.</p>