Fix syntax/style

Author: strk

modules/markup/html.go

@@ -33,7 +33,7 @@ import (
 const (
 	IssueNameStyleNumeric      = "numeric"
 	IssueNameStyleAlphanumeric = "alphanumeric"
-	IssueNameStyleRegexp       = "regexp"
+	IssueNameStyleRegexp			 = "regexp"
 )
 
 var (
@@ -818,14 +818,14 @@ func issueIndexPatternProcessor(ctx *RenderContext, node *html.Node) {
 			found = foundNumeric
 			ref = refNumeric
 		case IssueNameStyleAlphanumeric:
-			found, ref := references.FindRenderizableReferenceAlphanumeric(node.Data)
+			found, ref = references.FindRenderizableReferenceAlphanumeric(node.Data)
 		case IssueNameStyleRegexp:
 			// TODO: Compile only once, at regexp definition time
-			pattern, err := regexp.Compile(ctx.metas["regexp"])
+			pattern, err := regexp.Compile(ctx.Metas["regexp"])
 			if err == nil {
 				return
 			}
-			found, ref := references.FindRenderizableReferenceRegexp(node.Data, pattern)
+			found, ref = references.FindRenderizableReferenceRegexp(node.Data, pattern)
 		}
 
 		// Repos with external issue trackers might still need to reference local PRs

modules/markup/html_internal_test.go

@@ -207,40 +207,36 @@ func TestRender_IssueIndexPattern5(t *testing.T) {
 	setting.AppSubURL = AppSubURL
 
 	// regexp: render inputs without valid mentions
-	test := func(s, expectedFmt string, pattern string, ids []string, names []string) {
-		metas := regexpMetas
-		metas["regexp"] = pattern
-		links := make([]interface{}, len(ids))
-		for i, id := range ids {
-			links[i] = link(util.URLJoin("https://someurl.com/someUser/someRepo/", id), names[i])
+	test := func(s, expectedFmt string, pattern string, names []string) {
+		links := make([]interface{}, len(names))
+		for i, name := range names {
+			// TODO: rename alphanumIssueLink to externalIssueLink
+			links[i] = alphanumIssueLink("https://someurl.com/someUser/someRepo/", "ref-issue ref-external-issue", name)
 		}
 
 		expected := fmt.Sprintf(expectedFmt, links...)
-		testRenderIssueIndexPattern(t, s, expected, &postProcessCtx{metas: metas})
+		testRenderIssueIndexPattern(t, s, expected, &RenderContext{Metas: regexpMetas})
 	}
 
-	test("abc ISSUE-123 def", "abc %s def", "ISSUE-(\\d+)",
-		[]string{"123"},
+	test("abc ISSUE-123 def", "abc %s def",
+		"ISSUE-(\\d+)",
 		[]string{"ISSUE-123"},
 	)
 
 	test("abc (ISSUE 123) def", "abc %s def",
 		"\\(ISSUE (\\d+)\\)",
-		[]string{"123"},
 		[]string{"(ISSUE 123)"},
 	)
 
 	test("abc (ISSUE 123) def (TASK 456) ghi", "abc %s def %s ghi", "\\((?:ISSUE|TASK) (\\d+)\\)",
-		[]string{"123", "456"},
 		[]string{"(ISSUE 123)", "(TASK 456)"},
 	)
 
 	metas := regexpMetas
 	metas["regexp"] = "no matches"
-	testRenderIssueIndexPattern(t, "will not match", "will not match", &postProcessCtx{metas: metas})
+	testRenderIssueIndexPattern(t, "will not match", "will not match", &RenderContext{Metas: regexpMetas})
 }
 
-
 func testRenderIssueIndexPattern(t *testing.T, input, expected string, ctx *RenderContext) {
 	if ctx.URLPrefix == "" {
 		ctx.URLPrefix = AppSubURL

modules/references/references.go

@@ -341,7 +341,7 @@ func FindRenderizableReferenceNumeric(content string, prOnly bool) (bool, *Rende
 }
 
 // FindRenderizableReferenceRegexp returns the first regexp unvalidated references found in a string.
-func FindRenderizableReferenceRegexp(content string, pattern *Regexp) (bool, *RenderizableReference) {
+func FindRenderizableReferenceRegexp(content string, pattern *regexp.Regexp) (bool, *RenderizableReference) {
 	match := pattern.FindStringSubmatchIndex(content)
 	if match == nil {
 		return false, nil

services/forms/repo_form.go

@@ -140,7 +140,7 @@ type RepoSettingForm struct {
 	ExternalTrackerURL                    string
 	TrackerURLFormat                      string
 	TrackerIssueStyle                     string
-	ExternalTrackerRegexpPattern					string
+	ExternalTrackerRegexpPattern          string
 	EnableCloseIssuesViaCommitInAnyBranch bool
 	EnableProjects                        bool
 	EnablePulls                           bool

web_src/js/features/repo-legacy.js

@@ -309,15 +309,15 @@ export function initRepository() {
         if (typeof $(this).data('context') !== 'undefined') $($(this).data('context')).addClass('disabled');
       }
     });
-    $('.enable-system-pick').change(function () {
-        if ($(this).data('context') && $(this).data('target')) {
-            if ($(this).data('context') === this.value) {
-                $($(this).data('target')).removeClass('disabled')
-            } else {
-                $($(this).data('target')).addClass('disabled')
-            }
+    $('.enable-system-pick').on('change', function () {
+      if ($(this).data('context') && $(this).data('target')) {
+        if ($(this).data('context') === this.value) {
+          $($(this).data('target')).removeClass('disabled');
+        } else {
+          $($(this).data('target')).addClass('disabled');
         }
-    })
+      }
+    });
   }
 
   // Labels