diff src/testdir/test_codestyle.vim @ 32670:695b50472e85

Fix line endings issue
author Christian Brabandt <cb@256bit.org>
date Mon, 26 Jun 2023 13:13:12 +0200
parents 448aef880252
children 3acd40c4c684
line wrap: on
line diff
--- a/src/testdir/test_codestyle.vim
+++ b/src/testdir/test_codestyle.vim
@@ -1,158 +1,158 @@
-" Test for checking the source code style.
-
-def s:ReportError(fname: string, lnum: number, msg: string)
-  if lnum > 0
-    assert_report(fname .. ' line ' .. lnum .. ': ' .. msg)
-  endif
-enddef
-
-def Test_source_files()
-  for fname in glob('../*.[ch]', 0, 1)
-    bwipe!
-    g:ignoreSwapExists = 'e'
-    exe 'edit ' .. fname
-
-    cursor(1, 1)
-    var lnum = search(' \t')
-    ReportError(fname, lnum, 'space before Tab')
-
-    cursor(1, 1)
-    lnum = search('\s$')
-    ReportError(fname, lnum, 'trailing white space')
-
-    # some files don't stick to the Vim style rules
-    if fname =~ 'iscygpty.c'
-      continue
-    endif
-
-    # Examples in comments use "condition) {", skip them.
-    # Skip if a double quote or digit comes after the "{".
-    # Skip specific string used in os_unix.c.
-    # Also skip fold markers.
-    var skip = 'getline(".") =~ "condition) {" || getline(".") =~ "vimglob_func" || getline(".") =~ "{\"" || getline(".") =~ "{\\d" || getline(".") =~ "{{{"'
-    cursor(1, 1)
-    lnum = search(')\s*{', '', 0, 0, skip)
-    ReportError(fname, lnum, 'curly after closing paren')
-
-    # Examples in comments use double quotes.
-    skip = "getline('.') =~ '\"'"
-
-    cursor(1, 1)
-    lnum = search('}\s*else', '', 0, 0, skip)
-    ReportError(fname, lnum, 'curly before "else"')
-
-    cursor(1, 1)
-    lnum = search('else\s*{', '', 0, 0, skip)
-    ReportError(fname, lnum, 'curly after "else"')
-
-    cursor(1, 1)
-    lnum = search('\<\(if\|while\|for\)(', '', 0, 0, skip)
-    ReportError(fname, lnum, 'missing white space after "if"/"while"/"for"')
-  endfor
-
-  bwipe!
-enddef
-
-def Test_test_files()
-  for fname in glob('*.vim', 0, 1)
-    g:ignoreSwapExists = 'e'
-    exe 'edit ' .. fname
-
-    # some files intentionally have misplaced white space
-    if fname =~ 'test_cindent.vim' || fname =~ 'test_join.vim'
-      continue
-    endif
-
-    # skip files that are known to have a space before a tab
-    if fname !~ 'test_comments.vim'
-        && fname !~ 'test_listchars.vim'
-        && fname !~ 'test_visual.vim'
-      cursor(1, 1)
-      var lnum = search(fname =~ "test_regexp_latin" ? '[^á] \t' : ' \t')
-      ReportError('testdir/' .. fname, lnum, 'space before Tab')
-    endif
-
-    # skip files that are known to have trailing white space
-    if fname !~ 'test_cmdline.vim'
-            && fname !~ 'test_let.vim'
-            && fname !~ 'test_tagjump.vim'
-            && fname !~ 'test_vim9_cmd.vim'
-      cursor(1, 1)
-      var lnum = search(
-          fname =~ 'test_vim9_assign.vim' ? '[^=]\s$'
-          : fname =~ 'test_vim9_class.vim' ? '[^)]\s$'
-          : fname =~ 'test_vim9_script.vim' ? '[^,:3]\s$'
-          : fname =~ 'test_visual.vim' ? '[^/]\s$'
-          : '[^\\]\s$')
-      ReportError('testdir/' .. fname, lnum, 'trailing white space')
-    endif
-  endfor
-
-  bwipe!
-enddef
-
-def Test_help_files()
-  var lnum: number
-  set nowrapscan
-
-  for fpath in glob('../../runtime/doc/*.txt', 0, 1)
-    g:ignoreSwapExists = 'e'
-    exe 'edit ' .. fpath
-
-    var fname = fnamemodify(fpath, ":t")
-
-    # todo.txt is for developers, it's not need a strictly check
-    # version*.txt is a history and large size, so it's not checked
-    if fname == 'todo.txt' || fname =~ 'version.*\.txt'
-      continue
-    endif
-
-    # Check for mixed tabs and spaces
-    cursor(1, 1)
-    while 1
-      lnum = search('[^/] \t')
-      if fname == 'visual.txt' && getline(lnum) =~ "STRING  \tjkl"
-        || fname == 'usr_27.txt' && getline(lnum) =~ "\[^\? \t\]"
-        continue
-      endif
-      ReportError(fpath, lnum, 'space before tab')
-      if lnum == 0
-        break
-      endif
-    endwhile
-
-    # Check for unnecessary whitespace at the end of a line
-    cursor(1, 1)
-    while 1
-      lnum = search('[^/~\\]\s$')
-      # skip line that are known to have trailing white space
-      if fname == 'map.txt' && getline(lnum) =~ "unmap @@ $"
-        || fname == 'usr_12.txt' && getline(lnum) =~ "^\t/ \t$"
-        || fname == 'usr_41.txt' && getline(lnum) =~ "map <F4> o#include  $"
-        || fname == 'change.txt' && getline(lnum) =~ "foobar bla $"
-        continue
-      endif
-      ReportError('testdir' .. fpath, lnum, 'trailing white space')
-      if lnum == 0
-        break
-      endif
-    endwhile
-
-#    # TODO: Check for line over 80 columns
-#    cursor(1, 1)
-#    while 1
-#      lnum = search('\%>80v.*$')
-#      ReportError(fpath, lnum, 'line over 80 columns')
-#      if lnum == 0
-#        break
-#      endif
-#    endwhile
-
-  endfor
-
-  set wrapscan&vim
-  bwipe!
-enddef
-
-
-" vim: shiftwidth=2 sts=2 expandtab
+" Test for checking the source code style.
+
+def s:ReportError(fname: string, lnum: number, msg: string)
+  if lnum > 0
+    assert_report(fname .. ' line ' .. lnum .. ': ' .. msg)
+  endif
+enddef
+
+def Test_source_files()
+  for fname in glob('../*.[ch]', 0, 1)
+    bwipe!
+    g:ignoreSwapExists = 'e'
+    exe 'edit ' .. fname
+
+    cursor(1, 1)
+    var lnum = search(' \t')
+    ReportError(fname, lnum, 'space before Tab')
+
+    cursor(1, 1)
+    lnum = search('\s$')
+    ReportError(fname, lnum, 'trailing white space')
+
+    # some files don't stick to the Vim style rules
+    if fname =~ 'iscygpty.c'
+      continue
+    endif
+
+    # Examples in comments use "condition) {", skip them.
+    # Skip if a double quote or digit comes after the "{".
+    # Skip specific string used in os_unix.c.
+    # Also skip fold markers.
+    var skip = 'getline(".") =~ "condition) {" || getline(".") =~ "vimglob_func" || getline(".") =~ "{\"" || getline(".") =~ "{\\d" || getline(".") =~ "{{{"'
+    cursor(1, 1)
+    lnum = search(')\s*{', '', 0, 0, skip)
+    ReportError(fname, lnum, 'curly after closing paren')
+
+    # Examples in comments use double quotes.
+    skip = "getline('.') =~ '\"'"
+
+    cursor(1, 1)
+    lnum = search('}\s*else', '', 0, 0, skip)
+    ReportError(fname, lnum, 'curly before "else"')
+
+    cursor(1, 1)
+    lnum = search('else\s*{', '', 0, 0, skip)
+    ReportError(fname, lnum, 'curly after "else"')
+
+    cursor(1, 1)
+    lnum = search('\<\(if\|while\|for\)(', '', 0, 0, skip)
+    ReportError(fname, lnum, 'missing white space after "if"/"while"/"for"')
+  endfor
+
+  bwipe!
+enddef
+
+def Test_test_files()
+  for fname in glob('*.vim', 0, 1)
+    g:ignoreSwapExists = 'e'
+    exe 'edit ' .. fname
+
+    # some files intentionally have misplaced white space
+    if fname =~ 'test_cindent.vim' || fname =~ 'test_join.vim'
+      continue
+    endif
+
+    # skip files that are known to have a space before a tab
+    if fname !~ 'test_comments.vim'
+        && fname !~ 'test_listchars.vim'
+        && fname !~ 'test_visual.vim'
+      cursor(1, 1)
+      var lnum = search(fname =~ "test_regexp_latin" ? '[^á] \t' : ' \t')
+      ReportError('testdir/' .. fname, lnum, 'space before Tab')
+    endif
+
+    # skip files that are known to have trailing white space
+    if fname !~ 'test_cmdline.vim'
+            && fname !~ 'test_let.vim'
+            && fname !~ 'test_tagjump.vim'
+            && fname !~ 'test_vim9_cmd.vim'
+      cursor(1, 1)
+      var lnum = search(
+          fname =~ 'test_vim9_assign.vim' ? '[^=]\s$'
+          : fname =~ 'test_vim9_class.vim' ? '[^)]\s$'
+          : fname =~ 'test_vim9_script.vim' ? '[^,:3]\s$'
+          : fname =~ 'test_visual.vim' ? '[^/]\s$'
+          : '[^\\]\s$')
+      ReportError('testdir/' .. fname, lnum, 'trailing white space')
+    endif
+  endfor
+
+  bwipe!
+enddef
+
+def Test_help_files()
+  var lnum: number
+  set nowrapscan
+
+  for fpath in glob('../../runtime/doc/*.txt', 0, 1)
+    g:ignoreSwapExists = 'e'
+    exe 'edit ' .. fpath
+
+    var fname = fnamemodify(fpath, ":t")
+
+    # todo.txt is for developers, it's not need a strictly check
+    # version*.txt is a history and large size, so it's not checked
+    if fname == 'todo.txt' || fname =~ 'version.*\.txt'
+      continue
+    endif
+
+    # Check for mixed tabs and spaces
+    cursor(1, 1)
+    while 1
+      lnum = search('[^/] \t')
+      if fname == 'visual.txt' && getline(lnum) =~ "STRING  \tjkl"
+        || fname == 'usr_27.txt' && getline(lnum) =~ "\[^\? \t\]"
+        continue
+      endif
+      ReportError(fpath, lnum, 'space before tab')
+      if lnum == 0
+        break
+      endif
+    endwhile
+
+    # Check for unnecessary whitespace at the end of a line
+    cursor(1, 1)
+    while 1
+      lnum = search('[^/~\\]\s$')
+      # skip line that are known to have trailing white space
+      if fname == 'map.txt' && getline(lnum) =~ "unmap @@ $"
+        || fname == 'usr_12.txt' && getline(lnum) =~ "^\t/ \t$"
+        || fname == 'usr_41.txt' && getline(lnum) =~ "map <F4> o#include  $"
+        || fname == 'change.txt' && getline(lnum) =~ "foobar bla $"
+        continue
+      endif
+      ReportError('testdir' .. fpath, lnum, 'trailing white space')
+      if lnum == 0
+        break
+      endif
+    endwhile
+
+#    # TODO: Check for line over 80 columns
+#    cursor(1, 1)
+#    while 1
+#      lnum = search('\%>80v.*$')
+#      ReportError(fpath, lnum, 'line over 80 columns')
+#      if lnum == 0
+#        break
+#      endif
+#    endwhile
+
+  endfor
+
+  set wrapscan&vim
+  bwipe!
+enddef
+
+
+" vim: shiftwidth=2 sts=2 expandtab