fmt: fix comment line number in file with crlf line separator (fix #23524) (#25163)

vlib/v/fmt/tests/.gitattributes

@@ -0,0 +1,2 @@
+*_crlf_*  binary
+*_lf_*    binary

vlib/v/fmt/tests/vfmt_off_vfmt_on_with_crlf_expected.vv

@@ -0,0 +1,12 @@
+module main
+
+fn main() {
+	// vfmt off
+	a := [
+		1, 2, 3,
+		4, 5, 6,
+	]
+	// vfmt on
+
+	println('Hello World!')
+}

vlib/v/fmt/tests/vfmt_off_vfmt_on_with_crlf_input.vv

@@ -0,0 +1,12 @@
+module main
+
+fn main() {
+	// vfmt off
+	a := [
+		1, 2, 3,
+		4, 5, 6,
+	]
+	// vfmt on
+
+	println('Hello World!')
+}

vlib/v/scanner/scanner.v

@@ -1068,11 +1068,11 @@ pub fn (mut s Scanner) text_scan() token.Token {
 					mut comment_line_end := s.pos
 					if s.text[s.pos - 1] == b_cr {
 						comment_line_end--
-					} else {
-						// fix line_nr, \n was read; the comment is marked on the next line
 						s.pos--
-						s.line_nr--
 					}
+					// fix line_nr, \n was read; the comment is marked on the next line
+					s.pos--
+					s.line_nr--
 					if s.should_parse_comment() {
 						s.line_comment = s.text[start + 1..comment_line_end]
 						mut comment := s.line_comment