From f51553797416029a5a56bfe8a698f8f1b5683203 Mon Sep 17 00:00:00 2001
From: "SNDST00M: M.U.N.I.N" <82655227+4086606@users.noreply.github.com>
Date: Fri, 23 Jul 2021 16:16:58 +0100
Subject: [PATCH 1/9] Add `matlab.io.hdf`; undeprecate generic props Also fix
 function boundaries in lookbehind patterns

---
 grammars/m.cson | 123 +++++++++++++++++++++++++++---------------------
 1 file changed, 69 insertions(+), 54 deletions(-)

diff --git a/grammars/m.cson b/grammars/m.cson
index 04f19f7..c20a26d 100644
--- a/grammars/m.cson
+++ b/grammars/m.cson
@@ -4,7 +4,7 @@ fileTypes: [
 ]
 keyEquivalent: '^~M'
 scopeName: 'source.matlab'
-uuid: '0448B0AE-F226-4E07-8F42-845D6324B896'
+uuid: '0C463768-44FD-4D00-880B-E7F5553D6880'
 patterns: [
   {
     comment: 'Rules are split into groups so #command_dual can be excluded in things like (), {}, []'
@@ -84,7 +84,7 @@ injections: {
         include: '#readwrite_operations'
       }
     ]
-  'source.matlab meta.class.matlab meta.arguments.matlab meta.block.validation.matlab':  
+  'source.matlab meta.class.matlab meta.arguments.matlab meta.block.validation.matlab':
     patterns: [
       {
         include: '#argument_validation'
@@ -465,7 +465,7 @@ repository:
           							^\\s*    							# Leading whitespace
           							(classdef)
           							\\s*
-          					
+
         '''
         end: '\\s*(?<=^|[\\s,;])(end)\\b'
         beginCaptures:
@@ -542,7 +542,7 @@ repository:
                       {
                         comment: 'Inherited class'
                         name: 'meta.inherited-class.matlab'
-                        begin: '(?<!\\.)\\b(?=[a-zA-Z])'
+                        begin: '(?<!\\w|\\.)(?=[a-zA-Z])'
                         end: '(?<=[a-zA-Z0-9_])(?!\\.)'
                         patterns: [
                           {
@@ -594,7 +594,7 @@ repository:
               										\\( [^)]* \\)
               									)?
               									\\s*($|(?=%))
-              							
+
             '''
             end: '\\s*(?<=^|[\\s,;])(end)\\b'
             beginCaptures:
@@ -647,7 +647,7 @@ repository:
               										\\( [^)]* \\)
               									)?
               									\\s*($|(?=%))
-              							
+
             '''
             end: '\\s*(?<=^|[\\s,;])(end)\\b'
             beginCaptures:
@@ -694,7 +694,7 @@ repository:
               										\\( [^)]* \\)
               									)?
               									\\s*($|(?=%))
-              							
+
             '''
             end: '\\s*(?<=^|[\\s,;])(end)\\b'
             beginCaptures:
@@ -744,7 +744,7 @@ repository:
               									(^\\s*)								# Leading whitespace
               									(enumeration)\\b([^%]*)
               									\\s*($|(?=%))
-              							
+
             '''
             end: '\\s*(?<=^|[\\s,;])(end)\\b'
             beginCaptures:
@@ -889,7 +889,7 @@ repository:
           							(^\\s*)											# Leading whitespace
           							(function)
           							\\s+
-          					
+
         '''
         end: '\\s*(?<=^|[\\s,;])(end)\\b(\\s*\\n)?'
         beginCaptures:
@@ -1001,7 +1001,7 @@ repository:
               										\\( [^)]* \\)
               									)?
               									\\s*($|(?=%))
-              								
+
             '''
             end: '\\s*(?<=^|[\\s,;])(end)\\b'
             beginCaptures:
@@ -1048,10 +1048,10 @@ repository:
     ]
   function_call:
     comment: '''
-      
+
       				Function call; matrix or array index (subscript)
       				We don't include $self here to avoid matching command syntax inside (), [], {}
-      			
+
     '''
     name: 'meta.function-call.parens.matlab'
     begin: '([a-zA-Z][a-zA-Z0-9_]*)\\s*(\\()'
@@ -1130,10 +1130,10 @@ repository:
     ]
   multiple_assignment:
     comment: '''
-      
+
       				Multiple assignment for output variables
       				We don't include $self here to avoid matching command syntax inside (), [], {}
-      			
+
     '''
     contentName: 'meta.assignment.variable.group.matlab'
     begin: '\\[(?=[^\\]]+\\]\\s*=[a-zA-Z0-9_\\s(])'
@@ -1159,10 +1159,10 @@ repository:
     ]
   parentheses:
     comment: '''
-      
+
       				Operator precedence in expressions
       				We don't include $self here to avoid matching command syntax inside (), [], {}
-      			
+
     '''
     contentName: 'meta.parens.matlab'
     begin: '\\('
@@ -1186,10 +1186,10 @@ repository:
     ]
   single_assignment:
     comment: '''
-      
+
       				Assignment for single output variable
       				We don't include $self here to avoid matching command syntax inside (), [], {}
-      			
+
     '''
     match: '(?<=^|,|;|for)\\s*([a-zA-Z][a-zA-Z0-9_.(){}]*)(?=\\s*=)'
     captures:
@@ -1205,10 +1205,10 @@ repository:
         ]
   square_brackets:
     comment: '''
-      
+
       				Matrix or array creation; matrix or array concatenation
       				We don't include $self here to avoid matching command syntax inside (), [], {}
-      			
+
     '''
     contentName: 'meta.brackets.matlab'
     begin: '\\[(?![^\\]]+\\]\\s{,4}=)'
@@ -1229,10 +1229,10 @@ repository:
     ]
   curly_brackets:
     comment: '''
-      
+
       				Cell creation (cell literal)
       				We don't include $self here to avoid matching command syntax inside (), [], {}
