Fix missing email addresses in go xref

ahornace · Vladimir Kotal · commit 903e9098726c · 2021-07-21T11:00:25.000+02:00
fixes #3659
diff --git a/opengrok-indexer/src/main/jflex/analysis/golang/GolangXref.lex b/opengrok-indexer/src/main/jflex/analysis/golang/GolangXref.lex
@@ -171,6 +171,7 @@ File = [a-zA-Z]{FNameChar}* "." ([Gg][Oo] | [Tt][Xx][Tt] | [Hh][Tt][Mm][Ll]? |
     }
     {FNameChar}+ "@" {FNameChar}+ "." {FNameChar}+    {
         chkLOC();
+        onEmailAddressMatched(yytext(), yychar);
     }
 }
 
diff --git a/opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/golang/GolangXrefTest.java b/opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/golang/GolangXrefTest.java
@@ -32,20 +32,27 @@
 /**
  * Tests the {@link GolangXref} class.
  */
-public class GolangXrefTest extends XrefTestBase {
+class GolangXrefTest extends XrefTestBase {
 
     @Test
-    public void sampleTest() throws IOException {
+    void sampleTest() throws IOException {
         writeAndCompare(new GolangAnalyzerFactory(),
                 "analysis/golang/sample.go",
                 "analysis/golang/sample_xref.html",
                 readTagsFromResource("analysis/golang/sampletags"), 101);
     }
 
     @Test
-    public void shouldCloseTruncatedStringSpan() throws IOException {
+    void shouldCloseTruncatedStringSpan() throws IOException {
         writeAndCompare(new GolangAnalyzerFactory(),
                 "analysis/golang/truncated.go",
                 "analysis/golang/truncated_xref.html", null, 1);
     }
+
+    @Test
+    void shouldContainEmail() throws IOException {
+        writeAndCompare(new GolangAnalyzerFactory(),
+                "analysis/golang/email.go",
+                "analysis/golang/email_xref.html", null, 3);
+    }
 }
diff --git a/opengrok-indexer/src/test/resources/analysis/golang/email.go b/opengrok-indexer/src/test/resources/analysis/golang/email.go
@@ -0,0 +1,3 @@
+const (
+    email = "test@opengrok.org"
+)
diff --git a/opengrok-indexer/src/test/resources/analysis/golang/email_xref.html b/opengrok-indexer/src/test/resources/analysis/golang/email_xref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<title>sampleFile - OpenGrok cross reference for /sampleFile</title></head><body>
+<a class="l" name="1" href="#1">1</a><b>const</b> (
+<a class="l" name="2" href="#2">2</a>    <a href="/source/s?defs=email" class="intelliWindow-symbol" data-definition-place="undefined-in-file">email</a> = <span class="s">&quot;test@opengrok.org&quot;</span>
+<a class="l" name="3" href="#3">3</a>)
+<a class="l" name="4" href="#4">4</a></body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,7 @@ File = [a-zA-Z]{FNameChar}* "." ([Gg][Oo] \| [Tt][Xx][Tt] \| [Hh][Tt][Mm][Ll]? \|`
`171`	`171`	`}`
`172`	`172`	`{FNameChar}+ "@" {FNameChar}+ "." {FNameChar}+ {`
`173`	`173`	`chkLOC();`
	`174`	`+ onEmailAddressMatched(yytext(), yychar);`
`174`	`175`	`}`
`175`	`176`	`}`
`176`	`177`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+const (`
	`2`	`+ email = "[email protected]"`
	`3`	`+)`