From 91dc04a5e12a3d0c5be56768ded5971bc80e6f8e Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Tue, 16 Jan 2024 17:45:57 +0000
Subject: vim-patch:9.1.0013: Modula2 filetype support lacking (#27020)

Problem:  Modula2 filetype support lacking
Solution: Improve the Modula-2 runtime support, add additional modula2
          dialects, add compiler plugin, update syntax highlighting,
          include syntax tests, update Makefiles (Doug Kearns)

closes: vim/vim#6796
closes: vim/vim#8115

https://github.com/vim/vim/commit/68a89470693c7687d4e736ca056c05de632e3ac7

- Luaify the detection script:

  - Split the `(*!m2foo*)` and `(*!m2foo+bar*)` detection into two Lua patterns,
    as Lua capture groups cannot be used with `?` and friends (as they only work
    on character classes).

  - Use `vim.api.nvim_buf_call()` (ew) to call `modula2#SetDialect()` to ensure
    `b:modula2` is set for the given bufnr.

- Skip the syntax screendump tests. (A shame as they test some of the detection
  from `(*!m2foo+bar*)` tags, but I tested this locally and it seems to work)

- Port the synmenu.vim changes from Vim9 script. (Also tested this locally)

- (And also add the missing comma for `b:browsefilter` from earlier.)

Co-authored-by: Doug Kearns <dougkearns@gmail.com>
---
 runtime/ftplugin/modula2.vim | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/modula2.vim b/runtime/ftplugin/modula2.vim
index 8c4a876c0f..9c1acc276a 100644
--- a/runtime/ftplugin/modula2.vim
+++ b/runtime/ftplugin/modula2.vim
@@ -11,32 +11,43 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
-setlocal comments=s0:(*,mb:\ ,ex:*)
-setlocal commentstring=(*%s*)
+let s:dialect = modula2#GetDialect()
+
+if s:dialect ==# "r10"
+  setlocal comments=s:(*,m:\ ,e:*),:!
+  setlocal commentstring=!\ %s
+else
+  setlocal commentstring=(*%s*)
+  setlocal comments=s:(*,m:\ ,e:*)
+endif
 setlocal formatoptions-=t formatoptions+=croql
 
+let b:undo_ftplugin = "setl com< cms< fo<"
+
 if exists("loaded_matchit") && !exists("b:match_words")
-  " The second branch of the middle pattern is intended to match CASE labels
+  let b:match_ignorecase = 0
+  " the second branch of the middle pattern is intended to match CASE labels
   let b:match_words = '\<REPEAT\>:\<UNTIL\>,' ..
-		    \ '\<\%(BEGIN\|CASE\|FOR\|IF\|LOOP\|WHILE\|WITH\)\>' ..
-		    \	':' ..
-		    \	'\<\%(ELSIF\|ELSE\)\>\|\%(^\s*\)\@<=\w\+\%(\s*\,\s*\w\+\)\=\s*\:=\@!' ..
-		    \	':' ..
-		    \ '\<END\>'
+	\	      '\<\%(BEGIN\|CASE\|FOR\|IF\|LOOP\|WHILE\|WITH\|RECORD\)\>' ..
+	\		':' ..
+	\		'\<\%(ELSIF\|ELSE\)\>\|\%(^\s*\)\@<=\w\+\%(\s*\,\s*\w\+\)\=\s*\:=\@!' ..
+	\		':' ..
+	\	      '\<END\>,' ..
+	\	      '(\*:\*),<\*:\*>'
+  let b:match_skip = 's:Comment\|Pragma'
+  let b:undo_ftplugin ..= " | unlet! b:match_ignorecase b:match_skip b:match_words"
 endif
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-  let b:browsefilter = "Modula-2 Source Files (*.def *.mod)\t*.def;*.mod\n"
+  let b:browsefilter = "Modula-2 Source Files (*.def, *.mod)\t*.def;*.mod\n"
   if has("win32")
     let b:browsefilter ..= "All Files (*.*)\t*\n"
   else
     let b:browsefilter ..= "All Files (*)\t*\n"
   endif
+  let b:undo_ftplugin ..= " | unlet! b:browsefilter"
 endif
 
-let b:undo_ftplugin = "setl com< cms< fo< " ..
-		    \ "| unlet! b:browsefilter b:match_words"
-
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-- 
cgit