-      			
+
     '''
     contentName: 'meta.cell.literal.matlab'
     begin: '\\{'
@@ -1376,23 +1376,23 @@ repository:
       {
         comment: 'Numeric constants'
         name: 'constant.numeric.matlab'
-        match: '(?<!\\.)\\b(eps|Inf|inf|intmax|intmin|namelengthmax|realmax|realmin|pi)\\b'
+        match: '(?<!\\w|\\.)(eps|Inf|inf|intmax|intmin|namelengthmax|realmax|realmin|pi)\\b'
       }
       {
         comment: 'Value representations'
         name: 'constant.language.nan.matlab'
-        match: '(?<!\\.)\\b(NaN|nan|NaT|nat)\\b'
+        match: '(?<!\\w|\\.)(NaN|nan|NaT|nat)\\b'
       }
       {
         comment: 'Boolean constants'
         name: 'constant.language.boolean.matlab'
-        match: '(?<!\\.)\\b(on|off|false|true)\\b'
+        match: '(?<!\\w|\\.)(on|off|false|true)\\b'
       }
     ]
   variables:
     comment: 'MATLAB variables'
     name: 'variable.language.function.matlab'
-    match: '(?<!\\.)\\b(nargin|nargout|varargin|varargout)\\b'
+    match: '(?<!\\w|\\.)(nargin|nargout|varargin|varargout)\\b'
   end_in_parentheses:
     comment: 'end as operator symbol'
     name: 'keyword.operator.word.matlab'
@@ -1651,7 +1651,7 @@ repository:
       {
         comment: 'Import functionality'
         name: 'keyword.other.import.matlab'
-        match: '(?<!\\.)\\bimport\\b'
+        match: '(?<!\\w|\\.)import\\b'
       }
       {
         comment: 'Directives'
@@ -1666,7 +1666,7 @@ repository:
       {
         comment: 'Operator keywords'
         name: 'keyword.operator.word.matlab'
-        match: '(?<!\\.|\\w)(?:addprop|all|and|any|canUseGPU|canUseParallelPool|classUnderlying|containsrange|eq|(?<=event.)hasListener|exist|ge|getnext|gt|hasFrame|hascycles|hasdata|hasnext|inShape|incenter|innerjoin|intersect|isCompressedImg|isConnected|isDiscreteStateSpecificationMutableImpl|isDone|isDoneImpl|isInactivePropertyImpl|isInputComplexityMutableImpl|isInputDataTypeMutableImpl|isInputSizeMutableImpl|isInterior|isKey|isLoaded|isLocked|isMATLABReleaseOlderThan|isPartitionable|isShuffleable|isStringScalar|isTunablePropertyDataTypeMutableImpl|isUnderlyingType|isa|isaUnderlying|isappdata|isbanded|isbetween|iscalendarduration|iscalendartime|iscategorical|iscategory|iscell|iscellstr|ischange|ischar|iscolumn|iscom|isdatetime|isdiag|isdir|isdst|isduration|isempty|isenum|isequal|isequaln|isequalwithequalnans|isevent|isfield|isfile|isfinite|isfloat|isfolder|isglobal|isgraphics|ishandle|ishermitian|ishold|ishole|isinf|isinteger|isinterface|isinterior|isisomorphic|isjava|iskeyword|isletter|islocalmax|islocalmin|islogical|ismac|ismatrix|ismember|ismembertol|ismethod|ismissing|ismultigraph|isnan|isnat|isnumeric|isobject|isordinal|isoutlier|ispc|isplaying|ispref|isprime|isprop|isprotected|isreal|isrecording|isregular|isrow|isscalar|issimplified|issorted|issortedrows|isspace|issparse|isstring|isstrprop|isstruct|isstudent|issymmetric|istable|istall|istime|istimetable|istril|istriu|isundefined|isunix|isvarname|isvector|isweekend|le|localfunctions|lt|mfilename|mislocked|mustBeA|mustBeFile|mustBeFinite|mustBeFloat|mustBeFolder|mustBeGreaterThan|mustBeGreaterThanOrEqual|mustBeInRange|mustBeInteger|mustBeLessThan|mustBeLessThanOrEqual|mustBeMember|mustBeNegative|mustBeNonNan|mustBeNonempty|mustBeNonmissing|mustBeNonnegative|mustBeNonpositive|mustBeNonsparse|mustBeNonzero|mustBeNonzeroLengthText|mustBeNumeric|mustBeNumericOrLogical|mustBePositive|mustBeReal|mustBeScalarOrEmpty|mustBeText|mustBeTextScalar|mustBeUnderlyingType|mustBeValidVariableName|mustBeVector|ne|not|numArgumentsFromSubscript|or|outerjoin|overlapsrange|rmprop|setxor|underlyingType|union|unique|withinrange|xor)\\b'
+        match: '(?<!\\.|\\w)(?:addprop|all|and|any|canUseGPU|canUseParallelPool|classUnderlying|containsrange|eq|(?<=[^\\w.]event.)hasListener|exist|ge|getnext|gt|hasFrame|hascycles|hasdata|hasnext|inShape|incenter|innerjoin|intersect|isCompressedImg|isConnected|isDiscreteStateSpecificationMutableImpl|isDone|isDoneImpl|isInactivePropertyImpl|isInputComplexityMutableImpl|isInputDataTypeMutableImpl|isInputSizeMutableImpl|isInterior|isKey|isLoaded|isLocked|isMATLABReleaseOlderThan|isPartitionable|isShuffleable|isStringScalar|isTunablePropertyDataTypeMutableImpl|isUnderlyingType|isa|isaUnderlying|isappdata|isbanded|isbetween|iscalendarduration|iscalendartime|iscategorical|iscategory|iscell|iscellstr|ischange|ischar|iscolumn|iscom|isdatetime|isdiag|isdir|isdst|isduration|isempty|isenum|isequal|isequaln|isequalwithequalnans|isevent|isfield|isfile|isfinite|isfloat|isfolder|isglobal|isgraphics|ishandle|ishermitian|ishold|ishole|isinf|isinteger|isinterface|isinterior|isisomorphic|isjava|iskeyword|isletter|islocalmax|islocalmin|islogical|ismac|ismatrix|ismember|ismembertol|ismethod|ismissing|ismultigraph|isnan|isnat|isnumeric|isobject|isordinal|isoutlier|ispc|isplaying|ispref|isprime|isprop|isprotected|isreal|isrecording|isregular|isrow|isscalar|issimplified|issorted|issortedrows|isspace|issparse|isstring|isstrprop|isstruct|isstudent|issymmetric|istable|istall|istime|istimetable|istril|istriu|isundefined|isunix|isvarname|isvector|isweekend|le|localfunctions|lt|mfilename|mislocked|mustBeA|mustBeFile|mustBeFinite|mustBeFloat|mustBeFolder|mustBeGreaterThan|mustBeGreaterThanOrEqual|mustBeInRange|mustBeInteger|mustBeLessThan|mustBeLessThanOrEqual|mustBeMember|mustBeNegative|mustBeNonNan|mustBeNonempty|mustBeNonmissing|mustBeNonnegative|mustBeNonpositive|mustBeNonsparse|mustBeNonzero|mustBeNonzeroLengthText|mustBeNumeric|mustBeNumericOrLogical|mustBePositive|mustBeReal|mustBeScalarOrEmpty|mustBeText|mustBeTextScalar|mustBeUnderlyingType|mustBeValidVariableName|mustBeVector|ne|not|numArgumentsFromSubscript|or|outerjoin|overlapsrange|rmprop|setxor|underlyingType|union|unique|withinrange|xor)\\b'
       }
       {
         comment: 'Bitwise operator keywords'
@@ -1681,12 +1681,12 @@ repository:
       {
         comment: 'Workspace answer variable'
         name: 'variable.language.output.matlab'
-        match: '(?<!\\.)\\bans\\b'
+        match: '(?<!\\w|\\.)ans\\b'
       }
       {
         comment: 'Removed or pre-R2021a functionality'
         name: 'invalid.deprecated.matlab'
-        match: '(?<!\\.|\\w)(?:actxcontrol|actxcontrollist|actxcontrolselect|addParamValue|baryToCart|callSoapService|cartToBary|checkin|checkout|circumcenters|cmopts|codeCompatibilityReport|createClassFromWsdl|createCopy|createSoapMessage|csvread|csvwrite|customverctrl|dblquad|depdir|dlmread|dlmread|dlmwrite|edgeAttachments|edges|enableNETfromNetworkDrive|ezsurf|ezsurfc|faceNormals|featureEdges|findstr|flipdim|fopen|freeBoundary|guide|hdf5info|hdf5write|hdftool|hgsetget|hist|histc|hostid|inOutStatus|incenters|inferiorto|inline|instrcallback|instrfind|instrfindall|intwarning|isEdge|isInputSizeLockedImpl|isfullfile|isstr|lasterror|menu|nargchk|nearestNeighbor|neighbors|neighbors|notebook|opengl(?=\\s*(?:\\(\\s*["\'])?(?:data|info))|parseSoapResponse|plotyy|pointLocation|polar|quad|quadl|quadl|quadv|rmdir|rmmissing|rmoutliers|rose|serial|serial|serialbreak|seriallist|setstr|shiftdim|str2mat|strmatch|strvcat|superiorto|supportPackageInstaller|triplequad|TriRep|TriScatteredInterp|undocheckout|urlread|urlwrite|vectorize|verctrl|vertexAttachments|voronoiDiagram|whatsnew|xlsfinfo|xlsread|xlswrite)\\b|(?<=[a-zA-Z0-9_]\\.)(?:ActivePositionProperty|BaudRate|BreakInterruptFcn|ByteOrder|BytesAvailable|BytesAvailableFcn|BytesAvailableFcnCount|BytesAvailableFcnMode|BytesToOutput|Callback|DataBits|DataTerminalReady|ErrorFcn|FlowControl|InputBufferSize|Name|ObjectVisibility|OutputBufferSize|OutputEmptyFcn|Parity|PinStatus|PinStatusFcn|Port|Position|ReadAsyncMode|RecordDetail|RecordMode|RecordName|RecordStatus|RequestToSend|Status|StopBits|Tag|Terminator|Timeout|TimerFcn|TimerPeriod|TransferStatus|Type|UIContextMenu|UserData|ValuesReceived|ValuesSent)\\b|(?:(?<=NET\\.)convertArray|(?<=matlab\\.io.datastore\\.)HadoopFileBased|(?<=matlab\\.system\\.)StringSet|(?<=matlab\\.system\\.mixin\\.)(?:CustomIcon|Nondirect|Propagates|SampleTime)|(?<=matlab\\.unittest\\.plugins\\.)FailureDiagnosticsPlugin|(?<=matlabshared\\.supportpkg\\.)checkForUpdate)\\b|(?<=[\'"])(?:peer|SamplingRate)(?=[\'"])'
+        match: '(?<!\\.|\\w)(?:actxcontrol|actxcontrollist|actxcontrolselect|addParamValue|baryToCart|callSoapService|cartToBary|checkin|checkout|circumcenters|cmopts|codeCompatibilityReport|createClassFromWsdl|createCopy|createSoapMessage|csvread|csvwrite|customverctrl|dblquad|depdir|dlmread|dlmread|dlmwrite|edgeAttachments|edges|enableNETfromNetworkDrive|ezsurf|ezsurfc|faceNormals|featureEdges|findstr|flipdim|fopen|freeBoundary|guide|hdf5info|hdf5write|hdftool|hgsetget|hist|histc|hostid|inOutStatus|incenters|inferiorto|inline|instrcallback|instrfind|instrfindall|intwarning|isEdge|isInputSizeLockedImpl|isfullfile|isstr|lasterror|menu|nargchk|nearestNeighbor|neighbors|neighbors|notebook|opengl(?=\\s*(?:\\(\\s*["\'])?(?:data|info))|parseSoapResponse|plotyy|pointLocation|polar|quad|quadl|quadl|quadv|rmdir|rmmissing|rmoutliers|rose|serial|serial|serialbreak|seriallist|setstr|shiftdim|str2mat|strmatch|strvcat|superiorto|supportPackageInstaller|triplequad|TriRep|TriScatteredInterp|undocheckout|urlread|urlwrite|vectorize|verctrl|vertexAttachments|voronoiDiagram|whatsnew|xlsfinfo|xlsread|xlswrite)\\b|(?<=[a-zA-Z0-9_]\\.)(?:ActivePositionProperty|BaudRate|BreakInterruptFcn|BytesAvailable|BytesAvailableFcn|BytesAvailableFcnCount|BytesAvailableFcnMode|BytesToOutput|DataBits|DataTerminalReady|FlowControl|InputBufferSize|OutputBufferSize|Parity|PinStatus|PinStatusFcn|ReadAsyncMode|RecordDetail|RecordMode|RecordStatus|RequestToSend|StopBits|Terminator|TimerFcn|TimerPeriod|TransferStatus|UIContextMenu)\\b|(?:(?<=[^\\w.]NET\\.)convertArray|(?<=[^\\w.]matlab\\.io.datastore\\.)HadoopFileBased|(?<=[^\\w.]matlab\\.system\\.)StringSet|(?<=[^\\w.]matlab\\.system\\.mixin\\.)(?:CustomIcon|Nondirect|Propagates|SampleTime)|(?<=[^\\w.]matlab\\.unittest\\.plugins\\.)FailureDiagnosticsPlugin|(?<=[^\\w.]matlabshared\\.supportpkg\\.)checkForUpdate)\\b|(?<=[\'"])(?:peer|SamplingRate)(?=[\'"])'
       }
     ]
   constructs:
@@ -1739,12 +1739,12 @@ repository:
       {
         comment: 'Built-in programming functions'
         name: 'support.function.builtin.matlab'
-        match: '(?<!\\.|\\w)(?:addCause|addCorrection|addFile|addFolderIncludingChildFiles|addGroup|addGroup|addLabel|addOptional|addParameter|addPath|addPlugin|addReference|addRequired|addSetting|addSetting|addShortcut|addShutdownFile|addStartupFile|analyzeCodeCompatibility|assert|bench|builtin|checkcode|class|clearAllMemoizedCaches|clearPersonalValue|clearTemporaryValue|clock|codeCompatibilityReport|cputime|createCategory|createLabel|createToolboxGroup|currentProject|datatipinfo|date|dbmex|deal|details|echo|empty|enumeration|enumeration|error|eval|evalc|evalin|events|exist|export|feval|findCategory|findFile|findLabel|findprop|func2str|function_handle|functiontests|genvarname|getfield|getMockHistory|getNumInputs|getNumInputsImpl|getNumOutputs|getNumOutputsImpl|getPropertyGroupsImpl|getReport|global|hasFactoryValue|hasGroup|hasPersonalValue|hasSetting|hasTemporaryValue|infoImpl|inmem|lasterr|lasterror|lastwarn|listAllProjectReferences|listAllProjectReferences|listImpactedFiles|listModifiedFiles|listRequiredFiles|loadObjectImpl|matlabRelease|memoize|metaclass|methods|methodsview|mex|mexext|nargchk|narginchk|nargoutchk|notify|now|onCleanup|openProject|parse|patchdemoxmlfile|pcode|processInputSpecificationChangeImpl|processTunedPropertiesImpl|properties|properties|refreshSourceControl|relationaloperators|releaseImpl|reload|removeCategory|removeFile|removeGroup|removeLabel|removePath|removeReference|removeSetting|removeShortcut|removeShutdownFile|removeStartupFile|resetImpl|run|runChecks|runInParallel|runperf|runtests|runtests|saveObjectImpl|setProperties|settings|setup|setupImpl|stepImpl|superclasses|sysobjupdate|testrunner|throw|throwAsCaller|timeit|typecast|updateDependencies|validateattributes|validatecolor|validateFunctionSignaturesJSON|validateInputsImpl|validatePropertiesImpl|validatestring|warning)\\b|(?<=[^\\w.]event\\.)(?:listener|proplistener)|(?<=[^\\w.]matlabshared\\.supportpkg\\.)getInstalled|(?<=[^\\w.]matlabshared\\.supportpkg\\.)setSupportPackageRoot|(?<=[^\\w.]meta\\.)abstractDetails|(?<=[^\\w.]meta\\.class\\.)fromName|(?<=[^\\w.]meta\\.package\\.)(?:fromName|getAllPackages)|(?<=[^\\w.]MException\\.)last|(?<=tsdata\\.)event\\b'
+        match: '(?<!\\.|\\w)(?:addCause|addCorrection|addFile|addFolderIncludingChildFiles|addGroup|addGroup|addLabel|addOptional|addParameter|addPath|addPlugin|addReference|addRequired|addSetting|addSetting|addShortcut|addShutdownFile|addStartupFile|analyzeCodeCompatibility|assert|bench|builtin|checkcode|class|clearAllMemoizedCaches|clearPersonalValue|clearTemporaryValue|clock|codeCompatibilityReport|cputime|createCategory|createLabel|createToolboxGroup|currentProject|datatipinfo|date|dbmex|deal|details|echo|empty|enumeration|enumeration|error|eval|evalc|evalin|events|exist|export|feval|findCategory|findFile|findLabel|findprop|func2str|function_handle|functiontests|genvarname|getfield|getMockHistory|getNumInputs|getNumInputsImpl|getNumOutputs|getNumOutputsImpl|getPropertyGroupsImpl|getReport|global|hasFactoryValue|hasGroup|hasPersonalValue|hasSetting|hasTemporaryValue|infoImpl|inmem|lasterr|lasterror|lastwarn|listAllProjectReferences|listAllProjectReferences|listImpactedFiles|listModifiedFiles|listRequiredFiles|loadObjectImpl|matlabRelease|memoize|metaclass|methods|methodsview|mex|mexext|nargchk|narginchk|nargoutchk|notify|now|onCleanup|openProject|parse|patchdemoxmlfile|pcode|processInputSpecificationChangeImpl|processTunedPropertiesImpl|properties|properties|refreshSourceControl|relationaloperators|releaseImpl|reload|removeCategory|removeFile|removeGroup|removeLabel|removePath|removeReference|removeSetting|removeShortcut|removeShutdownFile|removeStartupFile|resetImpl|run|runChecks|runInParallel|runperf|runtests|runtests|saveObjectImpl|setProperties|settings|setup|setupImpl|stepImpl|superclasses|sysobjupdate|testrunner|throw|throwAsCaller|timeit|typecast|updateDependencies|validateattributes|validatecolor|validateFunctionSignaturesJSON|validateInputsImpl|validatePropertiesImpl|validatestring|warning)\\b|(?<=[^\\w.]event\\.)(?:listener|proplistener)|(?<=[^\\w.]matlabshared\\.supportpkg\\.)getInstalled|(?<=[^\\w.]matlabshared\\.supportpkg\\.)setSupportPackageRoot|(?<=[^\\w.]meta\\.)abstractDetails|(?<=[^\\w.]meta\\.class\\.)fromName|(?<=[^\\w.]meta\\.package\\.)(?:fromName|getAllPackages)|(?<=[^\\w.]MException\\.)last|(?<=[^\\w.]tsdata\\.)event\\b'
       }
       {
         comment: 'Built-in global classes and constructors'
         name: 'support.class.builtin.matlab'
-        match: '(?<!\\.|\\w)(?:actxGetRunningServer|actxserver|alphanumericBoundary|alphanumericsPattern|arrayDatastore|Attr|caseInsensitivePattern|caseSensitivePattern|CDATASection|characterListPattern|COM|CombinedDatastore|Comment|CompiledStylesheet|delimitedTextImportOptions|detectImportOptions|detectImportOptions|detectImportOptions|diag|digitBoundary|digitsPattern|DisplayFormatOptions|Document|DocumentFragment|DocumentType|DOMWriter|dynamicprops|Element|Entity|EntityResolver|eye|FactoryGroup|FactorySetting|fileDatastore|FileWriter|fixedWidthImportOptions|FunctionTestCase|GraphPlot|h5create|handle|imageDatastore|KeyValueDatastore|KeyValueStore|letterBoundary|lettersPattern|lineBoundary|Locator|lookAheadBoundary|lookBehindBoundary|maskedPattern|MemoizedFunction|MException|NamedNodeMap|namedPattern|NodeList|Notation|ones|OperationResult|optionalPattern|parquetDatastore|parquetDatastore|Parser|ParserConfiguration|possessivePattern|ProcessingInstruction|PythonEnvironment|RandStream|regexpPattern|ReleaseCompatibilityException|ReleaseCompatibilityResults|ResourceIdentifier|ResourceIdentifierType|ResultDocument|Setting|SettingsGroup|spreadsheetDatastore|spreadsheetDatastore|spreadsheetImportOptions|spreadsheetImportOptions|spreadsheetImportOptions|tabularTextDatastore|tabularTextDatastore|TallDatastore|TestResult|testsuite|Text|textBoundary|Tiff|timeseries|TransformedDatastore|tscollection|TypeInfo|ValueIterator|VersionResults|VideoReader|VideoWriter|whitespaceBoundary|whitespacePattern|wildcardPattern|WriterConfiguration|xmlImportOptions|zeros)\\b|(?:(?<=containers\\.)Map|(?<=event\\.)(?:l|ClassInstanceEvent|EventData|PropertyEvent)|(?<=H5A\\.)create|(?<=H5D\\.)create|(?<=H5F\\.)create|(?<=H5G\\.)create|(?<=H5L\\.)(?:create_external|create_hard|create_soft)|(?<=H5P\\.)create|(?<=H5R\\.)create|(?<=[^\\w.]H5S\\.)(?:create|create_simple)|(?<=[^\\w.]H5T\\.)(?:array_create|create|detect_class|enum_create)|(?<=[^\\w.]meta\\.)(?:ArrayDimension|class|DynamicProperty|DynamicProperty|EnumeratedValue|event|FixedDimension|MetaData|method|package|property|UnrestrictedDimension|Validation)|(?<=[^\\w.]NET\\.)(?:Assembly|createArray|createGeneric|GenericClass|NetException)|(?<=[^\\w.]netcdf\\.)create)\\b'
+        match: '(?<!\\.|\\w)(?:actxGetRunningServer|actxserver|alphanumericBoundary|alphanumericsPattern|arrayDatastore|Attr|caseInsensitivePattern|caseSensitivePattern|CDATASection|characterListPattern|COM|CombinedDatastore|Comment|CompiledStylesheet|delimitedTextImportOptions|detectImportOptions|detectImportOptions|detectImportOptions|diag|digitBoundary|digitsPattern|DisplayFormatOptions|Document|DocumentFragment|DocumentType|DOMWriter|dynamicprops|Element|Entity|EntityResolver|eye|FactoryGroup|FactorySetting|fileDatastore|FileWriter|fixedWidthImportOptions|FunctionTestCase|GraphPlot|h5create|handle|imageDatastore|KeyValueDatastore|KeyValueStore|letterBoundary|lettersPattern|lineBoundary|Locator|lookAheadBoundary|lookBehindBoundary|maskedPattern|MemoizedFunction|MException|NamedNodeMap|namedPattern|NodeList|Notation|ones|OperationResult|optionalPattern|parquetDatastore|parquetDatastore|Parser|ParserConfiguration|possessivePattern|ProcessingInstruction|PythonEnvironment|RandStream|regexpPattern|ReleaseCompatibilityException|ReleaseCompatibilityResults|ResourceIdentifier|ResourceIdentifierType|ResultDocument|Setting|SettingsGroup|spreadsheetDatastore|spreadsheetDatastore|spreadsheetImportOptions|spreadsheetImportOptions|spreadsheetImportOptions|tabularTextDatastore|tabularTextDatastore|TallDatastore|TestResult|testsuite|Text|textBoundary|Tiff|timeseries|TransformedDatastore|tscollection|TypeInfo|ValueIterator|VersionResults|VideoReader|VideoWriter|whitespaceBoundary|whitespacePattern|wildcardPattern|WriterConfiguration|xmlImportOptions|zeros)\\b|(?:(?<=[^\\w.]containers\\.)Map|(?<=[^\\w.]event\\.)(?:l|ClassInstanceEvent|EventData|PropertyEvent)|(?<=[^\\w.]H5A\\.)create|(?<=[^\\w.]H5D\\.)create|(?<=[^\\w.]H5F\\.)create|(?<=[^\\w.]H5G\\.)create|(?<=[^\\w.]H5L\\.)(?:create_external|create_hard|create_soft)|(?<=[^\\w.]H5P\\.)create|(?<=[^\\w.]H5R\\.)create|(?<=[^\\w.]H5S\\.)(?:create|create_simple)|(?<=[^\\w.]H5T\\.)(?:array_create|create|detect_class|enum_create)|(?<=[^\\w.]meta\\.)(?:ArrayDimension|class|DynamicProperty|DynamicProperty|EnumeratedValue|event|FixedDimension|MetaData|method|package|property|UnrestrictedDimension|Validation)|(?<=[^\\w.]NET\\.)(?:Assembly|createArray|createGeneric|GenericClass|NetException)|(?<=[^\\w.]netcdf\\.)create)\\b'
       }
       {
         comment: 'Audio and Video Processing'
@@ -1792,37 +1792,37 @@ repository:
       {
         comment: 'Top-level library namespaces'
         name: 'support.constant.builtin.matlab'
-        match: '(?<!\\.)appdesigner(?=\\.)|(?<!\\.)clibgen(?=\\.)|(?<!\\.)containers(?=\\.)|(?<!\\.)event(?=\\.)|(?<!\\.)H5A(?=\\.)|(?<!\\.)H5D(?=\\.)|(?<!\\.)H5F(?=\\.)|(?<!\\.)H5G(?=\\.)|(?<!\\.)H5L(?=\\.)|(?<!\\.)H5P(?=\\.)|(?<!\\.)H5R(?=\\.)|(?<!\\.)H5S(?=\\.)|(?<!\\.)H5T(?=\\.)|(?<!\\.)matlab(?=\\.)|(?<!\\.)matlabshared(?=\\.)|(?<!\\.)meta(?=\\.)|(?<!\\.)NET(?=\\.)|(?<!\\.)netcdf(?=\\.)|(?<!\\.)sd(?=\\.)|(?<!\\.)tsdata(?=\\.)'
+        match: '(?<!\\w|\\.)appdesigner(?=\\.)|(?<!\\w|\\.)clibgen(?=\\.)|(?<!\\w|\\.)containers(?=\\.)|(?<!\\w|\\.)event(?=\\.)|(?<!\\w|\\.)gd(?=\\.)|(?<!\\w|\\.)H5A(?=\\.)|(?<!\\w|\\.)H5D(?=\\.)|(?<!\\w|\\.)H5F(?=\\.)|(?<!\\w|\\.)H5G(?=\\.)|(?<!\\w|\\.)H5L(?=\\.)|(?<!\\w|\\.)H5P(?=\\.)|(?<!\\w|\\.)H5R(?=\\.)|(?<!\\w|\\.)H5S(?=\\.)|(?<!\\w|\\.)H5T(?=\\.)|(?<!\\w|\\.)matlab(?=\\.)|(?<!\\w|\\.)matlabshared(?=\\.)|(?<!\\w|\\.)meta(?=\\.)|(?<!\\w|\\.)NET(?=\\.)|(?<!\\w|\\.)netcdf(?=\\.)|(?<!\\w|\\.)sd(?=\\.)|(?<!\\w|\\.)sw(?=\\.)|(?<!\\w|\\.)tsdata(?=\\.)'
       }
       {
         comment: 'Sub-level library namespaces'
         name: 'support.constant.builtin.matlab'
-        match: '(?<=[^.]appdesigner\\.)customcomponent(?=\\.)|(?<=[^.]matlab\\.)(?:addons|apputil|codetools|diagram|engine|exception|graphics|io|lang|mixin|mixin|mock|net|perftest|project|settings|tall|test|ui|uitest|unittest|wsdl)(?=\\.)|(?<=[^.]matlab\\.addons\\.)toolbox(?=\\.)|(?<=[^.]matlab\\.graphics\\.)(?:animation|axis|chart|chartcontainer|function|illustration|layout|primitive|shape)(?=\\.)|(?<=[^.]matlab\\.graphics\\.axis\\.)decorator(?=\\.)|(?<=[^.]matlab\\.graphics\\.chart\\.)primitive(?=\\.)|(?<=[^.]matlab\\.graphics\\.chart\\.internal\\.)stackedplot(?=\\.)|(?<=[^.]matlab\\.graphics\\.chartcontainer\\.)mixin(?=\\.)|(?<=[^.]matlab\\.io\\.)(?:datastore|xml)(?=\\.)|(?<=[^.]matlab\\.io.xml\\.)(?:dom|transform|xpath)(?=\\.)|(?<=[^.]matlab\\.lang\\.)correction(?=\\.)|(?<=[^.]matlab\\.mixin\\.)(?:system|util)(?=\\.)|(?<=[^.]matlab\\.mock\\.)(?:actions|chart|constraints)(?=\\.)|(?<=[^.]matlab\\.net\\.)http(?=\\.)|(?<=[^.]matlab\\.net\\.http\\.)(?:field|io)(?=\\.)|(?<=[^.]matlab\\.settings\\.)mixin(?=\\.)|(?<=[^.]matlab\\.test\\.)behavior(?=\\.)|(?<=[^.]matlab\\.ui\\.)componentcontainer(?=\\.)|(?<=[^.]matlab\\.uitest\\.)measurement(?=\\.)|(?<=[^.]matlab\\.uitest.measurement\\.)chart(?=\\.)|(?<=[^.]matlab\\.unittest\\.)(?:constraints|diagnostics|fixtures|measurement|parameters|plugins|qualifications|selectors)(?=\\.)|(?<=[^.]matlab\\.unittest.plugins\\.)(?:codecoverage|diagnosticrecord|plugindata|testreport)(?=\\.)|(?<=[^.]matlab\\.wsdl\\.)plugins(?=\\.)|(?<=[^.]matlabshared\\.)supportpkg(?=\\.)'
+        match: '(?<=[^\\w.]appdesigner\\.)customcomponent(?=\\.)|(?<=[^\\w.]matlab\\.)(?:addons|apputil|codetools|diagram|engine|exception|graphics|io|lang|mixin|mixin|mock|net|perftest|project|settings|tall|test|ui|uitest|unittest|wsdl)(?=\\.)|(?<=[^\\w.]matlab\\.addons\\.)toolbox(?=\\.)|(?<=[^\\w.]matlab\\.graphics\\.)(?:animation|axis|chart|chartcontainer|function|illustration|layout|primitive|shape)(?=\\.)|(?<=[^\\w.]matlab\\.graphics\\.axis\\.)decorator(?=\\.)|(?<=[^\\w.]matlab\\.graphics\\.chart\\.)primitive(?=\\.)|(?<=[^\\w.]matlab\\.graphics\\.chart\\.internal\\.)stackedplot(?=\\.)|(?<=[^\\w.]matlab\\.graphics\\.chartcontainer\\.)mixin(?=\\.)|(?<=[^\\w.]matlab\\.io\\.)(?:datastore|hdf4|hdfeos|xml)(?=\\.)|(?<=[^\\w.]matlab\\.io\\.datastore\\.)sdidatastore(?=\\.)|(?<=[^\\w.]matlab\\.io\\.hdf4\\.)sd(?=\\.)|(?<=[^\\w.]matlab\\.io\\.hdfeos\\.)(?:gd|sw)(?=\\.)|(?<=[^\\w.]matlab\\.io.xml\\.)(?:dom|transform|xpath)(?=\\.)|(?<=[^\\w.]matlab\\.lang\\.)correction(?=\\.)|(?<=[^\\w.]matlab\\.mixin\\.)(?:system|util)(?=\\.)|(?<=[^\\w.]matlab\\.mock\\.)(?:actions|chart|constraints)(?=\\.)|(?<=[^\\w.]matlab\\.net\\.)http(?=\\.)|(?<=[^\\w.]matlab\\.net\\.http\\.)(?:field|io)(?=\\.)|(?<=[^\\w.]matlab\\.settings\\.)mixin(?=\\.)|(?<=[^\\w.]matlab\\.test\\.)behavior(?=\\.)|(?<=[^\\w.]matlab\\.ui\\.)componentcontainer(?=\\.)|(?<=[^\\w.]matlab\\.uitest\\.)measurement(?=\\.)|(?<=[^\\w.]matlab\\.uitest.measurement\\.)chart(?=\\.)|(?<=[^\\w.]matlab\\.unittest\\.)(?:constraints|diagnostics|fixtures|measurement|parameters|plugins|qualifications|selectors)(?=\\.)|(?<=[^\\w.]matlab\\.unittest.plugins\\.)(?:codecoverage|diagnosticrecord|plugindata|testreport)(?=\\.)|(?<=[^\\w.]matlab\\.wsdl\\.)plugins(?=\\.)|(?<=[^\\w.]matlabshared\\.)supportpkg(?=\\.)'
       }
       {
         comment: 'Namespaced programming functions'
         name: 'support.function.builtin.matlab'
-        match: '(?<=[^.]matlab\\.addons\\.)disableAddon\\b|(?<=[^.]matlab\\.addons\\.)(?:enableAddon|install|installedAddons|isAddonEnabled|uninstall)\\b|(?<=[^.]matlab\\.addons.toolbox\\.)installedToolboxes\\b|(?<=[^.]matlab\\.addons.toolbox\\.)(?:installToolbox|packageToolbox|toolboxVersion|uninstallToolbox)\\b|(?<=[^.]matlab\\.apputil\\.)(?:create|getInstalledAppInfo|install|package|run|uninstall)\\b|(?<=[^.]matlab\\.codetools\\.)requiredFilesAndProducts\\b|(?<=[^.]matlab\\.engine\\.)(?:connect_matlab|engineName|find_matlab|FutureResult|isEngineShared|shareEngine|start_matlab)\\b|(?<=[^.]matlab\\.mock.InteractionHistory\\.)forMock\\b|(?<=[^.]matlab\\.net\\.)(?:base64decode|base64encode)\\b|(?<=[^.]matlab\\.project\\.)(?:convertDefinitionFiles|createProject|deleteProject|loadProject|Project|rootProject)\\b|(?<=[^.]matlab\\.settings\\.)loadSettingsCompatibilityResults\\b|(?<=[^.]matlab\\.settings\\.)(?:mustBeIntegerScalar|mustBeLogicalScalar|mustBeNumericScalar|mustBeStringScalar|reloadFactoryFile)\\b|(?<=[^.]matlab\\.settings.FactoryGroup\\.)createToolboxGroup\\b|(?<=[^.]matlab\\.wsdl\\.)setWSDLToolPath\\b'
+        match: '(?<=[^\\w.]matlab\\.addons\\.)disableAddon\\b|(?<=[^\\w.]matlab\\.addons\\.)(?:enableAddon|install|installedAddons|isAddonEnabled|uninstall)\\b|(?<=[^\\w.]matlab\\.addons.toolbox\\.)installedToolboxes\\b|(?<=[^\\w.]matlab\\.addons.toolbox\\.)(?:installToolbox|packageToolbox|toolboxVersion|uninstallToolbox)\\b|(?<=[^\\w.]matlab\\.apputil\\.)(?:create|getInstalledAppInfo|install|package|run|uninstall)\\b|(?<=[^\\w.]matlab\\.codetools\\.)requiredFilesAndProducts\\b|(?<=[^\\w.]matlab\\.engine\\.)(?:connect_matlab|engineName|find_matlab|FutureResult|isEngineShared|shareEngine|start_matlab)\\b|(?<=[^\\w.]matlab\\.mock.InteractionHistory\\.)forMock\\b|(?<=[^\\w.]matlab\\.net\\.)(?:base64decode|base64encode)\\b|(?<=[^\\w.]matlab\\.project\\.)(?:convertDefinitionFiles|createProject|deleteProject|loadProject|Project|rootProject)\\b|(?<=[^\\w.]matlab\\.settings\\.)loadSettingsCompatibilityResults\\b|(?<=[^\\w.]matlab\\.settings\\.)(?:mustBeIntegerScalar|mustBeLogicalScalar|mustBeNumericScalar|mustBeStringScalar|reloadFactoryFile)\\b|(?<=[^\\w.]matlab\\.settings.FactoryGroup\\.)createToolboxGroup\\b|(?<=[^\\w.]matlab\\.wsdl\\.)setWSDLToolPath\\b'
       }
       {
         comment: 'Namespaced data functions'
         name: 'support.function.data.matlab'
-        match: '(?<=[^.]matlab\\.io\\.)saveVariablesToScript\\b|(?<=[^.]matlab\\.lang\\.)(?:makeUniqueStrings|makeValidName)\\b|(?<=[^.]matlab\\.tall\\.)(?:blockMovingWindow|movingWindow|reduce|transform)\\b|(?<=[^.]matlab\\.uitest\\.)unlock\\b|(?<=[^.]matlab\\.uitest.TestCase\\.)forInteractiveUse\\b|(?<=[^.]matlab\\.unittest\\.)(?:fromClass|fromFile|fromFolder|fromMethod|fromName|fromPackage|fromProject|run|selectIf|sortByFixtures)\\b'
+        match: '(?<=[^\\w.]matlab\\.io\\.)saveVariablesToScript\\b|(?<=[^\\w.]matlab\\.lang\\.)(?:makeUniqueStrings|makeValidName)\\b|(?<=[^\\w.]matlab\\.tall\\.)(?:blockMovingWindow|movingWindow|reduce|transform)\\b|(?<=[^\\w.]matlab\\.uitest\\.)unlock\\b|(?<=[^\\w.]matlab\\.uitest.TestCase\\.)forInteractiveUse\\b|(?<=[^\\w.]matlab\\.unittest\\.)(?:fromClass|fromFile|fromFolder|fromMethod|fromName|fromPackage|fromProject|run|selectIf|sortByFixtures)\\b'
       }
       {
         comment: 'Namespaced classes'
         name: 'support.class.builtin.matlab'
-        match: '(?<=[^.]matlab\\.)System\\b|(?<=[^.]matlab\\.diagram\\.)ClassViewer\\b|(?<=[^.]matlab\\.exception\\.)(?:JavaException|PyException)\\b|(?<=[^.]matlab\\.graphics\\.animation\\.)AnimatedLine\\b|(?<=[^.]matlab\\.graphics\\.axis\\.)(?:Axes|PolarAxes|GeographicAxes)\\b|(?<=[^.]matlab\\.graphics\\.axis\\.decorator\\.)(?:CategoricalRuler|DatetimeRuler|DurationRuler|GeographicRuler|NumericRuler)\\b|(?<=[^.]matlab\\.graphics\\.chart\\.)(?:ScatterHistogramChart|StackedLineChart|WordCloudChart)\\b|(?<=[^.]matlab\\.graphics\\.chart\\.internal\\.stackedplot\\.)(?:StackedAxesProperties|StackedLinesProperties)\\b|(?<=[^.]matlab\\.graphics.chartcontainer\\.)ChartContainer\\b|(?<=[^.]matlab\\.graphics.chartcontainer\\.mixin\\.)(?:Colorbar|Legend)\\b|(?<=[^.]matlab\\.graphics\\.chart\\.primitive\\.)(?:Area|Bar|BarChart|BubbleChart|BubbleCloud|Contour|ErrorBar|GeographicBubbleChart|HeatmapChart|Line|ParallelCoordinatesPlot|Quiver|Scatter|Stair|Stem|Surface)\\b|(?<=[^.]matlab\\.graphics\\.function\\.)(?:FunctionLine|ImplicitFunctionLine|ParameterizedFunctionLine|FunctionContour|FunctionSurface|ImplicitFunctionSurface|ParameterizedFunctionSurface)\\b|(?<=[^.]matlab\\.graphics\\.illustration\\.)(?:BubbleLegend|ColorBar|Legend)\\b|(?<=[^.]matlab\\.graphics\\.layout\\.)TiledChartLayout\\b|(?<=[^.]matlab\\.graphics\\.primitive\\.)(?:Group|Image|Light|Line|Path|Polygon|Rectangle|Surface|Text|Transform)\\b|(?<=[^.]matlab\\.graphics\\.shape\\.)(?:Arrow|DoubleEndArrow|Ellipse|Line|Rectangle|TextArrow|TextBox)\\b|(?<=[^.]matlab\\.io\\.)Datastore\\b|(?<=[^.]matlab\\.io.datastore\\.)(?:BlockedFileSet|DsFileReader|DsFileSet|FileSet|FileWritable|FoldersPropertyProvider|HadoopLocationBased|Partitionable|Shuffleable)\\b|(?<=[^.]matlab\\.io.xml.dom\\.)(?:Attr|CDATASection|Comment|Document|DocumentFragment|DocumentType|DOMWriter|Element|Entity|EntityResolver|FileWriter|Locator|NamedNodeMap|NodeList|Notation|Parser|ParserConfiguration|ProcessingInstruction|ResourceIdentifier|ResourceIdentifierType|Text|TypeInfo|WriterConfiguration)\\b|(?<=[^.]matlab\\.io.xml.transform\\.)(?:ResultFile|ResultString|SourceDocument|SourceFile|SourceString|StylesheetSourceDocument|StylesheetSourceFile|StylesheetSourceString|Transformer)\\b|(?<=[^.]matlab\\.io.xml.xpath\\.)(?:CompiledExpression|EvalResultType|Evaluator|PrefixResolver)\\b|(?<=[^.]matlab\\.lang\\.)OnOffSwitchState\\b|(?<=[^.]matlab\\.lang.correction\\.)(?:AppendArgumentsCorrection|ConvertToFunctionNotationCorrection|ReplaceIdentifierCorrection)\\b|(?<=[^.]matlab\\.mex\\.)MexHost\\b|(?<=[^.]matlab\\.mixin\\.)(?:Copyable|CustomDisplay|Heterogeneous|SetGet|SetGetExactNames)\\b|(?<=[^.]matlab\\.mixin.util\\.)PropertyGroup\\b|(?<=[^.]matlab\\.mock\\.)(?:AnyArguments|InteractionHistory|MethodCallBehavior|PropertyBehavior|PropertyGetBehavior|PropertySetBehavior|TestCase)\\b|(?<=[^.]matlab\\.mock.actions\\.)(?:AssignOutputs|DoNothing|Invoke|ReturnStoredValue|StoreValue|ThrowException)\\b|(?<=[^.]matlab\\.mock.constraints\\.)(?:Occurred|WasAccessed|WasCalled|WasSet)\\b|(?<=[^.]matlab\\.net\\.)(?:QueryParameter|URI)\\b|(?<=[^.]matlab\\.net\\.http\\.)(?:AuthInfo|Cookie|CookieInfo|Credentials|HeaderField|HTTPException|HTTPOptions|LogRecord|MediaType|Message|MessageBody|ProgressMonitor|ProtocolVersion|RequestLine|RequestMessage|ResponseMessage|StartLine|StatusLine)\\b|(?<=[^.]matlab\\.net\\.http.field\\.)(?:AcceptField|AuthenticateField|AuthenticationInfoField|AuthorizationField|ContentDispositionField|ContentLengthField|ContentLocationField|ContentTypeField|CookieField|DateField|GenericField|GenericParameterizedField|HTTPDateField|IntegerField|LocationField|MediaRangeField|SetCookieField|URIReferenceField)\\b|(?<=[^.]matlab\\.net\\.http.io\\.)(?:BinaryConsumer|ContentConsumer|ContentProvider|FileConsumer|FileProvider|FormProvider|GenericConsumer|GenericProvider|ImageConsumer|ImageProvider|JSONConsumer|JSONProvider|MultipartConsumer|MultipartFormProvider|MultipartProvider|StringConsumer|StringProvider)\\b|(?<=[^.]matlab\\.perftest\\.)(?:FixedTimeExperiment|FrequentistTimeExperiment|TestCase|TimeExperiment|TimeResult)\\b|(?<=[^.]matlab\\.settings\\.)SettingsFileUpgrader\\b|(?<=[^.]matlab\\.system.mixin\\.)FiniteSource\\b|(?<=[^.]matlab\\.test.behavior\\.)Missing\\b|(?<=[^.]matlab\\.ui\\.)(?:Figure|Root)\\b|(?<=[^.]matlab\\.ui.componentcontainer\\.)ComponentContainer\\b|(?<=[^.]matlab\\.uitest\\.)TestCase\\b|(?<=[^.]matlab\\.unittest\\.)(?:Test|TestCase|TestResult|TestRunner|TestSuite)\\b|(?<=[^.]matlab\\.unittest.constraints\\.)(?:AbsoluteTolerance|AnyCellOf|AnyElementOf|BooleanConstraint|CellComparator|Constraint|ContainsSubstring|EndsWithSubstring|Eventually|EveryCellOf|EveryElementOf|HasElementCount|HasField|HasInf|HasLength|HasNaN|HasSize|HasUniqueElements|IsAnything|IsEmpty|IsEqualTo|IsFalse|IsFinite|IsGreaterThan|IsGreaterThanOrEqualTo|IsInstanceOf|IsLessThan|IsLessThanOrEqualTo|IsOfClass|IsReal|IsSameHandleAs|IsSameSetAs|IsScalar|IsSparse|IsSubsetOf|IsSubstringOf|IsSupersetOf|IsTrue|IssuesNoWarnings|IssuesWarnings|LogicalComparator|Matches|NumericComparator|ObjectComparator|PublicPropertyComparator|RelativeTolerance|ReturnsTrue|StartsWithSubstring|StringComparator|StructComparator|TableComparator|Throws|Tolerance)\\b|(?<=[^.]matlab\\.unittest.diagnostics\\.)(?:ConstraintDiagnostic|Diagnostic|DiagnosticResult|DisplayDiagnostic|FigureDiagnostic|FileArtifact|FrameworkDiagnostic|FunctionHandleDiagnostic|LoggedDiagnosticEventData|ScreenshotDiagnostic|StringDiagnostic)\\b|(?<=[^.]matlab\\.unittest.fixtures\\.)Fixture\\b|(?<=[^.]matlab\\.unittest.measurement\\.)(?:DefaultMeasurementResult|MeasurementResult)\\b|(?<=[^.]matlab\\.unittest.measurement.chart\\.)ComparisonPlot\\b|(?<=[^.]matlab\\.unittest.parameters\\.)(?:ClassSetupParameter|EmptyParameter|MethodSetupParameter|Parameter|TestParameter)\\b|(?<=[^.]matlab\\.unittest.plugins\\.)(?:CodeCoveragePlugin|DiagnosticsOutputPlugin|DiagnosticsRecordingPlugin|DiagnosticsValidationPlugin|FailOnWarningsPlugin|LoggingPlugin|OutputStream|Parallelizable|QualifyingPlugin|StopOnFailuresPlugin|TAPPlugin|TestReportPlugin|TestRunProgressPlugin|TestRunnerPlugin|ToFile|ToStandardOutput|ToUniqueFile|XMLPlugin)\\b|(?<=[^.]matlab\\.unittest.qualifications\\.)(?:Assertable|AssertionFailedException|Assumable|AssumptionFailedException|ExceptionEventData|FatalAssertable|FatalAssertionFailedException|QualificationEventData|Verifiable)\\b|(?<=[^.]matlab\\.unittest.selector\\.)(?:AndSelector|HasBaseFolder|HasName|HasParameter|HasProcedureName|HasSharedTestFixture|HasSuperclass|HasTag|NotSelector|OrSelector)\\b|(?<=[^.]matlab\\.unittest.TestRunner\\.)(?:withNoPlugins|withTextOutput)\\b|(?<=[^.]matlab\\.unittest.TestSuite\\.)(?:fromClass|fromFile|fromFolder|fromMethod|fromName|fromPackage|fromProject)\\b|(?<=[^.]matlab\\.wsdl\\.)createWSDLClient\\b'
+        match: '(?<=[^\\w.]matlab\\.)System\\b|(?<=[^\\w.]matlab\\.diagram\\.)ClassViewer\\b|(?<=[^\\w.]matlab\\.exception\\.)(?:JavaException|PyException)\\b|(?<=[^\\w.]matlab\\.graphics\\.animation\\.)AnimatedLine\\b|(?<=[^\\w.]matlab\\.graphics\\.axis\\.)(?:Axes|PolarAxes|GeographicAxes)\\b|(?<=[^\\w.]matlab\\.graphics\\.axis\\.decorator\\.)(?:CategoricalRuler|DatetimeRuler|DurationRuler|GeographicRuler|NumericRuler)\\b|(?<=[^\\w.]matlab\\.graphics\\.chart\\.)(?:ScatterHistogramChart|StackedLineChart|WordCloudChart)\\b|(?<=[^\\w.]matlab\\.graphics\\.chart\\.internal\\.stackedplot\\.)(?:StackedAxesProperties|StackedLinesProperties)\\b|(?<=[^\\w.]matlab\\.graphics.chartcontainer\\.)ChartContainer\\b|(?<=[^\\w.]matlab\\.graphics.chartcontainer\\.mixin\\.)(?:Colorbar|Legend)\\b|(?<=[^\\w.]matlab\\.graphics\\.chart\\.primitive\\.)(?:Area|Bar|BarChart|BubbleChart|BubbleCloud|Contour|ErrorBar|GeographicBubbleChart|HeatmapChart|Line|ParallelCoordinatesPlot|Quiver|Scatter|Stair|Stem|Surface)\\b|(?<=[^\\w.]matlab\\.graphics\\.function\\.)(?:FunctionLine|ImplicitFunctionLine|ParameterizedFunctionLine|FunctionContour|FunctionSurface|ImplicitFunctionSurface|ParameterizedFunctionSurface)\\b|(?<=[^\\w.]matlab\\.graphics\\.illustration\\.)(?:BubbleLegend|ColorBar|Legend)\\b|(?<=[^\\w.]matlab\\.graphics\\.layout\\.)TiledChartLayout\\b|(?<=[^\\w.]matlab\\.graphics\\.primitive\\.)(?:Group|Image|Light|Line|Path|Polygon|Rectangle|Surface|Text|Transform)\\b|(?<=[^\\w.]matlab\\.graphics\\.shape\\.)(?:Arrow|DoubleEndArrow|Ellipse|Line|Rectangle|TextArrow|TextBox)\\b|(?<=[^\\w.]matlab\\.io\\.)Datastore\\b|(?<=[^\\w.]matlab\\.io.datastore\\.)(?:BlockedFileSet|DsFileReader|DsFileSet|FileSet|FileWritable|FoldersPropertyProvider|HadoopLocationBased|Partitionable|Shuffleable)\\b|(?<=[^\\w.]matlab\\.io.xml.dom\\.)(?:Attr|CDATASection|Comment|Document|DocumentFragment|DocumentType|DOMWriter|Element|Entity|EntityResolver|FileWriter|Locator|NamedNodeMap|NodeList|Notation|Parser|ParserConfiguration|ProcessingInstruction|ResourceIdentifier|ResourceIdentifierType|Text|TypeInfo|WriterConfiguration)\\b|(?<=[^\\w.]matlab\\.io.xml.transform\\.)(?:ResultFile|ResultString|SourceDocument|SourceFile|SourceString|StylesheetSourceDocument|StylesheetSourceFile|StylesheetSourceString|Transformer)\\b|(?<=[^\\w.]matlab\\.io.xml.xpath\\.)(?:CompiledExpression|EvalResultType|Evaluator|PrefixResolver)\\b|(?<=[^\\w.]matlab\\.lang\\.)OnOffSwitchState\\b|(?<=[^\\w.]matlab\\.lang.correction\\.)(?:AppendArgumentsCorrection|ConvertToFunctionNotationCorrection|ReplaceIdentifierCorrection)\\b|(?<=[^\\w.]matlab\\.mex\\.)MexHost\\b|(?<=[^\\w.]matlab\\.mixin\\.)(?:Copyable|CustomDisplay|Heterogeneous|SetGet|SetGetExactNames)\\b|(?<=[^\\w.]matlab\\.mixin.util\\.)PropertyGroup\\b|(?<=[^\\w.]matlab\\.mock\\.)(?:AnyArguments|InteractionHistory|MethodCallBehavior|PropertyBehavior|PropertyGetBehavior|PropertySetBehavior|TestCase)\\b|(?<=[^\\w.]matlab\\.mock.actions\\.)(?:AssignOutputs|DoNothing|Invoke|ReturnStoredValue|StoreValue|ThrowException)\\b|(?<=[^\\w.]matlab\\.mock.constraints\\.)(?:Occurred|WasAccessed|WasCalled|WasSet)\\b|(?<=[^\\w.]matlab\\.net\\.)(?:QueryParameter|URI)\\b|(?<=[^\\w.]matlab\\.net\\.http\\.)(?:AuthInfo|Cookie|CookieInfo|Credentials|HeaderField|HTTPException|HTTPOptions|LogRecord|MediaType|Message|MessageBody|ProgressMonitor|ProtocolVersion|RequestLine|RequestMessage|ResponseMessage|StartLine|StatusLine)\\b|(?<=[^\\w.]matlab\\.net\\.http.field\\.)(?:AcceptField|AuthenticateField|AuthenticationInfoField|AuthorizationField|ContentDispositionField|ContentLengthField|ContentLocationField|ContentTypeField|CookieField|DateField|GenericField|GenericParameterizedField|HTTPDateField|IntegerField|LocationField|MediaRangeField|SetCookieField|URIReferenceField)\\b|(?<=[^\\w.]matlab\\.net\\.http.io\\.)(?:BinaryConsumer|ContentConsumer|ContentProvider|FileConsumer|FileProvider|FormProvider|GenericConsumer|GenericProvider|ImageConsumer|ImageProvider|JSONConsumer|JSONProvider|MultipartConsumer|MultipartFormProvider|MultipartProvider|StringConsumer|StringProvider)\\b|(?<=[^\\w.]matlab\\.perftest\\.)(?:FixedTimeExperiment|FrequentistTimeExperiment|TestCase|TimeExperiment|TimeResult)\\b|(?<=[^\\w.]matlab\\.settings\\.)SettingsFileUpgrader\\b|(?<=[^\\w.]matlab\\.system.mixin\\.)FiniteSource\\b|(?<=[^\\w.]matlab\\.test.behavior\\.)Missing\\b|(?<=[^\\w.]matlab\\.ui\\.)(?:Figure|Root)\\b|(?<=[^\\w.]matlab\\.ui.componentcontainer\\.)ComponentContainer\\b|(?<=[^\\w.]matlab\\.uitest\\.)TestCase\\b|(?<=[^\\w.]matlab\\.unittest\\.)(?:Test|TestCase|TestResult|TestRunner|TestSuite)\\b|(?<=[^\\w.]matlab\\.unittest.constraints\\.)(?:AbsoluteTolerance|AnyCellOf|AnyElementOf|BooleanConstraint|CellComparator|Constraint|ContainsSubstring|EndsWithSubstring|Eventually|EveryCellOf|EveryElementOf|HasElementCount|HasField|HasInf|HasLength|HasNaN|HasSize|HasUniqueElements|IsAnything|IsEmpty|IsEqualTo|IsFalse|IsFinite|IsGreaterThan|IsGreaterThanOrEqualTo|IsInstanceOf|IsLessThan|IsLessThanOrEqualTo|IsOfClass|IsReal|IsSameHandleAs|IsSameSetAs|IsScalar|IsSparse|IsSubsetOf|IsSubstringOf|IsSupersetOf|IsTrue|IssuesNoWarnings|IssuesWarnings|LogicalComparator|Matches|NumericComparator|ObjectComparator|PublicPropertyComparator|RelativeTolerance|ReturnsTrue|StartsWithSubstring|StringComparator|StructComparator|TableComparator|Throws|Tolerance)\\b|(?<=[^\\w.]matlab\\.unittest.diagnostics\\.)(?:ConstraintDiagnostic|Diagnostic|DiagnosticResult|DisplayDiagnostic|FigureDiagnostic|FileArtifact|FrameworkDiagnostic|FunctionHandleDiagnostic|LoggedDiagnosticEventData|ScreenshotDiagnostic|StringDiagnostic)\\b|(?<=[^\\w.]matlab\\.unittest.fixtures\\.)Fixture\\b|(?<=[^\\w.]matlab\\.unittest.measurement\\.)(?:DefaultMeasurementResult|MeasurementResult)\\b|(?<=[^\\w.]matlab\\.unittest.measurement.chart\\.)ComparisonPlot\\b|(?<=[^\\w.]matlab\\.unittest.parameters\\.)(?:ClassSetupParameter|EmptyParameter|MethodSetupParameter|Parameter|TestParameter)\\b|(?<=[^\\w.]matlab\\.unittest.plugins\\.)(?:CodeCoveragePlugin|DiagnosticsOutputPlugin|DiagnosticsRecordingPlugin|DiagnosticsValidationPlugin|FailOnWarningsPlugin|LoggingPlugin|OutputStream|Parallelizable|QualifyingPlugin|StopOnFailuresPlugin|TAPPlugin|TestReportPlugin|TestRunProgressPlugin|TestRunnerPlugin|ToFile|ToStandardOutput|ToUniqueFile|XMLPlugin)\\b|(?<=[^\\w.]matlab\\.unittest.qualifications\\.)(?:Assertable|AssertionFailedException|Assumable|AssumptionFailedException|ExceptionEventData|FatalAssertable|FatalAssertionFailedException|QualificationEventData|Verifiable)\\b|(?<=[^\\w.]matlab\\.unittest.selector\\.)(?:AndSelector|HasBaseFolder|HasName|HasParameter|HasProcedureName|HasSharedTestFixture|HasSuperclass|HasTag|NotSelector|OrSelector)\\b|(?<=[^\\w.]matlab\\.unittest.TestRunner\\.)(?:withNoPlugins|withTextOutput)\\b|(?<=[^\\w.]matlab\\.unittest.TestSuite\\.)(?:fromClass|fromFile|fromFolder|fromMethod|fromName|fromPackage|fromProject)\\b|(?<=[^\\w.]matlab\\.wsdl\\.)createWSDLClient\\b'
       }
       {
         comment: 'Namespaced storage functions'
         name: 'support.function.io.matlab'
-        match: '(?<=matlab\\.unittest.constraints\\.)(?:IsFile|IsFolder)\\b'
+        match: '(?<=[^\\w.]matlab\\.unittest.constraints\\.)(?:IsFile|IsFolder)\\b'
       }
       {
         comment: 'Namespaced enumerations'
         name: 'support.constant.enum.matlab'
-        match: '(?:(?<=matlab\\.net\\.)(?:ArrayFormat|AuthenticationScheme)|(?<=matlab\\.net\\.http\\.)(?:Disposition|RequestMethod|MessageType|StatusClass|StatusCode)|(?<=matlab\\.unittest\\.)(?:Scope|Verbosity))\\b'
+        match: '(?:(?<=[^\\w.]matlab\\.net\\.)(?:ArrayFormat|AuthenticationScheme)|(?<=[^\\w.]matlab\\.net\\.http\\.)(?:Disposition|RequestMethod|MessageType|StatusClass|StatusCode)|(?<=[^\\w.]matlab\\.unittest\\.)(?:Scope|Verbosity))\\b'
       }
     ]
   package_properties:
@@ -3329,7 +3329,7 @@ repository:
       {
         comment: 'MATLAB aerospace toolbox namespaces'
         name: 'support.constant.toolbox.aerospace.matlab'
-        match: '(?<!\\.)(Aero)(?=\\.)|(?<=[^.]Aero\\.)Aircraft(?=\\.)'
+        match: '(?<!\\w|\\.)(Aero)(?=\\.)|(?<=[^.]Aero\\.)Aircraft(?=\\.)'
       }
       {
         comment: 'MATLAB bioinformatics toolbox'
@@ -3344,7 +3344,7 @@ repository:
       {
         comment: 'MATLAB bioinformatics toolbox namespaces'
         name: 'support.constant.toolbox.bioinformatics.matlab'
-        match: '(?<!\\.)(?:bioma|biograph)\\b|(?<=[^.]bioma\\.)data\\b'
+        match: '(?<!\\w|\\.)(?:bioma|biograph)\\b|(?<=[^.]bioma\\.)data\\b'
       }
       {
         comment: 'MATLAB communications toolbox'
@@ -3364,12 +3364,12 @@ repository:
       {
         comment: 'MATLAB computer vision toolbox classes'
         name: 'support.class.toolbox.computer-vision.matlab'
-        match: '(?<=vision\\.)(?:AlphaBlender|BinaryFileReader|BinaryFileWriter|BlobAnalysis|BlockMatcher|CascadeObjectDetector|ChromaResampler|DeployableVideoPlayer|ForegroundDetector|GammaCorrector|HistogramBasedTracker|KalmanFilter|LocalMaximaFinder|PeopleDetector|PointTracker|TemplateMatcher|VideoFileReader|VideoFileWriter|VideoPlayer)\\b|(?<=vision\\.labeler\\.)AutomationAlgorithm\\b|(?<=vision\\.labeler\\.mixin\\.)(?:BlockedImageAutomation|Temporal)\\b'
+        match: '(?<=[^\\w.]vision\\.)(?:AlphaBlender|BinaryFileReader|BinaryFileWriter|BlobAnalysis|BlockMatcher|CascadeObjectDetector|ChromaResampler|DeployableVideoPlayer|ForegroundDetector|GammaCorrector|HistogramBasedTracker|KalmanFilter|LocalMaximaFinder|PeopleDetector|PointTracker|TemplateMatcher|VideoFileReader|VideoFileWriter|VideoPlayer)\\b|(?<=[^\\w.]vision\\.labeler\\.)AutomationAlgorithm\\b|(?<=[^\\w.]vision\\.labeler\\.mixin\\.)(?:BlockedImageAutomation|Temporal)\\b'
       }
       {
         comment: 'MATLAB computer vision toolbox namespaces'
         name: 'support.constant.toolbox.computer-vision.matlab'
-        match: '(?<!\\.)vision(?=\\.)|(?<=[^.]vision\\.)labeler(?=\\.)|(?<=[^.]vision\\.labeler\\.)mixin(?=\\.)'
+        match: '(?<!\\w|\\.)vision(?=\\.)|(?<=[^.]vision\\.)labeler(?=\\.)|(?<=[^.]vision\\.labeler\\.)mixin(?=\\.)'
       }
       {
         comment: 'MATLAB control systems toolbox'
@@ -3379,7 +3379,7 @@ repository:
       {
         comment: 'MATLAB design toolbox classes'
         name: 'support.class.toolbox.design.matlab'
-        match: '(?<!\\.)TuningGoal\\b|(?<=[^.]TuningGoal\\.)(?:ConicSector|ControllerPoles|Gain|LoopShape|LQG|Margins|MaxLoopGain|MinLoopGain|Overshoot|Passivity|Poles|Rejection|Sensitivity|StepRejection|StepTracking|Tracking|Transient|Variance|WeightedGain|WeightedPassivity|WeightedVariance)\\b'
+        match: '(?<!\\w|\\.)TuningGoal\\b|(?<=[^.]TuningGoal\\.)(?:ConicSector|ControllerPoles|Gain|LoopShape|LQG|Margins|MaxLoopGain|MinLoopGain|Overshoot|Passivity|Poles|Rejection|Sensitivity|StepRejection|StepTracking|Tracking|Transient|Variance|WeightedGain|WeightedPassivity|WeightedVariance)\\b'
       }
       {
         comment: 'MATLAB curve fitting toolbox'
@@ -3394,7 +3394,7 @@ repository:
       {
         comment: 'MATLAB database toolbox'
         name: 'support.function.toolbox.database.matlab'
-        match: '(?<!\\.|\\w)(?:addNodeLabel|apacheCassandra|attr|bestrowid|bindParamValues|cassandra|CassandraConnectionOptions|clearwarnings|close|cols|columninfo|columnnames|columnprivileges|columns|commit|confds|configureODBCDataSource|connection|count|createCollection|createConnectionForPool|createNode|createRelation|crossreference|cursor.fetch|database|database.fetch|databaseConnectionOptions|databaseDatastore|databaseImportOptions|databasePreparedStatement|deleteDataSource|deleteNode|deleteRelation|distinct|dmd|driver|drivermanager|dropCollection|exec|execute|executecql|executeCypher|executeSQLScript|exportedkeys|fastinsert|fetch|fetchmulti|find|get|getdatasources|getoptions|hasdata|importedkeys|indexinfo|insert|isconnection|isdriver|isjdbc|isnullcolumn|isopen|isreadonly|isurl|listDataSources|logintimeout|mongo|mysql|namecolumn|neo4j|Neo4jConnect|Neo4jNode|Neo4jRelation|neo4jStruct2Digraph|nodeDegree|nodeLabels|nodeRelationTypes|odbc|partitionRead|ping|postgresql|preview|primarykeys|procedurecolumns|procedures|propertyKeys|querybuilder|querytimeout|read|readall|register|relationTypes|remove|removeNodeLabel|removeNodeProperty|removeRelationProperty|reset|resultset|rmoptions|rollback|rows|rsmd|runstoredprocedure|saveAsDataSource|searchGraph|searchNode|searchNodeByID|searchRelation|searchRelationByID|select|set|setdbprefs|setNodeProperty|setoptions|setRelationProperty|splitsqlquery|sql2native|SQLConnectionOptions|sqlfind|SQLImportOptions|sqlinnerjoin|sqlite|sqlouterjoin|SQLPreparedStatement|sqlread|sqlwrite|storeDigraph|supports|tablenames|tableprivileges|tables|testConnection|unregister|update|updateNode|updateRelation|upsert|versioncolumns|width)\\b'
+        match: '(?<!\\.|\\w)(?:addNodeLabel|apacheCassandra|attr|bestrowid|bindParamValues|cassandra|CassandraConnectionOptions|clearwarnings|close|cols|columninfo|columnnames|columnprivileges|columns|commit|confds|configureODBCDataSource|connection|count|createCollection|createConnectionForPool|createNode|createRelation|crossreference|cursor.fetch|database|database.fetch|databaseConnectionOptions|databaseDatastore|databaseImportOptions|databasePreparedStatement|deleteDataSource|deleteNode|deleteRelation|distinct|dmd|driver|drivermanager|dropCollection|exec|execute|executecql|executeCypher|executeSQLScript|exportedkeys|fastinsert|fetch|fetchmulti|find|get|getdatasources|getoptions|hasdata|importedkeys|indexinfo|insert|isconnection|isdriver|isjdbc|is\snullcolumn|isopen|isreadonly|isurl|listDataSources|logintimeout|mongo|mysql|namecolumn|neo4j|Neo4jConnect|Neo4jNode|Neo4jRelation|neo4jStruct2Digraph|nodeDegree|nodeLabels|nodeRelationTypes|odbc|partitionRead|ping|postgresql|preview|primarykeys|procedurecolumns|procedures|propertyKeys|querybuilder|querytimeout|read|readall|register|relationTypes|remove|removeNodeLabel|removeNodeProperty|removeRelationProperty|reset|resultset|rmoptions|rollback|rows|rsmd|runstoredprocedure|saveAsDataSource|searchGraph|searchNode|searchNodeByID|searchRelation|searchRelationByID|select|set|setdbprefs|setNodeProperty|setoptions|setRelationProperty|splitsqlquery|sql2native|SQLConnectionOptions|sqlfind|SQLImportOptions|sqlinnerjoin|sqlite|sqlouterjoin|SQLPreparedStatement|sqlread|sqlwrite|storeDigraph|supports|tablenames|tableprivileges|tables|testConnection|unregister|update|updateNode|updateRelation|upsert|versioncolumns|width)\\b'
       }
       {
         comment: 'MATLAB datafeed toolbox'
@@ -3404,7 +3404,7 @@ repository:
       {
         comment: 'MATLAB design toolbox'
         name: 'support.function.toolbox.design.matlab'
-        match: '(?<!\\.|\\w)(?:addCursor|addDivider|addWave|allpass2wdf|allpassbpc2bpc|allpasslp2bp|allpasslp2bpc|allpasslp2bs|allpasslp2bsc|allpasslp2hp|allpasslp2lp|allpasslp2mb|allpasslp2mbc|allpasslp2xc|allpasslp2xn|allpassrateup|allpassshift|allpassshiftc|audioDeviceWriter|autoscale|block|butter|ca2tf|cascade|cheby1|cheby2|cl2tf|coeffs|coeread|coewrite|convert|cost|cumsec|deleteCursor|deleteDisplayChannel|denormalize|design|designFracDelayFIR|designmethods|designMultirateFIR|designMultistageDecimator|designMultistageInterpolator|designoptions|designopts|dspunfold|ellip|equiripple|euclidfactors|farrow|fcfwrite|fdatool|fdesign|fftcoeffs|filter|filterbuilder|filterBuilder|filterDesigner|filtstates.cic|fircband|firceqrip|fireqint|firgr|firhalfband|firlp2hp|firlp2lp|firlpnorm|firls|firminphase|firnyquist|firpr2chfb|firtype|freqrespest|freqrespopts|freqsamp|freqz|fvtool|gain|generatehdl|generateScript|getCursorInfo|getCursorTags|getDisplayChannelInfo|getDisplayChannelTags|getMeasurementsData|getSpectralMaskStatus|getSpectrumData|grpdelay|help|ifir|iirbpc2bpc|iircomb|iirftransf|iirgrpdelay|iirlinphase|iirlp2bp|iirlp2bpc|iirlp2bs|iirlp2bsc|iirlp2hp|iirlp2lp|iirlp2mb|iirlp2mbc|iirlp2xc|iirlp2xn|iirlpnorm|iirlpnormc|iirls|iirnotch|iirpeak|iirpowcomp|iirrateup|iirshift|iirshiftc|impz|impzlength|info|int|isallpass|isfir|islinphase|ismaxphase|isminphase|isNewDataReady|isreal|issos|isstable|kaiserwin|lagrange|limitcycle|maxstep|measure|modifyCursor|modifyDisplayChannel|moveDisplayChannel|msepred|msesim|multistage|noisepsd|noisepsdopts|norm|normalize|normalizefreq|nstates|order|parallel|phasedelay|phasez|polyphase|powermeter|qreport|realizemdl|rebuffer_delay|reffilter|reorder|reset|scale|scalecheck|scaleopts|set2int|setCursorDataLabels|setspecs|sos|specifyall|SpectrumAnalyzerConfiguration|ss|step|stepz|tf|tf2ca|tf2cl|timescope|validstructures|wdf2allpass|window|zerophase|zpk|zpkbpc2bpc|zpkftransf|zpklp2bp|zpklp2bpc|zpklp2bs|zpklp2bsc|zpklp2hp|zpklp2lp|zpklp2mb|zpklp2mbc|zpklp2xc|zpklp2xn|zpkrateup|zpkshift|zpkshiftc|zplane)\\b|(?<=adaptfilt.)(?:adjlms|ap|apru|bap|blms|blmsfft|dlms|fdaf|filtxlms|ftf|gal|hrls|hswrls|lms|lsl|nlms|pbfdaf|pbufdaf|qrdlsl|qrdrls|rls|sd|se|ss|swftf|swrls|tdafdct|tdafdft|ufdaf)\\b|(?<=mfilt.)(?:cascade|cicdecim|cicinterp|farrowsrc|fftfirinterp|firdecim|firfracdecim|firfracinterp|firinterp|firsrc|firtdecim|holdinterp|iirdecim|iirinterp|iirwdfdecim|iirwdfinterp|linearinterp)\\b|(?<=dfilt.)(?:allpass|calattice|calatticepc|cascade|cascadeallpass|cascadewdfallpass|df1|df1sos|df1t|df1tsos|df2|df2sos|df2t|df2tsos|dfasymfir|dffir|dffirt|dfsymfir|latticeallpass|latticear|latticearma|latticemamax|latticemamin|parallel|scalar|wdfallpass)\\b|(?<=[^.]adaptfilt.)(?:adjlms|ap|apru|bap|blms|blmsfft|dlms|fdaf|filtxlms|ftf|gal|hrls|hswrls|lms|lsl|nlms|pbfdaf|pbufdaf|qrdlsl|qrdrls|rls|sd|se|ss|swftf|swrls|tdafdct|tdafdft|ufdaf)\\b|(?<=[^.]fdesign.)(?:arbmag|arbmagnphase|audioweighting|bandpass|bandstop|ciccomp|comb|decimator|differentiator|fracdelay|halfband|highpass|hilbert|interpolator|isinchp|isinclp|lowpass|notch|nyquist|octave|parameq|peak|polysrc|rsrc)\\b|(?<=[^.]filtstates\\.)cic\\b|(?<=[^.]dfilt.)(?:allpass|calattice|calatticepc|cascade|cascadeallpass|cascadewdfallpass|df1|df1sos|df1t|df1tsos|df2|df2sos|df2t|df2tsos|dfasymfir|dffir|dffirt|dfsymfir|latticeallpass|latticear|latticearma|latticemamax|latticemamin|parallel|scalar|wdfallpass)\\b|(?<=[^.]mfilt.)(?:cascade|cicdecim|cicinterp|farrowsrc|fftfirinterp|firdecim|firfracdecim|firfracinterp|firinterp|firsrc|firtdecim|holdinterp|iirdecim|iirinterp|iirwdfdecim|iirwdfinterp|linearinterp)\\b'
+        match: '(?<!\\.|\\w)(?:addCursor|addDivider|addWave|allpass2wdf|allpassbpc2bpc|allpasslp2bp|allpasslp2bpc|allpasslp2bs|allpasslp2bsc|allpasslp2hp|allpasslp2lp|allpasslp2mb|allpasslp2mbc|allpasslp2xc|allpasslp2xn|allpassrateup|allpassshift|allpassshiftc|audioDeviceWriter|autoscale|block|butter|ca2tf|cascade|cheby1|cheby2|cl2tf|coeffs|coeread|coewrite|convert|cost|cumsec|deleteCursor|deleteDisplayChannel|denormalize|design|designFracDelayFIR|designmethods|designMultirateFIR|designMultistageDecimator|designMultistageInterpolator|designoptions|designopts|dspunfold|ellip|equiripple|euclidfactors|farrow|fcfwrite|fdatool|fdesign|fftcoeffs|filter|filterbuilder|filterBuilder|filterDesigner|filtstates.cic|fircband|firceqrip|fireqint|firgr|firhalfband|firlp2hp|firlp2lp|firlpnorm|firls|firminphase|firnyquist|firpr2chfb|firtype|freqrespest|freqrespopts|freqsamp|freqz|fvtool|gain|generatehdl|generateScript|getCursorInfo|getCursorTags|getDisplayChannelInfo|getDisplayChannelTags|getMeasurementsData|getSpectralMaskStatus|getSpectrumData|grpdelay|help|ifir|iirbpc2bpc|iircomb|iirftransf|iirgrpdelay|iirlinphase|iirlp2bp|iirlp2bpc|iirlp2bs|iirlp2bsc|iirlp2hp|iirlp2lp|iirlp2mb|iirlp2mbc|iirlp2xc|iirlp2xn|iirlpnorm|iirlpnormc|iirls|iirnotch|iirpeak|iirpowcomp|iirrateup|iirshift|iirshiftc|impz|impzlength|info|int|isallpass|isfir|islinphase|ismaxphase|isminphase|isNewDataReady|isreal|issos|isstable|kaiserwin|lagrange|limitcycle|maxstep|measure|modifyCursor|modifyDisplayChannel|moveDisplayChannel|msepred|msesim|multistage|noisepsd|noisepsdopts|norm|normalize|normalizefreq|nstates|order|parallel|phasedelay|phasez|polyphase|powermeter|qreport|realizemdl|rebuffer_delay|reffilter|reorder|reset|scale|scalecheck|scaleopts|set2int|setCursorDataLabels|setspecs|sos|specifyall|SpectrumAnalyzerConfiguration|ss|step|stepz|tf|tf2ca|tf2cl|timescope|validstructures|wdf2allpass|window|zerophase|zpk|zpkbpc2bpc|zpkftransf|zpklp2bp|zpklp2bpc|zpklp2bs|zpklp2bsc|zpklp2hp|zpklp2lp|zpklp2mb|zpklp2mbc|zpklp2xc|zpklp2xn|zpkrateup|zpkshift|zpkshiftc|zplane)\\b|(?<=[^\\w.]adaptfilt.)(?:adjlms|ap|apru|bap|blms|blmsfft|dlms|fdaf|filtxlms|ftf|gal|hrls|hswrls|lms|lsl|nlms|pbfdaf|pbufdaf|qrdlsl|qrdrls|rls|sd|se|ss|swftf|swrls|tdafdct|tdafdft|ufdaf)\\b|(?<=[^\\w.]mfilt.)(?:cascade|cicdecim|cicinterp|farrowsrc|fftfirinterp|firdecim|firfracdecim|firfracinterp|firinterp|firsrc|firtdecim|holdinterp|iirdecim|iirinterp|iirwdfdecim|iirwdfinterp|linearinterp)\\b|(?<=[^\\w.]dfilt.)(?:allpass|calattice|calatticepc|cascade|cascadeallpass|cascadewdfallpass|df1|df1sos|df1t|df1tsos|df2|df2sos|df2t|df2tsos|dfasymfir|dffir|dffirt|dfsymfir|latticeallpass|latticear|latticearma|latticemamax|latticemamin|parallel|scalar|wdfallpass)\\b|(?<=[^.]adaptfilt.)(?:adjlms|ap|apru|bap|blms|blmsfft|dlms|fdaf|filtxlms|ftf|gal|hrls|hswrls|lms|lsl|nlms|pbfdaf|pbufdaf|qrdlsl|qrdrls|rls|sd|se|ss|swftf|swrls|tdafdct|tdafdft|ufdaf)\\b|(?<=[^.]fdesign.)(?:arbmag|arbmagnphase|audioweighting|bandpass|bandstop|ciccomp|comb|decimator|differentiator|fracdelay|halfband|highpass|hilbert|interpolator|isinchp|isinclp|lowpass|notch|nyquist|octave|parameq|peak|polysrc|rsrc)\\b|(?<=[^.]filtstates\\.)cic\\b|(?<=[^.]dfilt.)(?:allpass|calattice|calatticepc|cascade|cascadeallpass|cascadewdfallpass|df1|df1sos|df1t|df1tsos|df2|df2sos|df2t|df2tsos|dfasymfir|dffir|dffirt|dfsymfir|latticeallpass|latticear|latticearma|latticemamax|latticemamin|parallel|scalar|wdfallpass)\\b|(?<=[^.]mfilt.)(?:cascade|cicdecim|cicinterp|farrowsrc|fftfirinterp|firdecim|firfracdecim|firfracinterp|firinterp|firsrc|firtdecim|holdinterp|iirdecim|iirinterp|iirwdfdecim|iirwdfinterp|linearinterp)\\b'
       }
       {
         comment: 'MATLAB design toolbox classes'
@@ -3469,7 +3469,7 @@ repository:
       {
         comment: 'MATLAB image processing toolbox'
         name: 'support.function.toolbox.image-processing.matlab'
-        match: '(?<!\\.|\\w)(?:activecontour|adapthisteq|adaptthresh|add|addPix2PixHDLocalEnhancer|affine2d|affine3d|affineOutputView|analyze75info|analyze75read|anomalyRX|applycform|applylut|assignData|AssistedFreehand|axes2pix|beginDrawingFromPoint|bestblk|bfscore|bigimageshow|binblockread|binblockwrite|blelist|blendexposure|blockedImage|blockedImageDatastore|blockedNetwork|blockLocationSet|blockproc|bluetooth|bluetoothlist|boundarymask|bringToFront|brisque|brisqueModel|burstinterpolant|bwarea|bwareafilt|bwareaopen|bwboundaries|bwconncomp|bwconvhull|bwdist|bwdistgeodesic|bweuler|bwferet|bwhitmiss|bwlabel|bwlabeln|bwlookup|bwmorph|bwmorph3|bwpack|bwperim|bwpropfilt|bwselect|bwselect3|bwskel|bwtraceboundary|bwulterode|bwunpack|camresponse|centerCropWindow2d|centerCropWindow3d|characteristic|checkerboard|chromadapt|Circle|clear|clrdevice|col2im|colfilt|colorangle|colorChecker|colorcloud|colorize|commit|configureCallback|configureTerminator|conndef|connect|convmtx2|corr2|correctOOB|countEndmembersHFC|cpcorr|cpselect|cpstruct2pairs|createMask|cropData|Crosshair|Cuboid|cycleGANGenerator|dct2|dctmtx|deconvblind|deconvlucy|deconvreg|deconvwnr|decorrstretch|delete|deltaE|demosaic|denoiseImage|denoiseNGMeet|denoisingImageDatastore|denoisingNetwork|depthToSpace|DepthToSpace2DLayer|descriptor|devicereset|dice|dicomanon|dicomCollection|dicomContours|dicomdict|dicomdisp|dicominfo|dicomlookup|dicomread|dicomreadVolume|dicomuid|dicomwrite|disconnect|disp|displayChart|displayColorPatch|dlresize|dn2radiance|dn2reflectance|dnCNNLayers|dpxinfo|dpxread|draw|drawassisted|drawcircle|drawcrosshair|drawcuboid|drawellipse|drawfreehand|drawline|drawpoint|drawpolygon|drawpolyline|drawrectangle|echotcpip|echoudp|edge|edge3|edgetaper|Ellipse|empiricalLine|encoderDecoderNetwork|entropy|entropyfilt|enviinfo|enviwrite|esfrChart|estimateAbundanceLS|fan2para|fanbeam|fastInscene|fclose|fgetl|fgets|fibermetric|findbounds|fippi|fitbrisque|fitgeotrans|fitniqe|flatField|fliptform|flushinput|flushoutput|fopen|fprintf|fread|Freehand|freqz2|fsamp2|fscanf|fspecial|fspecial3|ftrans2|fwind1|fwind2|fwrite|gabor|geometricTransform2d|geometricTransform3d|get|geterror|getimage|getimagemodel|gpib|grabcut|gradientweight|gray2ind|graycomatrix|grayconnected|graycoprops|graydiffweight|graydist|grayslice|graythresh|hdrread|hdrwrite|histeq|hough|houghlines|houghpeaks|hypercube|hypermnf|hyperpca|iarr|iccfind|iccread|iccroot|iccwrite|icdevice|idct2|ifanbeam|illumgray|illumpca|illumwhite|im2col|im2int16|im2single|im2uint16|im2uint8|imabsdiff|imadd|imadjust|imadjustn|ImageAdapter|imageinfo|imagemodel|imapplymatrix|imattributes|imbilatfilt|imbinarize|imbothat|imboxfilt|imboxfilt3|imclearborder|imclose|imcolordiff|imcolormaptool|imcomplement|imcontour|imcontrast|imcrop|imcrop3|imdiffuseest|imdiffusefilt|imdilate|imdisplayrange|imdistline|imdivide|imerase|imerode|imextendedmax|imextendedmin|imfill|imfilter|imfindcircles|imflatfield|imfuse|imgaborfilt|imgaussfilt|imgaussfilt3|imgca|imgcf|imgetfile|imgradient|imgradient3|imgradientxy|imgradientxyz|imguidedfilter|imhandles|imhist|imhistmatch|imhistmatchn|imhmax|imhmin|imimposemin|imlincomb|imlocalbrighten|immagbox|immovie|immse|immultiply|imnlmfilt|imnoise|imopen|imoverlay|imoverview|imoverviewpanel|impixel|impixelinfo|impixelinfoval|impixelregion|impixelregionpanel|implay|improfile|imputfile|impyramid|imquantize|imreconstruct|imreducehaze|imref2d|imref3d|imregconfig|imregcorr|imregdemons|imregionalmax|imregionalmin|imregister|imregmtb|imregtform|imresize|imresize3|imrotate|imrotate3|imsave|imscrollpanel|imsegfmm|imseggeodesic|imsegkmeans|imsegkmeans3|imsharpen|imshow|imshowpair|imsplit|imsubtract|imtool|imtophat|imtranslate|imwarp|ind2gray|inpaintCoherent|inpaintExemplar|inROI|inspect|instrcallback|instrfind|instrfindall|instrhelp|instrhwinfo|instrid|instrnotify|instrreset|integralBoxFilter|integralBoxFilter3|integralImage|integralImage3|interfileinfo|interfileread|intlut|inverseProjection|invoke|iptaddcallback|iptcheckconn|iptcheckhandle|iptcheckmap|iptgetapi|iptGetPointerBehavior|iptgetpref|ipticondir|iptPointerManager|iptprefs|iptremovecallback|iptSetPointerBehavior|iptsetpref|iptwindowalign|iradon|isicc|isnitf|isrset|isvalid|iviconfigurationstore|jaccard|jitterColorHSV|jmsam|lab2double|lab2rgb|lab2uint16|lab2uint8|lab2xyz|label2idx|label2rgb|labelmatrix|labelvolshow|lazysnapping|length|lin2rgb|Line|load|localcontrast|locallapfilt|localtonemap|LocalWeightedMeanTransformation2D|logResiduals|makecform|makeConstrainToRectFcn|makehdr|makelut|makemid|makeresampler|maketform|mat2gray|MattesMutualInformation|maxhessiannorm|mean2|MeanSquares|measureChromaticAberration|measureColor|measureIlluminant|measureNoise|measureSharpness|medfilt2|medfilt3|memmap|mempeek|mempoke|memread|memunmap|memwrite|methods|midedit|midtest|modefilt|montage|multissim|multissim3|multithresh|ndvi|nfindr|niftiinfo|niftiread|niftiwrite|niqe|niqeModel|nitfinfo|nitfread|nlfilter|normxcorr2|ns3|ntsc2rgb|obj2mfile|obliqueslice|offsetstrel|OnePlusOneEvolutionary|openrset|ordfilt2|orthosliceViewer|otf2psf|otsuthresh|overlay|padarray|para2fan|patchGANDiscriminator|phantom|PiecewiseLinearTransformation2D|piqe|pix2pixHDGlobalGenerator|planar2raw|plotChromaticity|plotSFR|Point|poly2label|poly2mask|Polygon|Polyline|PolynomialTransformation2D|ppi|pretrainedEncoderNetwork|projective2d|propinfo|psf2otf|psnr|qtdecomp|qtgetblk|qtsetblk|query|radiance2Reflectance|radon|randomAffine2d|randomAffine3d|randomCropWindow3d|randomPatchExtractionDatastore|randomWindow2d|rangefilt|raw2planar|raw2rgb|rawinfo|rawread|readasync|readEcostressSig|readline|record|Rectangle|reduce|reducepoly|reduceSmile|regionfill|regionprops|regionprops3|RegularStepGradientDescent|remove|removeBands|resize2dLayer|resize3dLayer|resolvehost|rgb2lab|rgb2lightness|rgb2lin|rgb2ntsc|rgb2xyz|rgb2ycbcr|rgbwide2xyz|rgbwide2ycbcr|rigid2d|rigid3d|roicolor|roifilt2|roipoly|rrs|rsetwrite|sam|save|scanstr|selectBands|selectBlockLocations|selftest|serial|serialbreak|set|sharc|sharpencnmf|sid|sidsam|size|sliceViewer|smileMetric|spaceToDepth|SpaceToDepthLayer|spectralIndices|spectralMatch|spoll|ssim|std2|stdfilt|stopasync|strel|stretchlim|subscribe|subtractDarkPixel|superpixels|superpixels3|tcpclient|tcpip|tformarray|tformfwd|tforminv|tiffreadVolume|tmtool|tonemap|tonemapfarbman|trigger|truesize|udp|unitGenerator|unitPredict|unsubscribe|update|visa|visboundaries|viscircles|volshow|wait|warp|Warper|watershed|whitepoint|wiener2|writeline|xyz2double|xyz2lab|xyz2rgb|xyz2rgbwide|xyz2uint16|ycbcr2rgb|ycbcr2rgbwide)\\b|(?<=images.dicom.)(?:decodeUID|parseDICOMDIR)\\b'
+        match: '(?<!\\.|\\w)(?:activecontour|adapthisteq|adaptthresh|add|addPix2PixHDLocalEnhancer|affine2d|affine3d|affineOutputView|analyze75info|analyze75read|anomalyRX|applycform|applylut|assignData|AssistedFreehand|axes2pix|beginDrawingFromPoint|bestblk|bfscore|bigimageshow|binblockread|binblockwrite|blelist|blendexposure|blockedImage|blockedImageDatastore|blockedNetwork|blockLocationSet|blockproc|bluetooth|bluetoothlist|boundarymask|bringToFront|brisque|brisqueModel|burstinterpolant|bwarea|bwareafilt|bwareaopen|bwboundaries|bwconncomp|bwconvhull|bwdist|bwdistgeodesic|bweuler|bwferet|bwhitmiss|bwlabel|bwlabeln|bwlookup|bwmorph|bwmorph3|bwpack|bwperim|bwpropfilt|bwselect|bwselect3|bwskel|bwtraceboundary|bwulterode|bwunpack|camresponse|centerCropWindow2d|centerCropWindow3d|characteristic|checkerboard|chromadapt|Circle|clear|clrdevice|col2im|colfilt|colorangle|colorChecker|colorcloud|colorize|commit|configureCallback|configureTerminator|conndef|connect|convmtx2|corr2|correctOOB|countEndmembersHFC|cpcorr|cpselect|cpstruct2pairs|createMask|cropData|Crosshair|Cuboid|cycleGANGenerator|dct2|dctmtx|deconvblind|deconvlucy|deconvreg|deconvwnr|decorrstretch|delete|deltaE|demosaic|denoiseImage|denoiseNGMeet|denoisingImageDatastore|denoisingNetwork|depthToSpace|DepthToSpace2DLayer|descriptor|devicereset|dice|dicomanon|dicomCollection|dicomContours|dicomdict|dicomdisp|dicominfo|dicomlookup|dicomread|dicomreadVolume|dicomuid|dicomwrite|disconnect|disp|displayChart|displayColorPatch|dlresize|dn2radiance|dn2reflectance|dnCNNLayers|dpxinfo|dpxread|draw|drawassisted|drawcircle|drawcrosshair|drawcuboid|drawellipse|drawfreehand|drawline|drawpoint|drawpolygon|drawpolyline|drawrectangle|echotcpip|echoudp|edge|edge3|edgetaper|Ellipse|empiricalLine|encoderDecoderNetwork|entropy|entropyfilt|enviinfo|enviwrite|esfrChart|estimateAbundanceLS|fan2para|fanbeam|fastInscene|fclose|fgetl|fgets|fibermetric|findbounds|fippi|fitbrisque|fitgeotrans|fitniqe|flatField|fliptform|flushinput|flushoutput|fopen|fprintf|fread|Freehand|freqz2|fsamp2|fscanf|fspecial|fspecial3|ftrans2|fwind1|fwind2|fwrite|gabor|geometricTransform2d|geometricTransform3d|get|geterror|getimage|getimagemodel|gpib|grabcut|gradientweight|gray2ind|graycomatrix|grayconnected|graycoprops|graydiffweight|graydist|grayslice|graythresh|hdrread|hdrwrite|histeq|hough|houghlines|houghpeaks|hypercube|hypermnf|hyperpca|iarr|iccfind|iccread|iccroot|iccwrite|icdevice|idct2|ifanbeam|illumgray|illumpca|illumwhite|im2col|im2int16|im2single|im2uint16|im2uint8|imabsdiff|imadd|imadjust|imadjustn|ImageAdapter|imageinfo|imagemodel|imapplymatrix|imattributes|imbilatfilt|imbinarize|imbothat|imboxfilt|imboxfilt3|imclearborder|imclose|imcolordiff|imcolormaptool|imcomplement|imcontour|imcontrast|imcrop|imcrop3|imdiffuseest|imdiffusefilt|imdilate|imdisplayrange|imdistline|imdivide|imerase|imerode|imextendedmax|imextendedmin|imfill|imfilter|imfindcircles|imflatfield|imfuse|imgaborfilt|imgaussfilt|imgaussfilt3|imgca|imgcf|imgetfile|imgradient|imgradient3|imgradientxy|imgradientxyz|imguidedfilter|imhandles|imhist|imhistmatch|imhistmatchn|imhmax|imhmin|imimposemin|imlincomb|imlocalbrighten|immagbox|immovie|immse|immultiply|imnlmfilt|imnoise|imopen|imoverlay|imoverview|imoverviewpanel|impixel|impixelinfo|impixelinfoval|impixelregion|impixelregionpanel|implay|improfile|imputfile|impyramid|imquantize|imreconstruct|imreducehaze|imref2d|imref3d|imregconfig|imregcorr|imregdemons|imregionalmax|imregionalmin|imregister|imregmtb|imregtform|imresize|imresize3|imrotate|imrotate3|imsave|imscrollpanel|imsegfmm|imseggeodesic|imsegkmeans|imsegkmeans3|imsharpen|imshow|imshowpair|imsplit|imsubtract|imtool|imtophat|imtranslate|imwarp|ind2gray|inpaintCoherent|inpaintExemplar|inROI|inspect|instrcallback|instrfind|instrfindall|instrhelp|instrhwinfo|instrid|instrnotify|instrreset|integralBoxFilter|integralBoxFilter3|integralImage|integralImage3|interfileinfo|interfileread|intlut|inverseProjection|invoke|iptaddcallback|iptcheckconn|iptcheckhandle|iptcheckmap|iptgetapi|iptGetPointerBehavior|iptgetpref|ipticondir|iptPointerManager|iptprefs|iptremovecallback|iptSetPointerBehavior|iptsetpref|iptwindowalign|iradon|isicc|isnitf|isrset|isvalid|iviconfigurationstore|jaccard|jitterColorHSV|jmsam|lab2double|lab2rgb|lab2uint16|lab2uint8|lab2xyz|label2idx|label2rgb|labelmatrix|labelvolshow|lazysnapping|length|lin2rgb|Line|load|localcontrast|locallapfilt|localtonemap|LocalWeightedMeanTransformation2D|logResiduals|makecform|makeConstrainToRectFcn|makehdr|makelut|makemid|makeresampler|maketform|mat2gray|MattesMutualInformation|maxhessiannorm|mean2|MeanSquares|measureChromaticAberration|measureColor|measureIlluminant|measureNoise|measureSharpness|medfilt2|medfilt3|memmap|mempeek|mempoke|memread|memunmap|memwrite|methods|midedit|midtest|modefilt|montage|multissim|multissim3|multithresh|ndvi|nfindr|niftiinfo|niftiread|niftiwrite|niqe|niqeModel|nitfinfo|nitfread|nlfilter|normxcorr2|ns3|ntsc2rgb|obj2mfile|obliqueslice|offsetstrel|OnePlusOneEvolutionary|openrset|ordfilt2|orthosliceViewer|otf2psf|otsuthresh|overlay|padarray|para2fan|patchGANDiscriminator|phantom|PiecewiseLinearTransformation2D|piqe|pix2pixHDGlobalGenerator|planar2raw|plotChromaticity|plotSFR|Point|poly2label|poly2mask|Polygon|Polyline|PolynomialTransformation2D|ppi|pretrainedEncoderNetwork|projective2d|propinfo|psf2otf|psnr|qtdecomp|qtgetblk|qtsetblk|query|radiance2Reflectance|radon|randomAffine2d|randomAffine3d|randomCropWindow3d|randomPatchExtractionDatastore|randomWindow2d|rangefilt|raw2planar|raw2rgb|rawinfo|rawread|readasync|readEcostressSig|readline|record|Rectangle|reduce|reducepoly|reduceSmile|regionfill|regionprops|regionprops3|RegularStepGradientDescent|remove|removeBands|resize2dLayer|resize3dLayer|resolvehost|rgb2lab|rgb2lightness|rgb2lin|rgb2ntsc|rgb2xyz|rgb2ycbcr|rgbwide2xyz|rgbwide2ycbcr|rigid2d|rigid3d|roicolor|roifilt2|roipoly|rrs|rsetwrite|sam|save|scanstr|selectBands|selectBlockLocations|selftest|serial|serialbreak|set|sharc|sharpencnmf|sid|sidsam|size|sliceViewer|smileMetric|spaceToDepth|SpaceToDepthLayer|spectralIndices|spectralMatch|spoll|ssim|std2|stdfilt|stopasync|strel|stretchlim|subscribe|subtractDarkPixel|superpixels|superpixels3|tcpclient|tcpip|tformarray|tformfwd|tforminv|tiffreadVolume|tmtool|tonemap|tonemapfarbman|trigger|truesize|udp|unitGenerator|unitPredict|unsubscribe|update|visa|visboundaries|viscircles|volshow|wait|warp|Warper|watershed|whitepoint|wiener2|writeline|xyz2double|xyz2lab|xyz2rgb|xyz2rgbwide|xyz2uint16|ycbcr2rgb|ycbcr2rgbwide)\\b|(?<=[^\\w.]images.dicom.)(?:decodeUID|parseDICOMDIR)\\b'
       }
       {
         comment: 'MATLAB image processing toolbox'
@@ -3479,7 +3479,7 @@ repository:
       {
         comment: 'MATLAB image processing toolbox namespaces'
         name: 'support.constant.toolbox.image-processing.matlab'
-        match: '(?<!\\.)images(?=\\.)|(?<=[^.]images\\.)(?:blocked|dicom)(?=\\.)'
+        match: '(?<!\\w|\\.)images(?=\\.)|(?<=[^.]images\\.)(?:blocked|dicom)(?=\\.)'
       }
       {
         comment: 'MATLAB HDF4 multifile scientific data set interface'
@@ -3514,7 +3514,7 @@ repository:
       {
         comment: 'MATLAB model-based calibration toolbox'
         name: 'support.function.toolbox.model-based-calibration.matlab'
-        match: '(?<!\\.|\\w)(?:ActiveInputs|Add|AddConstraint|AddDesign|AddFilter|AddTestFilter|AddVariable|AliasMatrix|AlternativeModelStatistics|AlternativeResponses|Append|AttachData|Augment|BeginEdit|BestDesign|BoundaryModel|BoxCoxSSE|Centers|cgoptimoptions|cgoptimstore|ChooseAsBest|CommitEdit|ConstrainedGenerate|CopyData|Correlation|Covariance|CreateAlgorithm|CreateAlternativeModels|CreateBoundary|CreateCandidateSet|CreateConstraint|CreateData|CreateDesign|CreateModel|CreateProject|CreateResponse|CreateResponseFeature|CreateTestplan|Data|DataFileTypes|DefaultModels|DefineNumberOfRecordsPerTest|DefineTestGroups|designconstraint|DetachData|DiagnosticStatistics|Discrepancy|DoubleInputData|DoubleResponseData|Evaluate|Export|ExportToMBCDataStructure|ExportToTable|Filename|Filters|FindDesign|Fit|fit|FitAlgorithm|Fitted|FixPoints|Generate|GetAllTerms|getAlternativeNames|getAlternativeTypes|GetDesignMatrix|GetIncludedTerms|getLocalBoundary|GetTermLabel|GetTermStatus|Global|ImportFromFile|ImportFromMBCDataStructure|ImportFromTable|InputData|Inputs|InputSetupDialog|InputSignalNames|InputsPerLevel|IsAlternative|IsBeingEdited|IsEditable|Jacobian|Level|Levels|Load|LoadProject|Local|LocalBoundaries|LocalResponses|MakeHierarchicalResponse|MatchInputs|Maximin|mbcPointByPointModel|Merge|Minimax|Model|ModelForTest|modelinput|Models|ModelSetup|Modified|ModifyFilter|ModifyTestFilter|ModifyVariable|MultipleVIF|Name|Names|New|NumberOfInputs|NumberOfParameters|NumberOfRecords|NumberOfTests|OperatingPoints|OptimalCriteria|OutlierIndices|OutlierIndicesForTest|OutputData|Owner|Parameters|ParameterStatistics|PartialVIF|PEV|PEVForTest|PredictedValue|PredictedValueForTest|Properties|RecordsPerTest|Remove|RemoveData|RemoveDesign|RemoveFilter|RemoveOutliers|RemoveOutliersForTest|RemovePoints|RemoveTestFilter|RemoveVariable|Response|Responses|ResponseSignalName|RestoreData|RestoreDataForTest|RollbackEdit|Save|SaveAs|Scatter2D|SetTermStatus|SetupDialog|SignalNames|SignalUnits|SingleVIF|SizeOfParameterSet|StatisticsDialog|Status|StepwiseRegression|StepwiseSelection|StepwiseStatus|SummaryStatistics|SummaryStatisticsForTest|TestFilters|TestPlans|Type|Units|Update|UpdateDesign|UpdateResponse|UpdateResponseFeatures|UserVariables|ValidationRMSE|Value|Values|Widths|XData|XDataNames|xregstatsmodel|YData)\\b|(?<=mbcboundary\\.)(?:AbstractBoundary|Boolean|Model|PointByPoint|Tree|TwoStage|TwoStageTree)\\b|(?<=mbcdoe.)design|mbcmodel.(?:data|project)\\b'
+        match: '(?<!\\.|\\w)(?:ActiveInputs|Add|AddConstraint|AddDesign|AddFilter|AddTestFilter|AddVariable|AliasMatrix|AlternativeModelStatistics|AlternativeResponses|Append|AttachData|Augment|BeginEdit|BestDesign|BoundaryModel|BoxCoxSSE|Centers|cgoptimoptions|cgoptimstore|ChooseAsBest|CommitEdit|ConstrainedGenerate|CopyData|Correlation|Covariance|CreateAlgorithm|CreateAlternativeModels|CreateBoundary|CreateCandidateSet|CreateConstraint|CreateData|CreateDesign|CreateModel|CreateProject|CreateResponse|CreateResponseFeature|CreateTestplan|Data|DataFileTypes|DefaultModels|DefineNumberOfRecordsPerTest|DefineTestGroups|designconstraint|DetachData|DiagnosticStatistics|Discrepancy|DoubleInputData|DoubleResponseData|Evaluate|Export|ExportToMBCDataStructure|ExportToTable|Filename|Filters|FindDesign|Fit|fit|FitAlgorithm|Fitted|FixPoints|Generate|GetAllTerms|getAlternativeNames|getAlternativeTypes|GetDesignMatrix|GetIncludedTerms|getLocalBoundary|GetTermLabel|GetTermStatus|Global|ImportFromFile|ImportFromMBCDataStructure|ImportFromTable|InputData|Inputs|InputSetupDialog|InputSignalNames|InputsPerLevel|IsAlternative|IsBeingEdited|IsEditable|Jacobian|Level|Levels|Load|LoadProject|Local|LocalBoundaries|LocalResponses|MakeHierarchicalResponse|MatchInputs|Maximin|mbcPointByPointModel|Merge|Minimax|Model|ModelForTest|modelinput|Models|ModelSetup|Modified|ModifyFilter|ModifyTestFilter|ModifyVariable|MultipleVIF|Name|Names|New|NumberOfInputs|NumberOfParameters|NumberOfRecords|NumberOfTests|OperatingPoints|OptimalCriteria|OutlierIndices|OutlierIndicesForTest|OutputData|Owner|Parameters|ParameterStatistics|PartialVIF|PEV|PEVForTest|PredictedValue|PredictedValueForTest|Properties|RecordsPerTest|Remove|RemoveData|RemoveDesign|RemoveFilter|RemoveOutliers|RemoveOutliersForTest|RemovePoints|RemoveTestFilter|RemoveVariable|Response|Responses|ResponseSignalName|RestoreData|RestoreDataForTest|RollbackEdit|Save|SaveAs|Scatter2D|SetTermStatus|SetupDialog|SignalNames|SignalUnits|SingleVIF|SizeOfParameterSet|StatisticsDialog|Status|StepwiseRegression|StepwiseSelection|StepwiseStatus|SummaryStatistics|SummaryStatisticsForTest|TestFilters|TestPlans|Type|Units|Update|UpdateDesign|UpdateResponse|UpdateResponseFeatures|UserVariables|ValidationRMSE|Value|Values|Widths|XData|XDataNames|xregstatsmodel|YData)\\b|(?<=[^\\w.]mbcboundary\\.)(?:AbstractBoundary|Boolean|Model|PointByPoint|Tree|TwoStage|TwoStageTree)\\b|(?<=[^\\w.]mbcdoe.)design|mbcmodel.(?:data|project)\\b'
       }
       {
         comment: 'MATLAB model-based calibration toolbox namespaces'
@@ -3554,7 +3554,7 @@ repository:
       {
         comment: 'MATLAB powertrain blockset toolbox classes'
         name: 'support.class.toolbox.powertrain.matlab'
-        match: '(?<=autoblks\\.pwr\\.)PlantInfo\\b|(?<!\\.)Battery(?=\\.)|(?<=Battery\\.)(?:MetaData|Parameters|Pulse|PulseSequence)\\b'
+        match: '(?<=[^\\w.]autoblks\\.pwr\\.)PlantInfo\\b|(?<!\\w|\\.)Battery(?=\\.)|(?<=[^\\w.]Battery\\.)(?:MetaData|Parameters|Pulse|PulseSequence)\\b'
       }
       {
         comment: 'MATLAB powertrain blockset toolbox namespaces'
@@ -3734,7 +3734,7 @@ repository:
     ]
   overload_definition:
     comment: 'Overload entities (operators or type conversion)'
-    match: '(?<!\\.)[a-zA-Z][a-zA-Z0-9_]*(?=\\s*\\()'
+    match: '(?<!\\w|\\.)[a-zA-Z][a-zA-Z0-9_]*(?=\\s*\\()'
     patterns: [
       {
         comment: 'Arithmetic operator overloading'
@@ -3777,7 +3777,7 @@ repository:
       {
         comment: 'matlab.System'
         name: 'support.function.builtin.matlab'
-        match: '(?<!\\.)\\b(allowModelReferenceDiscreteSampleTimeInheritanceImpl|allowModelReferenceDiscreteSampleTimeInheritanceImpl|createSampleTime|getCurrentTime|getDiscreteStateImpl|getDiscreteStateSpecificationImpl|getGlobalNamesImpl|getHeaderImpl|getIconImpl|getImpulseResponseLengthImpl|getInputDimensionConstraintImpl|getInputNamesImpl|getInterfaceImpl|getNumInputsImpl|getNumOutputsImpl|getOutputDataTypeImpl|getOutputDimensionConstraintImpl|getOutputNamesImpl|getOutputSizeImpl|getSampleTime|getSampleTimeImpl|getSimulateUsingImpl|getSimulateUsingImpl|getSimulinkFunctionNamesImpl|infoImpl|isDiscreteStateSpecificationMutableImpl|isDoneImpl|isInactivePropertyImpl|isInputComplexityMutableImpl|isInputDataTypeMutableImpl|isInputSizeMutableImpl|isOutputComplexImpl|isOutputFixedSizeImpl|isTunablePropertyDataTypeMutableImpl|loadObjectImpl|processInputSpecificationChangeImpl|processTunedPropertiesImpl|propagatedInputComplexity|propagatedInputDataType|propagatedInputFixedSize|propagatedInputSize|releaseImpl|resetImpl|saveObjectImpl|setProperties|setupImpl|showFiSettingsImpl|showSimulateUsingImpl|stepImpl|supportsMultipleInstanceImpl|supportsMultipleInstanceImpl|validateInputsImpl|validatePropertiesImpl)\\b'
+        match: '(?<!\\w|\\.)(allowModelReferenceDiscreteSampleTimeInheritanceImpl|allowModelReferenceDiscreteSampleTimeInheritanceImpl|createSampleTime|getCurrentTime|getDiscreteStateImpl|getDiscreteStateSpecificationImpl|getGlobalNamesImpl|getHeaderImpl|getIconImpl|getImpulseResponseLengthImpl|getInputDimensionConstraintImpl|getInputNamesImpl|getInterfaceImpl|getNumInputsImpl|getNumOutputsImpl|getOutputDataTypeImpl|getOutputDimensionConstraintImpl|getOutputNamesImpl|getOutputSizeImpl|getSampleTime|getSampleTimeImpl|getSimulateUsingImpl|getSimulateUsingImpl|getSimulinkFunctionNamesImpl|infoImpl|isDiscreteStateSpecificationMutableImpl|isDoneImpl|isInactivePropertyImpl|isInputComplexityMutableImpl|isInputDataTypeMutableImpl|isInputSizeMutableImpl|isOutputComplexImpl|isOutputFixedSizeImpl|isTunablePropertyDataTypeMutableImpl|loadObjectImpl|processInputSpecificationChangeImpl|processTunedPropertiesImpl|propagatedInputComplexity|propagatedInputDataType|propagatedInputFixedSize|propagatedInputSize|releaseImpl|resetImpl|saveObjectImpl|setProperties|setupImpl|showFiSettingsImpl|showSimulateUsingImpl|stepImpl|supportsMultipleInstanceImpl|supportsMultipleInstanceImpl|validateInputsImpl|validatePropertiesImpl)\\b'
       }
       {
         comment: 'matlab.diagram.ClassViewer'
@@ -4360,6 +4360,21 @@ repository:
     ]
   package_external_functions:
     patterns: [
+      {
+        comment: 'matlab.io.hdf4.sd'
+        name: 'support.function.external.matlab'
+        match: '(?<=[^\\w]sd\\.)(?:attrInfo|close|create|dimInfo|endAccess|fileInfo|findAttr|getCal|getChunkInfo|getCompInfo|getDataStrs|getDimID|getDimScale|getDimStrs|getFilename|getFillValue|getFillValue|getInfo|getRange|idToRef|idType|isCoordVar|isRecord|nameToIndex|nameToIndices|readAttr|readChunk|readData|refToIndex|select|setAttr|setCal|setChunk|setCompress|setDataStrs|setDimName|setDimScale|setDimStrs|setExternalFile|setFillMode|setFillValue|setNBitDataSet|setRange|start|writeChunk|writeData)\\b'
+      }
+      {
+        comment: 'matlab.io.hdfeos.gd'
+        name: 'support.function.external.matlab'
+        match: '(?<=[^\\w]gd\\.)(?:attrInfo|close|create|dimInfo|endAccess|fileInfo|findAttr|getCal|getChunkInfo|getCompInfo|getDataStrs|getDimID|getDimScale|getDimStrs|getFilename|getFillValue|getFillValue|getInfo|getRange|idToRef|idType|isCoordVar|isRecord|nameToIndex|nameToIndices|readAttr|readChunk|readData|refToIndex|select|setAttr|setCal|setChunk|setCompress|setDataStrs|setDimName|setDimScale|setDimStrs|setExternalFile|setFillMode|setFillValue|setNBitDataSet|setRange|start|writeChunk|writeData)\\b'
+      }
+      {
+        comment: 'matlab.io.hdfeos.sw'
+        name: 'support.function.external.matlab'
+        match: '(?<=[^\\w]sw\\.)(?:attach|close|compInfo|create|defBoxRegion|defComp|defDataField|defDim|defDimMap|defGeoField|defTimePeriod|defVrtRegion|detach|dimInfo|extractPeriod|extractRegion|fieldInfo|geoMapInfo|getFillValue|idxMapInfo|inqAttrs|inqDataFields|inqDims|inqGeoFields|inqIdxMaps|inqMaps|inqSwath|mapInfo|nEntries|open|periodInfo|readAttr|readField|regionInfo|setFillValue|writeAttr|writeField)\\b'
+      }
       {
         comment: 'matlab.mex.MexHost'
         name: 'support.function.external.matlab'
@@ -4758,7 +4773,7 @@ repository:
       {
         comment: 'matlab.System'
         name: 'support.function.builtin.matlab'
-        match: '(?<!\\.)\\b(allowModelReferenceDiscreteSampleTimeInheritanceImpl|allowModelReferenceDiscreteSampleTimeInheritanceImpl|createSampleTime|getCurrentTime|getDiscreteStateImpl|getDiscreteStateSpecificationImpl|getGlobalNamesImpl|getHeaderImpl|getIconImpl|getImpulseResponseLengthImpl|getInputDimensionConstraintImpl|getInputNamesImpl|getInterfaceImpl|getNumInputsImpl|getNumOutputsImpl|getOutputDataTypeImpl|getOutputDimensionConstraintImpl|getOutputNamesImpl|getOutputSizeImpl|getSampleTime|getSampleTimeImpl|getSimulateUsingImpl|getSimulateUsingImpl|getSimulinkFunctionNamesImpl|infoImpl|isDiscreteStateSpecificationMutableImpl|isDoneImpl|isInactivePropertyImpl|isInputComplexityMutableImpl|isInputDataTypeMutableImpl|isInputSizeMutableImpl|isOutputComplexImpl|isOutputFixedSizeImpl|isTunablePropertyDataTypeMutableImpl|loadObjectImpl|processInputSpecificationChangeImpl|processTunedPropertiesImpl|propagatedInputComplexity|propagatedInputDataType|propagatedInputFixedSize|propagatedInputSize|releaseImpl|resetImpl|saveObjectImpl|setProperties|setupImpl|showFiSettingsImpl|showSimulateUsingImpl|stepImpl|supportsMultipleInstanceImpl|supportsMultipleInstanceImpl|validateInputsImpl|validatePropertiesImpl)\\b'
+        match: '(?<!\\w|\\.)(allowModelReferenceDiscreteSampleTimeInheritanceImpl|allowModelReferenceDiscreteSampleTimeInheritanceImpl|createSampleTime|getCurrentTime|getDiscreteStateImpl|getDiscreteStateSpecificationImpl|getGlobalNamesImpl|getHeaderImpl|getIconImpl|getImpulseResponseLengthImpl|getInputDimensionConstraintImpl|getInputNamesImpl|getInterfaceImpl|getNumInputsImpl|getNumOutputsImpl|getOutputDataTypeImpl|getOutputDimensionConstraintImpl|getOutputNamesImpl|getOutputSizeImpl|getSampleTime|getSampleTimeImpl|getSimulateUsingImpl|getSimulateUsingImpl|getSimulinkFunctionNamesImpl|infoImpl|isDiscreteStateSpecificationMutableImpl|isDoneImpl|isInactivePropertyImpl|isInputComplexityMutableImpl|isInputDataTypeMutableImpl|isInputSizeMutableImpl|isOutputComplexImpl|isOutputFixedSizeImpl|isTunablePropertyDataTypeMutableImpl|loadObjectImpl|processInputSpecificationChangeImpl|processTunedPropertiesImpl|propagatedInputComplexity|propagatedInputDataType|propagatedInputFixedSize|propagatedInputSize|releaseImpl|resetImpl|saveObjectImpl|setProperties|setupImpl|showFiSettingsImpl|showSimulateUsingImpl|stepImpl|supportsMultipleInstanceImpl|supportsMultipleInstanceImpl|validateInputsImpl|validatePropertiesImpl)\\b'
       }
       {
         comment: 'matlab.diagram.ClassViewer'
@@ -5754,4 +5769,4 @@ repository:
   argument_validation:
     comment: 'Argument validation functions'
     name: 'keyword.operator.word.matlab'
-    match: '(?<!\\.)\\b(mustBeA|mustBeFile|mustBeFinite|mustBeFloat|mustBeFolder|mustBeGreaterThan|mustBeGreaterThanOrEqual|mustBeInRange|mustBeInteger|mustBeLessThan|mustBeLessThanOrEqual|mustBeMember|mustBeNegative|mustBeNonNan|mustBeNonempty|mustBeNonmissing|mustBeNonnegative|mustBeNonpositive|mustBeNonsparse|mustBeNonzero|mustBeNonzeroLengthText|mustBeNumeric|mustBeNumericOrLogical|mustBePositive|mustBeReal|mustBeScalarOrEmpty|mustBeText|mustBeTextScalar|mustBeUnderlyingType|mustBeValidVariableName|mustBeVector)(?=\\s*[(,}])'
\ No newline at end of file
+    match: '(?<!\\w|\\.)(mustBeA|mustBeFile|mustBeFinite|mustBeFloat|mustBeFolder|mustBeGreaterThan|mustBeGreaterThanOrEqual|mustBeInRange|mustBeInteger|mustBeLessThan|mustBeLessThanOrEqual|mustBeMember|mustBeNegative|mustBeNonNan|mustBeNonempty|mustBeNonmissing|mustBeNonnegative|mustBeNonpositive|mustBeNonsparse|mustBeNonzero|mustBeNonzeroLengthText|mustBeNumeric|mustBeNumericOrLogical|mustBePositive|mustBeReal|mustBeScalarOrEmpty|mustBeText|mustBeTextScalar|mustBeUnderlyingType|mustBeValidVariableName|mustBeVector)(?=\\s*[(,}])'

From 23af71ee8abf04c15a5567d4580175c5000b9759 Mon Sep 17 00:00:00 2001
From: "SNDST00M: M.U.N.I.N" <82655227+4086606@users.noreply.github.com>
Date: Tue, 27 Jul 2021 09:15:46 +0100
Subject: [PATCH 2/9] Fix import module highlighting

---
 grammars/m.cson | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/grammars/m.cson b/grammars/m.cson
index c20a26d..e62c365 100644
--- a/grammars/m.cson
+++ b/grammars/m.cson
@@ -1089,22 +1089,26 @@ repository:
   import:
     comment: 'Import statement'
     name: 'meta.import.matlab'
-    contentName: 'entity.name.namespace.matlab'
-    begin: '\\b(import)\\b[^\\S\\n]+(?=\\w)'
-    beginCaptures:
+    match: '\\b(import)\\b[^\\S\\n]+([a-zA-Z0-9.]*)(?=;|%|$)'
+    captures:
       '1':
         name: 'keyword.other.import.matlab'
-    end: '(?=;|\\n|%)'
-    patterns: [
-      {
-        name: 'punctuation.separator.matlab'
-        match: '\\.'
-      }
-      {
-        name: 'variable.language.wildcard.matlab'
-        match: '\\*'
-      }
-    ]
+      '2':
+        name: 'entity.name.namespace.matlab'
+        patterns: [
+          {
+            name: 'entity.name.module.matlab'
+            match: '\\w+'
+          }
+          {
+            name: 'punctuation.separator.matlab'
+            match: '\\.'
+          }
+          {
+            name: 'variable.language.wildcard.matlab'
+            match: '\\*'
+          }
+        ]
   indexing_by_expression:
     comment: 'Index array with expression evaluated to variable name or number'
     contentName: 'meta.parens.matlab'

From bcca568482f8f1139e5eb1bd884ed7f0c93bfb4b Mon Sep 17 00:00:00 2001
From: "SNDST00M: M.U.N.I.N" <82655227+4086606@users.noreply.github.com>
Date: Tue, 27 Jul 2021 09:16:53 +0100
Subject: [PATCH 3/9] Make keyword control end tokens consistent

---
 grammars/m.cson | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/grammars/m.cson b/grammars/m.cson
index e62c365..37e47dc 100644
--- a/grammars/m.cson
+++ b/grammars/m.cson
@@ -626,7 +626,7 @@ repository:
                 ]
             endCaptures:
               '1':
-                name: 'keyword.control.properties.end.matlab'
+                name: 'keyword.control.end.properties.matlab'
             patterns: [
               {
                 include: '#validators'
@@ -676,7 +676,7 @@ repository:
                 ]
             endCaptures:
               '1':
-                name: 'keyword.control.methods.end.matlab'
+                name: 'keyword.control.end.methods.matlab'
             patterns: [
               {
                 include: '$self'
@@ -723,7 +723,7 @@ repository:
                 ]
             endCaptures:
               '1':
-                name: 'keyword.control.events.end.matlab'
+                name: 'keyword.control.end.events.matlab'
             patterns: [
               {
                 name: 'meta.assignment.definition.event.matlab'
@@ -752,7 +752,7 @@ repository:
                 name: 'keyword.control.enum.matlab'
             endCaptures:
               '1':
-                name: 'keyword.control.enum.end.matlab'
+                name: 'keyword.control.end.enum.matlab'
             patterns: [
               {
                 name: 'meta.assignment.definition.enummember.matlab'
@@ -1025,7 +1025,7 @@ repository:
                 ]
             endCaptures:
               '1':
-                name: 'keyword.control.arguments.end.matlab'
+                name: 'keyword.control.end.arguments.matlab'
             patterns: [
               {
                 comment: 'Class property name-value arguments'

From e51596a6c615267d5106557858b93a43f2f1609a Mon Sep 17 00:00:00 2001
From: "SNDST00M: M.U.N.I.N" <82655227+4086606@users.noreply.github.com>
Date: Tue, 27 Jul 2021 15:36:50 +0100
Subject: [PATCH 4/9] Fix readwrite injection selector

---
 grammars/m.cson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grammars/m.cson b/grammars/m.cson
index 37e47dc..48d2171 100644
--- a/grammars/m.cson
+++ b/grammars/m.cson
@@ -78,7 +78,7 @@ injections: {
         include: '#package_word_operators'
       }
     ]
-  'source.matlab -(comment, function-call, support, string, interpolation, comment *, function-call *, support *, string *, interpolation *)':
+  'source.matlab -(comment, support, string, interpolation, entity.name.function, entity.name.namespace, comment *, support *, string *, interpolation *, entity.name.function *, entity.name.namespace *)':
     patterns: [
       {
         include: '#readwrite_operations'

From 3113a8177ae5ffd945ddd630bc9a8f2252b9c5a0 Mon Sep 17 00:00:00 2001
From: "SNDST00M: M.U.N.I.N" <82655227+4086606@users.noreply.github.com>
Date: Thu, 29 Jul 2021 11:58:13 +0100
Subject: [PATCH 5/9] Prevent variables in command duality

---
 grammars/m.cson | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grammars/m.cson b/grammars/m.cson
index 48d2171..3afabd9 100644
--- a/grammars/m.cson
+++ b/grammars/m.cson
@@ -5765,11 +5765,11 @@ repository:
   property:
     comment: 'Class property or enumeration member access'
     name: 'variable.other.property.matlab'
-    match: '(?<=\\.)[a-zA-Z][a-zA-Z0-9_]*(?![a-zA-Z0-9_]|(?:\\(|\\{|\\.\\())'
+    match: '(?<=\\.)[a-zA-Z][a-zA-Z0-9_]*(?![a-zA-Z0-9_]|(?:["\']|\\(|\\{|\\.\\())'
   readwrite_variable:
     comment: 'Top-level workspace variable highlighting'
     name: 'variable.other.readwrite.matlab'
-    match: '(?<![a-zA-Z0-9_]|\\.)[a-zA-Z][a-zA-Z0-9_]*(?![a-zA-Z0-9_]|\\(|\\{|\\.\\()'
+    match: '(?<![a-zA-Z0-9_]|\\.)[a-zA-Z][a-zA-Z0-9_]*(?![a-zA-Z0-9_]|(?:["\']|\\(|\\{|\\.\\())'
   argument_validation:
     comment: 'Argument validation functions'
     name: 'keyword.operator.word.matlab'

From b523f65cca9794117c29e2d0aa3a11c900f0f181 Mon Sep 17 00:00:00 2001
From: "SNDST00M: M.U.N.I.N" <82655227+4086606@users.noreply.github.com>
Date: Thu, 29 Jul 2021 15:27:21 +0100
Subject: [PATCH 6/9] Respect entity and shell highlighting

---
 grammars/m.cson | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/grammars/m.cson b/grammars/m.cson
index 3afabd9..80a40ea 100644
--- a/grammars/m.cson
+++ b/grammars/m.cson
@@ -18,7 +18,7 @@ patterns: [
   }
 ]
 injections: {
-  'source.matlab -(comment, string, interpolation, comment *, string *, interpolation *)':
+  'source.matlab -(comment, string, interpolation, source.shell, comment *, string *, interpolation *, source.shell *)':
     patterns: [
       {
         include: '#keywords'
@@ -54,7 +54,7 @@ injections: {
         include: '#overload_definition'
       }
     ]
-  'source.matlab -(comment, string, interpolation, assignment, comment *, string *, interpolation *, assignment *)':
+  'source.matlab -(comment, string, interpolation, assignment, source.shell, comment *, string *, interpolation *, assignment *, source.shell *)':
     patterns: [
       {
         include: '#package_builtin_functions'
@@ -78,7 +78,7 @@ injections: {
         include: '#package_word_operators'
       }
     ]
-  'source.matlab -(comment, support, string, interpolation, entity.name.function, entity.name.namespace, comment *, support *, string *, interpolation *, entity.name.function *, entity.name.namespace *)':
+  'source.matlab -(comment, support, string, interpolation, entity.name, source.shell, comment *, support *, string *, interpolation *, entity.name *, source.shell *)':
     patterns: [
       {
         include: '#readwrite_operations'

From 952b73349ff8c37cf694bfa8f63b74f6bbe37dea Mon Sep 17 00:00:00 2001
From: "SNDST00M: M.U.N.I.N" <82655227+4086606@users.noreply.github.com>
Date: Thu, 29 Jul 2021 19:34:20 +0100
Subject: [PATCH 7/9] Fix readwrite variable patterns

---
 grammars/m.cson | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/grammars/m.cson b/grammars/m.cson
index 80a40ea..6625f1f 100644
--- a/grammars/m.cson
+++ b/grammars/m.cson
@@ -4,7 +4,7 @@ fileTypes: [
 ]
 keyEquivalent: '^~M'
 scopeName: 'source.matlab'
-uuid: '0C463768-44FD-4D00-880B-E7F5553D6880'
+uuid: '00727D6C-EF5E-42F1-A155-5EB15931A4C6'
 patterns: [
   {
     comment: 'Rules are split into groups so #command_dual can be excluded in things like (), {}, []'
@@ -5754,22 +5754,32 @@ repository:
       }
     ]
   readwrite_operations:
-    patterns: [
-      {
-        include: '#property'
-      }
-      {
-        include: '#readwrite_variable'
-      }
-    ]
+    match: '(?<![a-zA-Z0-9_]|\\.)[a-zA-Z][a-zA-Z0-9_]*(?:\\.[a-zA-Z][a-zA-Z0-9_]*)*(?![a-zA-Z0-9_]|(?:\\(|\\{|\\.\\())'
+    captures:
+      '0':
+        patterns: [
+          {
+            include: '#property'
+          }
+          {
+            include: '#readwrite_variable'
+          }
+          {
+            include: '#property_access'
+          }
+        ]
   property:
     comment: 'Class property or enumeration member access'
     name: 'variable.other.property.matlab'
-    match: '(?<=\\.)[a-zA-Z][a-zA-Z0-9_]*(?![a-zA-Z0-9_]|(?:["\']|\\(|\\{|\\.\\())'
+    match: '(?<=\\.)[a-zA-Z][a-zA-Z0-9_]*(?![a-zA-Z0-9_]|(?:\\(|\\{|\\.\\())'
   readwrite_variable:
     comment: 'Top-level workspace variable highlighting'
     name: 'variable.other.readwrite.matlab'
-    match: '(?<![a-zA-Z0-9_]|\\.)[a-zA-Z][a-zA-Z0-9_]*(?![a-zA-Z0-9_]|(?:["\']|\\(|\\{|\\.\\())'
+    match: '(?<![a-zA-Z0-9_]|\\.)[a-zA-Z][a-zA-Z0-9_]*(?![a-zA-Z0-9_]|(?:\\(|\\{|\\.\\())'
+  property_access:
+    comment: 'Struct/class property dot index'
+    name: 'punctuation.accessor.dot.matlab'
+    match: '\\.'
   argument_validation:
     comment: 'Argument validation functions'
     name: 'keyword.operator.word.matlab'

From 4a498dee9edcc06c290b331ad87bb2a2110bd594 Mon Sep 17 00:00:00 2001
From: "SNDST00M: M.U.N.I.N" <82655227+4086606@users.noreply.github.com>
Date: Fri, 30 Jul 2021 10:20:29 +0100
Subject: [PATCH 8/9] Undeprecate rm* functions

---
 grammars/m.cson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grammars/m.cson b/grammars/m.cson
index 6625f1f..d841aa5 100644
--- a/grammars/m.cson
+++ b/grammars/m.cson
@@ -1690,7 +1690,7 @@ repository:
       {
         comment: 'Removed or pre-R2021a functionality'
         name: 'invalid.deprecated.matlab'
-        match: '(?<!\\.|\\w)(?:actxcontrol|actxcontrollist|actxcontrolselect|addParamValue|baryToCart|callSoapService|cartToBary|checkin|checkout|circumcenters|cmopts|codeCompatibilityReport|createClassFromWsdl|createCopy|createSoapMessage|csvread|csvwrite|customverctrl|dblquad|depdir|dlmread|dlmread|dlmwrite|edgeAttachments|edges|enableNETfromNetworkDrive|ezsurf|ezsurfc|faceNormals|featureEdges|findstr|flipdim|fopen|freeBoundary|guide|hdf5info|hdf5write|hdftool|hgsetget|hist|histc|hostid|inOutStatus|incenters|inferiorto|inline|instrcallback|instrfind|instrfindall|intwarning|isEdge|isInputSizeLockedImpl|isfullfile|isstr|lasterror|menu|nargchk|nearestNeighbor|neighbors|neighbors|notebook|opengl(?=\\s*(?:\\(\\s*["\'])?(?:data|info))|parseSoapResponse|plotyy|pointLocation|polar|quad|quadl|quadl|quadv|rmdir|rmmissing|rmoutliers|rose|serial|serial|serialbreak|seriallist|setstr|shiftdim|str2mat|strmatch|strvcat|superiorto|supportPackageInstaller|triplequad|TriRep|TriScatteredInterp|undocheckout|urlread|urlwrite|vectorize|verctrl|vertexAttachments|voronoiDiagram|whatsnew|xlsfinfo|xlsread|xlswrite)\\b|(?<=[a-zA-Z0-9_]\\.)(?:ActivePositionProperty|BaudRate|BreakInterruptFcn|BytesAvailable|BytesAvailableFcn|BytesAvailableFcnCount|BytesAvailableFcnMode|BytesToOutput|DataBits|DataTerminalReady|FlowControl|InputBufferSize|OutputBufferSize|Parity|PinStatus|PinStatusFcn|ReadAsyncMode|RecordDetail|RecordMode|RecordStatus|RequestToSend|StopBits|Terminator|TimerFcn|TimerPeriod|TransferStatus|UIContextMenu)\\b|(?:(?<=[^\\w.]NET\\.)convertArray|(?<=[^\\w.]matlab\\.io.datastore\\.)HadoopFileBased|(?<=[^\\w.]matlab\\.system\\.)StringSet|(?<=[^\\w.]matlab\\.system\\.mixin\\.)(?:CustomIcon|Nondirect|Propagates|SampleTime)|(?<=[^\\w.]matlab\\.unittest\\.plugins\\.)FailureDiagnosticsPlugin|(?<=[^\\w.]matlabshared\\.supportpkg\\.)checkForUpdate)\\b|(?<=[\'"])(?:peer|SamplingRate)(?=[\'"])'
+        match: '(?<!\\.|\\w)(?:actxcontrol|actxcontrollist|actxcontrolselect|addParamValue|baryToCart|callSoapService|cartToBary|checkin|checkout|circumcenters|cmopts|codeCompatibilityReport|createClassFromWsdl|createCopy|createSoapMessage|csvread|csvwrite|customverctrl|dblquad|depdir|dlmread|dlmread|dlmwrite|edgeAttachments|edges|enableNETfromNetworkDrive|ezsurf|ezsurfc|faceNormals|featureEdges|findstr|flipdim|fopen|freeBoundary|guide|hdf5info|hdf5write|hdftool|hgsetget|hist|histc|hostid|inOutStatus|incenters|inferiorto|inline|instrcallback|instrfind|instrfindall|intwarning|isEdge|isInputSizeLockedImpl|isfullfile|isstr|lasterror|menu|nargchk|nearestNeighbor|neighbors|neighbors|notebook|opengl(?=\\s*(?:\\(\\s*["\'])?(?:data|info))|parseSoapResponse|plotyy|pointLocation|polar|quad|quadl|quadl|quadv|rose|serial|serial|serialbreak|seriallist|setstr|shiftdim|str2mat|strmatch|strvcat|superiorto|supportPackageInstaller|triplequad|TriRep|TriScatteredInterp|undocheckout|urlread|urlwrite|vectorize|verctrl|vertexAttachments|voronoiDiagram|whatsnew|xlsfinfo|xlsread|xlswrite)\\b|(?<=[a-zA-Z0-9_]\\.)(?:ActivePositionProperty|BaudRate|BreakInterruptFcn|BytesAvailable|BytesAvailableFcn|BytesAvailableFcnCount|BytesAvailableFcnMode|BytesToOutput|DataBits|DataTerminalReady|FlowControl|InputBufferSize|OutputBufferSize|Parity|PinStatus|PinStatusFcn|ReadAsyncMode|RecordDetail|RecordMode|RecordStatus|RequestToSend|StopBits|Terminator|TimerFcn|TimerPeriod|TransferStatus|UIContextMenu)\\b|(?:(?<=[^\\w.]NET\\.)convertArray|(?<=[^\\w.]matlab\\.io.datastore\\.)HadoopFileBased|(?<=[^\\w.]matlab\\.system\\.)StringSet|(?<=[^\\w.]matlab\\.system\\.mixin\\.)(?:CustomIcon|Nondirect|Propagates|SampleTime)|(?<=[^\\w.]matlab\\.unittest\\.plugins\\.)FailureDiagnosticsPlugin|(?<=[^\\w.]matlabshared\\.supportpkg\\.)checkForUpdate)\\b|(?<=[\'"])(?:peer|SamplingRate)(?=[\'"])'
       }
     ]
   constructs:

From b6c9cdd842d02d0062cdeb33a034d4e115afa388 Mon Sep 17 00:00:00 2001
From: "SNDST00M: M.U.N.I.N" <82655227+SNDST00M@users.noreply.github.com>
Date: Sat, 31 Jul 2021 18:45:25 +0100
Subject: [PATCH 9/9] Allow colon index in cell array index

---
 grammars/m.cson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grammars/m.cson b/grammars/m.cson
index d841aa5..20ebfe2 100644
--- a/grammars/m.cson
+++ b/grammars/m.cson
@@ -1461,7 +1461,7 @@ repository:
       {
         comment: 'Colon operator for vector creation/indexing'
         name: 'keyword.operator.vector.colon.matlab'
-        match: '(?<=[a-zA-Z0-9_\\s(),]|^):(?=[a-zA-Z0-9_\\s(),]|$)'
+        match: '(?<=[a-zA-Z0-9_\\s(){,]|^):(?=[a-zA-Z0-9_\\s()},]|$)'
       }
       {
         comment: 'Comparative operators'