fix issue #540 (#543)

lint/file.go

@@ -207,7 +207,7 @@ func (f *File) disabledIntervals(rules []Rule, mustSpecifyDisableReason bool, fa
 		for _, c := range comments {
 			match := re.FindStringSubmatch(c.Text)
 			if len(match) == 0 {
-				return
+				continue
 			}
 
 			ruleNames := []string{}

test/disable-annotations_test.go

@@ -14,3 +14,7 @@ func TestDisabledAnnotations(t *testing.T) {
 func TestModifiedAnnotations(t *testing.T) {
 	testRule(t, "disable-annotations2", &rule.VarNamingRule{}, &lint.RuleConfig{})
 }
+
+func TestDisableNextLineAnnotations(t *testing.T) {
+	testRule(t, "disable-annotations3", &rule.VarNamingRule{}, &lint.RuleConfig{})
+}

testdata/disable-annotations3.go

@@ -0,0 +1,14 @@
+// Package fix_tures is a testing package
+// tests for issue #540
+//revive:disable-next-line:var-naming
+package fix_tures
+
+func foo1() {
+	// something before the annotation
+	//revive:disable-next-line:var-naming
+	// something after
+	var invalid_name = 0
+}
+
+//revive:disable-next-line:var-naming
+func (source Source) BaseApiURL() string {}