Merge remote-tracking branch 'upstream/master' into usermarks

7 files changed, 14 insertions, 10 deletions

diff --git a/runtime/syntax/README.txt b/runtime/syntax/README.txt
index d88bd7ed5d..d6a86e5ca9 100644
--- a/runtime/syntax/README.txt
+++ b/runtime/syntax/README.txt
@@ -13,6 +13,9 @@ synload.vim	Contains autocommands to load a language file when a certain
 nosyntax.vim	Used for the ":syntax off" command.  Undo the loading of
 		synload.vim.
 
+The "shared" directory contains generated files and what is used by more than
+one syntax.
+
 
 A few special files:
 
diff --git a/runtime/syntax/abaqus.vim b/runtime/syntax/abaqus.vim
index db2717f818..e6f025d8f4 100644
--- a/runtime/syntax/abaqus.vim
+++ b/runtime/syntax/abaqus.vim
@@ -1,6 +1,6 @@
 " Vim syntax file
 " Language:	Abaqus finite element input file (www.hks.com)
-" Maintainer:	Carl Osterwisch <osterwischc@asme.org>
+" Maintainer:	Carl Osterwisch <costerwi@gmail.com>
 " Last Change:	2002 Feb 24
 " Remark:	Huge improvement in folding performance--see filetype plugin
 
@@ -28,8 +28,7 @@ syn match abaqusBadLine	"^\s\+\*.*" display
 hi def link abaqusComment	Comment
 hi def link abaqusKeyword	Statement
 hi def link abaqusParameter	Identifier
-hi def link abaqusValue	Constant
-hi def link abaqusBadLine    Error
-
+hi def link abaqusValue		Constant
+hi def link abaqusBadLine    	Error
 
 let b:current_syntax = "abaqus"
diff --git a/runtime/syntax/shared/README.txt b/runtime/syntax/shared/README.txt
new file mode 100644
index 0000000000..f519d44faf
--- /dev/null
+++ b/runtime/syntax/shared/README.txt
@@ -0,0 +1,2 @@
+This directory "runtime/syntax/shared" contains Vim script files that are
+generated or used by more then one syntax file.
diff --git a/runtime/syntax/typescriptcommon.vim b/runtime/syntax/shared/typescriptcommon.vim
index ef362fc721..ef362fc721 100644
--- a/runtime/syntax/typescriptcommon.vim
+++ b/runtime/syntax/shared/typescriptcommon.vim
diff --git a/runtime/syntax/swayconfig.vim b/runtime/syntax/swayconfig.vim
index 2abfa38bd9..d9f31da47b 100644
--- a/runtime/syntax/swayconfig.vim
+++ b/runtime/syntax/swayconfig.vim
@@ -2,8 +2,8 @@
 " Language: sway window manager config
 " Original Author: James Eapen <james.eapen@vai.org>
 " Maintainer: James Eapen <james.eapen@vai.org>
-" Version: 0.11.0
-" Last Change: 2022 Jun 07
+" Version: 0.11.1
+" Last Change: 2022 Aug 08
 
 " References:
 " http://i3wm.org/docs/userguide.html#configuring
@@ -36,8 +36,8 @@ syn keyword swayConfigBindGestureCommand swipe pinch hold contained
 syn keyword swayConfigBindGestureDirection up down left right next prev contained
 syn keyword swayConfigBindGesturePinchDirection inward outward clockwise counterclockwise contained
 syn match swayConfigBindGestureHold /^\s*\(bindgesture\)\s\+hold\(:[1-5]\)\?\s\+.*$/ contains=swayConfigBindKeyword,swayConfigBindGestureCommand,swayConfigBindGestureDirection,i3ConfigWorkspaceKeyword,i3ConfigAction
-syn match swayConfigBindGestureSwipe /^\s*\(bindgesture\)\s\+swipe\(:[1-5]\)\?:\(up\|down\|left\|right\)\s\+.*$/ contains=swayConfigBindKeyword,swayConfigBindGestureCommand,swayConfigBindGestureDirection,i3ConfigWorkspaceKeyword,i3ConfigAction
-syn match swayConfigBindGesturePinch /^\s*\(bindgesture\)\s\+\(pinch\):.*$/ contains=swayConfigBindKeyword,swayConfigBindGestureCommand,swayConfigBindGestureDirection,swayConfigBindGesturePinchDirection,i3ConfigWorkspaceKeyword,i3ConfigAction
+syn match swayConfigBindGestureSwipe /^\s*\(bindgesture\)\s\+swipe\(:[3-5]\)\?:\(up\|down\|left\|right\)\s\+.*$/ contains=swayConfigBindKeyword,swayConfigBindGestureCommand,swayConfigBindGestureDirection,i3ConfigWorkspaceKeyword,i3ConfigAction
+syn match swayConfigBindGesturePinch /^\s*\(bindgesture\)\s\+pinch\(:[2-5]\)\?:\(up\|down\|left\|right\|inward\|outward\|clockwise\|counterclockwise\)\(+\(up\|down\|left\|right\|inward\|outward\|clockwise\|counterclockwise\)\)\?.*$/ contains=swayConfigBindKeyword,swayConfigBindGestureCommand,swayConfigBindGestureDirection,swayConfigBindGesturePinchDirection,i3ConfigWorkspaceKeyword,i3ConfigAction
 
 " floating
 syn keyword swayConfigFloatingKeyword floating contained
diff --git a/runtime/syntax/typescript.vim b/runtime/syntax/typescript.vim
index 767ba56d42..af71938a8e 100644
--- a/runtime/syntax/typescript.vim
+++ b/runtime/syntax/typescript.vim
@@ -35,7 +35,7 @@ syntax region typescriptTypeCast matchgroup=typescriptTypeBrackets
 
 """""""""""""""""""""""""""""""""""""""""""""""""""
 " Source the part common with typescriptreact.vim
-source <sfile>:h/typescriptcommon.vim
+source <sfile>:h/shared/typescriptcommon.vim
 
 
 let b:current_syntax = "typescript"
diff --git a/runtime/syntax/typescriptreact.vim b/runtime/syntax/typescriptreact.vim
index f29fe785b9..c4c2d45745 100644
--- a/runtime/syntax/typescriptreact.vim
+++ b/runtime/syntax/typescriptreact.vim
@@ -133,7 +133,7 @@ syntax region tsxEscJs
 
 """""""""""""""""""""""""""""""""""""""""""""""""""
 " Source the part common with typescriptreact.vim
-source <sfile>:h/typescriptcommon.vim
+source <sfile>:h/shared/typescriptcommon.vim
 
 
 syntax cluster typescriptExpression add=tsxRegion,tsxFragment