github-linguist 7.9.0 → 7.10.0

data/grammars/source.lean.json

@@ -60,7 +60,7 @@
     },
     {
       "name": "keyword.other.lean",
-      "match": "\\b(?\u003c!\\.)(calc|have|this|match|do|suffices|show|by|in|at|let|forall|fun|exists|assume|from|λ)(?!\\.)\\b"
+      "match": "\\b(?\u003c!\\.)(calc|have|this|match|do|suffices|show|by|in|at|let|forall|fun|exists|assume|from|obtain|haveI|λ)(?!\\.)\\b"
     },
     {
       "contentName": "entity.name.lean",

data/grammars/source.m2.json

@@ -0,0 +1,125 @@
+{
+  "name": "Macaulay2",
+  "scopeName": "source.m2",
+  "patterns": [
+    {
+      "include": "#keywords"
+    },
+    {
+      "include": "#comment"
+    },
+    {
+      "include": "#strings"
+    },
+    {
+      "include": "#fields"
+    },
+    {
+      "include": "#math"
+    },
+    {
+      "include": "#autogen"
+    }
+  ],
+  "repository": {
+    "autogen": {
+      "patterns": [
+        {
+          "name": "entity.name.type.m2",
+          "match": "(?x)(\\b|^)(Adjacent|AffineVariety|Analyzer|ANCHOR|Array|AssociativeExpression|Bag|BasicList|BettiTally|BinaryOperation|BLOCKQUOTE|BODY|BOLD|Boolean|BR|CacheFunction|CacheTable|CC|CDATA|ChainComplex|ChainComplexMap|CODE|CoherentSheaf|Command|COMMENT|CompiledFunction|CompiledFunctionBody|CompiledFunctionClosure|ComplexField|Constant|Database|DD|Descent|Describe|Dictionary|DIV|DIV1|Divide|DL|DocumentTag|DT|Eliminate|EM|EngineRing|Equation|ExampleItem|Expression|File|FilePosition|ForestNode|FractionField|Function|FunctionApplication|FunctionBody|FunctionClosure|GaloisField|GeneralOrderedMonoid|GlobalDictionary|GradedModule|GradedModuleMap|GroebnerBasis|GroebnerBasisOptions|HashTable|HEAD|HEADER1|HEADER2|HEADER3|HEADER4|HEADER5|HEADER6|HeaderType|Holder|HR|HREF|HTML|Hybrid|Hypertext|HypertextContainer|HypertextParagraph|Ideal|IMG|ImmutableType|IndeterminateNumber|IndexedVariable|IndexedVariableTable|InexactField|InexactFieldFamily|InexactNumber|InfiniteNumber|IntermediateMarkUpType|ITALIC|Keyword|LABEL|LATER|LI|LINK|List|LITERAL|LocalDictionary|LocalRing|LowerBound|Manipulator|MapExpression|MarkUpType|MarkUpTypeWithOptions|Matrix|MatrixDegreeExpression|MatrixExpression|MENU|META|MethodFunction|MethodFunctionBinary|MethodFunctionSingle|MethodFunctionWithOptions|Minus|Module|ModuleMap|Monoid|MonoidElement|MonomialIdeal|MultigradedBettiTally|MutableHashTable|MutableList|MutableMatrix|Net|NetFile|NonAssociativeProduct|Nothing|Number|NumberedVerticalList|OneExpression|Option|OptionTable|OrderedMonoid|Package|PARA|Parenthesize|Parser|Partition|PolynomialRing|Power|PRE|Product|ProductOrder|ProjectiveHilbertPolynomial|ProjectiveVariety|Pseudocode|PushforwardComputation|QQ|QuotientRing|RealField|Resolution|Ring|RingElement|RingFamily|RingMap|RowExpression|RR|ScriptedFunctor|SelfInitializingType|Sequence|Set|SheafExpression|SheafOfRings|SMALL|SPAN|SparseMonomialVectorExpression|SparseVectorExpression|String|STRONG|STYLE|SUB|Subscript|SUBSECTION|Sum|SumOfTwists|SUP|Superscript|Symbol|SymbolBody|TABLE|Table|Tally|Task|TD|TEX|Thing|Time|TITLE|TO|TO2|TOH|TR|TreeNode|TT|Type|UL|URL|Variety|Vector|VectorExpression|VerticalList|VirtualTally|VisibleList|WrapperType|ZeroExpression|ZZ)\\b"
+        },
+        {
+          "name": "entity.name.function.m2",
+          "match": "(?x)(\\b|^)(about|abs|accumulate|acos|acosh|acot|addCancelTask|addDependencyTask|addEndFunction|addHook|addStartFunction|addStartTask|adjoint|agm|alarm|all|ambient|analyticSpread|ancestor|ancestors|andP|ann|annihilator|antipode|any|append|applicationDirectory|apply|applyKeys|applyPairs|applyTable|applyValues|apropos|ascii|asin|asinh|ass|assert|associatedGradedRing|associatedPrimes|atan|atan2|atEndOfFile|autoload|baseFilename|baseName|basis|beginDocumentation|benchmark|BesselJ|BesselY|betti|between|binomial|borel|cacheValue|cancelTask|capture|ceiling|centerString|chainComplex|char|characters|charAnalyzer|check|chi|class|clean|clearEcho|code|codim|coefficient|coefficientRing|coefficients|cohomology|coimage|coker|cokernel|collectGarbage|columnAdd|columnate|columnMult|columnPermute|columnRankProfile|columnSwap|combine|commandInterpreter|commonest|commonRing|comodule|complement|complete|components|compose|compositions|compress|concatenate|conductor|cone|conjugate|connectionCount|constParser|content|contract|conwayPolynomial|copy|copyDirectory|copyFile|cos|cosh|cot|cotangentSheaf|coth|cover|coverMap|cpuTime|createTask|csc|csch|currentDirectory|currentLineNumber|currentTime|deadParser|debug|debugError|decompose|deepSplice|default|degree|degreeLength|degrees|degreesMonoid|degreesRing|delete|demark|denominator|depth|describe|det|determinant|diagonalMatrix|dictionary|diff|difference|dim|directSum|disassemble|discriminant|dismiss|distinguished|divideByVariable|doc|document|drop|dual|eagonNorthcott|echoOff|echoOn|eigenvalues|eigenvectors|eint|elements|eliminate|End|endPackage|entries|erase|erf|erfc|error|euler|eulers|even|EXAMPLE|examples|exec|exp|expectedReesIdeal|expm1|exponents|export|exportFrom|exportMutable|expression|extend|exteriorPower|factor|Fano|fileExecutable|fileExists|fileLength|fileMode|fileReadable|fileTime|fileWritable|fillMatrix|findFiles|findHeft|findSynonyms|first|firstkey|fittingIdeal|flagLookup|flatten|flattenRing|flip|floor|fold|forceGB|fork|format|frac|fraction|frames|fromDividedPowers|fromDual|functionBody|futureParser|Gamma|gb|gbRemove|gbSnapshot|gcd|gcdCoefficients|gcdLLL|GCstats|genera|generateAssertions|generator|generators|genericMatrix|genericSkewMatrix|genericSymmetricMatrix|gens|genus|get|getc|getChangeMatrix|getenv|getGlobalSymbol|getNetFile|getNonUnit|getPrimeWithRootOfUnity|getSymbol|getWWW|GF|globalAssign|globalAssignFunction|globalAssignment|globalReleaseFunction|gradedModule|gradedModuleMap|gramm|graphIdeal|graphRing|Grassmannian|groebnerBasis|groupID|hash|hashTable|heft|height|hermite|hilbertFunction|hilbertPolynomial|hilbertSeries|hold|Hom|homogenize|homology|homomorphism|horizontalJoin|html|htmlWithTex|httpHeaders|hypertext|icFracP|icFractions|icMap|icPIdeal|ideal|idealizer|identity|image|imaginaryPart|independentSets|index|indices|inducedMap|inducesWellDefinedMap|info|infoHelp|input|insert|installAssignmentMethod|installedPackages|installHilbertFunction|installMethod|installPackage|instance|instances|integralClosure|integralClosures|integrate|intersect|intersectInP|inverse|inversePermutation|inverseSystem|irreducibleCharacteristicSeries|irreducibleDecomposition|isAffineRing|isANumber|isBorel|isCanceled|isCommutative|isConstant|isDirectory|isDirectSum|isField|isFinite|isFinitePrimeField|isFreeModule|isGlobalSymbol|isHomogeneous|isIdeal|isInfinite|isInjective|isInputFile|isIsomorphism|isLinearType|isListener|isLLL|isModule|isMonomialIdeal|isNormal|isOpen|isOutputFile|isPolynomialRing|isPrimary|isPrime|isPrimitive|isPseudoprime|isQuotientModule|isQuotientOf|isQuotientRing|isReady|isReal|isReduction|isRegularFile|isRing|isSkewCommutative|isSorted|isSquareFree|isStandardGradedPolynomialRing|isSubmodule|isSubquotient|isSubset|isSurjective|isTable|isUnit|isWellDefined|isWeylAlgebra|jacobian|jacobianDual|join|ker|kernel|kernelLLL|keys|kill|koszul|last|lcm|leadCoefficient|leadComponent|leadMonomial|leadTerm|length|letterParser|lift|liftable|limitFiles|limitProcesses|lines|linkFile|listForm|listSymbols|LLL|lngamma|load|loadPackage|localDictionaries|localize|localRing|locate|log|log1p|lookup|lookupCount|LUdecomposition|makeDirectory|makeDocumentTag|makePackageIndex|makeS2|map|markedGB|match|mathML|matrix|max|maxPosition|member|memoize|merge|mergePairs|method|methodOptions|methods|min|mingens|mingle|minimalBetti|minimalPresentation|minimalPrimes|minimalReduction|minimizeFilename|minors|minPosition|minPres|minus|mkdir|mod|module|modulo|monoid|monomialCurveIdeal|monomialIdeal|monomials|monomialSubideal|moveFile|multidegree|multidoc|multigraded|multiplicity|mutable|mutableIdentity|mutableMatrix|nanosleep|needs|needsPackage|net|netList|newClass|newCoordinateSystem|newNetFile|newPackage|newRing|nextkey|nextPrime|NNParser|nonspaceAnalyzer|norm|normalCone|notImplemented|nullhomotopy|nullParser|nullSpace|number|numcols|numColumns|numerator|numeric|numgens|numRows|numrows|odd|ofClass|on|openDatabase|openDatabaseOut|openFiles|openIn|openInOut|openListener|openOut|openOutAppend|optionalSignParser|options|optP|orP|override|pack|package|packageTemplate|pad|pager|pairs|parent|part|partition|partitions|parts|pdim|peek|permanents|permutations|pfaffians|pivots|plus|poincare|poincareN|polarize|poly|position|positions|power|powermod|precision|preimage|prepend|presentation|pretty|primaryComponent|primaryDecomposition|print|printString|processID|product|profile|Proj|projectiveHilbertPolynomial|promote|protect|prune|pseudocode|pseudoRemainder|pushForward|QQParser|QRDecomposition|quotient|quotientRemainder|radical|random|randomKRationalPoint|randomMutableMatrix|rank|read|readDirectory|readlink|realPart|realpath|recursionDepth|reduceHilbert|reductionNumber|reesAlgebra|reesAlgebraIdeal|reesIdeal|regex|registerFinalizer|regularity|relations|relativizeFilename|remainder|remove|removeDirectory|removeFile|removeHook|removeLowestDimension|reorganize|replace|res|reshape|resolution|resultant|reverse|ring|ringFromFractions|roots|rotate|round|rowAdd|rowMult|rowPermute|rowRankProfile|rowSwap|rsort|run|runHooks|runLengthEncode|same|saturate|scan|scanKeys|scanLines|scanPairs|scanValues|schedule|schreyerOrder|Schubert|searchPath|sec|sech|seeParsing|select|selectInSubring|selectVariables|separate|separateRegexp|sequence|serialNumber|set|setEcho|setGroupID|setIOExclusive|setIOSynchronized|setIOUnSynchronized|setRandomSeed|setup|setupEmacs|sheaf|sheafHom|show|showHtml|showTex|simpleDocFrob|sin|singularLocus|sinh|size|size2|sleep|smithNormalForm|solve|someTerms|sort|sortColumns|source|Spec|specialFiber|specialFiberIdeal|splice|splitWWW|sqrt|stack|standardForm|standardPairs|stashValue|status|sub|sublists|submatrix|submatrixByDegrees|subquotient|subsets|substitute|substring|subtable|sum|super|support|SVD|switch|sylvesterMatrix|symbolBody|symlinkDirectory|symlinkFile|symmetricAlgebra|symmetricAlgebraIdeal|symmetricKernel|symmetricPower|synonym|SYNOPSIS|syz|syzygyScheme|table|take|tally|tan|tangentCone|tangentSheaf|tanh|target|taskResult|temporaryFileName|tensor|tensorAssociativity|terminalParser|terms|TEST|tex|texMath|times|toAbsolutePath|toCC|toDividedPowers|toDual|toExternalString|toField|toList|toLower|top|topCoefficients|topComponents|toRR|toSequence|toString|toUpper|trace|transpose|trim|truncate|truncateOutput|tutorial|ultimate|unbag|uncurry|undocumented|uniform|uninstallAllPackages|uninstallPackage|unique|unsequence|unstack|use|userSymbols|utf8|utf8check|validate|value|values|variety|vars|vector|versalEmbedding|wait|wedgeProduct|weightRange|whichGm|width|Wikipedia|wrap|xor|youngest|zero|zeta|ZZParser)\\b"
+        },
+        {
+          "name": "constant.other.m2",
+          "match": "(?x)(\\b|^)(AbstractToricVarieties|AdjointIdeal|AfterEval|AfterNoPrint|AfterPrint|AlgebraicSplines|Algorithm|Alignment|AllCodimensions|allowableThreads|applicationDirectorySuffix|argument|Ascending|Authors|AuxiliaryFiles|backtrace|backupFileRegexp|Bareiss|BaseFunction|baseRings|BaseRow|BasisElementLimit|Bayer|BeforePrint|Benchmark|Bertini|BGG|BIBasis|Binary|Binomial|BinomialEdgeIdeals|Binomials|BKZ|Body|BoijSoederberg|BooleanGB|Boxes|Browse|Bruns|cache|CacheExampleOutput|CallLimit|Caveat|Center|Certification|ChainComplexExtras|ChainComplexOperations|ChangeMatrix|CharacteristicClasses|CheckDocumentation|Chordal|Classic|clearAll|clearOutput|close|closeIn|closeOut|ClosestFit|CodimensionLimit|CoefficientRing|Cofactor|CohenEngine|CohenTopLevel|CohomCalg|CoincidentRootLoci|commandLine|compactMatrixForm|Complement|CompleteIntersection|CompleteIntersectionResolutions|Complexes|ConductorElement|Configuration|ConformalBlocks|Consequences|Constants|ConvexInterface|ConwayPolynomials|copyright|Core|CorrespondenceScrolls|Cremona|currentFileDirectory|currentFileName|currentLayout|currentPackage|CurrentVersion|Cyclotomic|Date|dd|DebuggingMode|debuggingMode|debugLevel|Decompose|defaultPrecision|Degree|DegreeLift|DegreeLimit|DegreeMap|DegreeOrder|DegreeRank|Degrees|Dense|Density|Depth|Descending|Description|DeterminantalRepresentations|DGAlgebras|dictionaryPath|DiffAlg|Dispatch|DivideConquer|DividedPowers|Divisor|Dmodules|docExample|docTemplate|Down|EdgeIdeals|edit|EisenbudHunekeVasconcelos|Elimination|EliminationMatrices|EllipticCurves|EllipticIntegrals|Email|end|endl|Engine|engineDebugLevel|EngineTests|EnumerationCurves|environment|EquivariantGB|errorDepth|EulerConstant|Example|ExampleFiles|ExampleSystems|Exclude|exit|Ext|ExteriorIdeals|false|FastLinAlg|FastNonminimal|FGLM|fileDictionaries|fileExitHooks|FileName|FindOne|FiniteFittingIdeals|First|FirstPackage|FlatMonoid|Flexible|flush|FollowLinks|FormalGroupLaws|Format|FourierMotzkin|FourTiTwo|fpLLL|FrobeniusThresholds|GBDegrees|gbTrace|GenerateAssertions|Generic|GenericInitialIdeal|gfanInterface|Givens|GLex|Global|GlobalAssignHook|globalAssignmentHooks|GlobalReleaseHook|Gorenstein|GradedLieAlgebras|GraphicalModels|Graphics|Graphs|GRevLex|GroebnerWalk|GroupLex|GroupRevLex|GTZ|handleInterrupts|HardDegreeLimit|Heading|Headline|Heft|Height|help|Hermite|Hermitian|HH|hh|HigherCIOperators|HighestWeights|Hilbert|HodgeIntegrals|homeDirectory|HomePage|Homogeneous|HorizontalSpace|HyperplaneArrangements|id|IgnoreExampleErrors|ii|incomparable|Increment|indeterminate|Index|indexComponents|infinity|InfoDirSection|Inhomogeneous|Inputs|InstallPrefix|IntegralClosure|interpreterDepth|Intersection|InvariantRing|InverseMethod|Inverses|InverseSystems|Invertible|InvolutiveBases|Iterate|Jacobian|Join|Jupyter|Keep|KeepZeroes|Key|Kronecker|KustinMiller|lastMatch|LatticePolytopes|Layout|Left|LengthLimit|Lex|LexIdeals|Licenses|LieTypes|Limit|Linear|LinearAlgebra|lineNumber|listLocalSymbols|listUserSymbols|LLLBases|loadDepth|LoadDocumentation|loadedFiles|loadedPackages|Local|LocalRings|LongPolynomial|MakeDocumentation|MakeInfo|MakeLinks|MapleInterface|Markov|Matroids|maxAllowableThreads|maxExponent|MaximalIdeal|MaximalRank|MaxReductionCount|MCMApproximations|minExponent|MinimalGenerators|MinimalMatrix|minimalPresentationMap|minimalPresentationMapInv|MinimalPrimes|Minimize|Miura|ModuleDeformations|MonodromySolver|Monomial|MonomialAlgebras|MonomialOrder|Monomials|MonomialSize|MultiGradedRationalMap|MultiplierIdeals|NAGtypes|Name|Nauty|NautyGraphs|NCAlgebra|NCLex|NewFromMethod|newline|NewMethod|NewOfFromMethod|NewOfMethod|nil|NoetherNormalization|NonminimalComplexes|NoPrint|Normaliz|NormalToricVarieties|notify|NTL|null|nullaryMethods|NumericalAlgebraicGeometry|NumericalCertification|NumericalHilbert|NumericalImplicitization|NumericalSchubertCalculus|NumericSolutions|OldPolyhedra|OldToricVectorBundles|OO|oo|ooo|oooo|OpenMath|operatorAttributes|OptionalComponentsPresent|Options|Order|order|OutputDictionary|Outputs|PackageCitations|PackageDictionary|PackageExports|PackageImports|PackageTemplate|PairLimit|PairsRemaining|Parametrization|Parsing|path|Permanents|PHCpack|PhylogeneticTrees|pi|PieriMaps|PlaneCurveSingularities|Points|Polyhedra|Polymake|Posets|Position|PositivityToricBundles|Postfix|Precision|Prefix|prefixDirectory|prefixPath|PrimaryDecomposition|PrimaryTag|PrimitiveElement|Print|printingAccuracy|printingLeadLimit|printingPrecision|printingSeparator|printingTimeLimit|printingTrailLimit|printWidth|profileSummary|Projective|Prune|PruneComplex|pruningMap|Pullback|PushForward|QthPower|Quasidegrees|QuillenSuslin|quit|Quotient|RandomCanonicalCurves|RandomComplexes|RandomCurves|RandomCurvesOverVerySmallFiniteFields|RandomIdeals|RandomMonomialIdeals|RandomObjects|RandomPlaneCurves|RandomSpaceCurves|Range|RationalMaps|RationalPoints|ReactionNetworks|RealFP|RealQP|RealRR|RealXD|recursionLimit|Reduce|ReesAlgebra|ReflexivePolytopesDB|Regularity|RelativeCanonicalResolution|Reload|RemakeAllDocumentation|Repository|RerunExamples|ResidualIntersections|restart|Result|Resultants|returnCode|Reverse|RevLex|Right|rootPath|rootURI|RunExamples|SchurComplexes|SchurFunctors|SchurRings|scriptCommandLine|SCSCP|SectionRing|SeeAlso|SegreClasses|SemidefiniteProgramming|Seminormalization|SeparateExec|Serialization|sheafExt|ShimoyamaYokoyama|showClassStructure|showStructure|showUserStructure|SimpleDoc|SimplicialComplexes|SimplicialDecomposability|SimplicialPosets|SizeLimit|SkewCommutative|SlackIdeals|SLnEquivariantMatrices|SLPexpressions|Sort|SortStrategy|SourceCode|SourceRing|SpaceCurves|SparseResultants|SpechtModule|SpecialFanoFourfolds|SpectralSequences|SRdeformations|Standard|StatePolytope|stderr|stdio|StopBeforeComputation|stopIfError|StopWithMinimalGenerators|Strategy|StronglyStableIdeals|Style|Subnodes|SubringLimit|subscript|Sugarless|SumsOfSquares|superscript|SVDComplexes|SymbolicPowers|SymmetricPolynomials|Syzygies|SyzygyLimit|SyzygyMatrix|SyzygyRows|TangentCone|TateOnProducts|TensorComplexes|Test|TestIdeals|TeXmacs|Text|Threshold|Topcom|topLevelMode|Tor|TorAlgebra|Toric|ToricInvariants|ToricTopology|ToricVectorBundles|TotalPairs|TriangularSets|Tries|Triplets|Tropical|true|Truncate|Truncations|TypicalValue|typicalValues|Undo|Unique|Units|Unmixed|Up|UpdateOnly|UpperTriangular|Usage|UseCachedExampleOutput|UseHilbertFunction|UserMode|UseSyzygies|Variable|VariableBaseName|Variables|VectorFields|Verbose|Verbosity|Verify|VersalDeformations|Version|version|VerticalSpace|viewHelp|VirtualResolutions|Visualize|WebApp|Weights|WeylAlgebra|WeylGroups|Wrap|XML)\\b"
+        }
+      ]
+    },
+    "comment": {
+      "patterns": [
+        {
+          "name": "comment.line.double-dash.m2",
+          "match": "(--).*$",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.comment.m2"
+            }
+          }
+        },
+        {
+          "contentName": "comment.block.m2",
+          "begin": "-\\*",
+          "end": "\\*-",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.begin.m2"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.end.m2"
+            }
+          }
+        }
+      ]
+    },
+    "fields": {
+      "patterns": [
+        {
+          "name": "entity.name.type.m2",
+          "match": "(ZZ|QQ)(\\/\\d+)?"
+        }
+      ]
+    },
+    "keywords": {
+      "patterns": [
+        {
+          "name": "keyword.control.m2",
+          "match": "(?x)(\\b|^)(and|break|catch|continue|do|elapsedTime|elapsedTiming|else|for|from|global|if|in|list|local|new|not|of|or|return|shield|SPACE|step|symbol|then|threadVariable|throw|time|timing|to|try|when|while)\\b"
+        },
+        {
+          "name": "keyword.operator.m2",
+          "match": "(?x)(\\b|^)(and|not|or)\\b"
+        }
+      ]
+    },
+    "math": {
+      "patterns": [
+        {
+          "name": "keyword.operator.arithmetic.m2",
+          "match": "(\\+|\\*)"
+        },
+        {
+          "name": "constant.numeric.integer.m2",
+          "match": "(?\u003c=\\s)\\d+"
+        }
+      ]
+    },
+    "strings": {
+      "patterns": [
+        {
+          "name": "string.quoted.double.m2",
+          "begin": "\"",
+          "end": "\"",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.m2"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.m2"
+            }
+          }
+        },
+        {
+          "name": "string.unquoted.m2",
+          "match": "\"///\\(/?/?[^/]\\|\\(//\\)*////[^/]\\)*\\(//\\)*///\""
+        }
+      ]
+    }
+  }
+}

data/grammars/source.man-conf.json

@@ -20,7 +20,7 @@
           "include": "etc#str"
         },
         {
-          "include": "etc#colon"
+          "include": "etc#kolon"
         },
         {
           "include": "#arg"
@@ -139,7 +139,7 @@
         "2": {
           "patterns": [
             {
-              "include": "etc#colon"
+              "include": "etc#kolon"
             },
             {
               "name": "constant.numeric.section.man-conf",

data/grammars/source.modula-3.json

@@ -42,6 +42,16 @@
         }
       ]
     },
+    {
+      "name": "keyword.control.assert.cm3_specific.modula-3",
+      "begin": "\u003c\\*\\s*ASSERT\\b",
+      "end": "\\*\u003e",
+      "patterns": [
+        {
+          "include": "#pragma"
+        }
+      ]
+    },
     {
       "include": "#comment"
     },

data/grammars/{source.mrc.json → source.msl.json}

@@ -1,5 +1,5 @@
 {
-  "scopeName": "source.mrc",
+  "scopeName": "source.msl",
   "patterns": [
     {
       "include": "#comments"
@@ -24,7 +24,7 @@
     "alias": {
       "patterns": [
         {
-          "name": "meta.alias.code.mrc",
+          "name": "meta.alias.code.msl",
           "begin": "(?i)^(alias)\\x20+(?:(-l)\\x20+)?(?!-l)([^\\s]+)\\s*",
           "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
@@ -34,13 +34,13 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "storage.type.alias.mrc"
+              "name": "storage.type.alias.msl"
             },
             "2": {
-              "name": "storage.modifier.alias.mrc"
+              "name": "storage.modifier.alias.msl"
             },
             "3": {
-              "name": "entity.name.function.mrc"
+              "name": "entity.name.function.msl"
             }
           }
         }
@@ -49,14 +49,17 @@
     "calc_content": {
       "patterns": [
         {
-          "name": "keyword.operator.arithmetic.mrc",
+          "name": "keyword.operator.arithmetic.msl",
           "match": "[+\\-*/%^]"
         },
         {
-          "name": "meta.arithmetic.mrc",
-          "begin": "(\u003c=\\()",
-          "end": "(?\u003c=\\))",
+          "name": "meta.arithmetic.msl",
+          "begin": "\\(",
+          "end": "\\)",
           "patterns": [
+            {
+              "include": "#parameters"
+            },
             {
               "include": "#calc_content"
             }
@@ -67,7 +70,7 @@
     "code_block": {
       "patterns": [
         {
-          "name": "meta.code.block.mrc",
+          "name": "meta.code.block.msl",
           "begin": "{",
           "end": "}",
           "patterns": [
@@ -115,22 +118,22 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.other.command.symbol.mrc"
+              "name": "keyword.other.command.symbol.msl"
             },
             "2": {
-              "name": "keyword.other.command.symbol.mrc"
+              "name": "keyword.other.command.symbol.msl"
             },
             "3": {
-              "name": "keyword.control.command.mrc"
+              "name": "keyword.control.command.msl"
             },
             "4": {
-              "name": "support.variable.name.mrc"
+              "name": "support.variable.name.msl"
             }
           }
         },
         {
-          "name": "meta.cmd.mrc",
-          "begin": "(?i)(?:\\x20+\\|\\x20+|(?\u003c=else\\x20)|^\\x20*|\\)|\\G)\\x20*(?!\\|\\|\\x20)(\\/+)?([!|.]{1,2})?(?:(?![{};%\u0026$]|if|else(?:if)?|while)([^\\s]+))",
+          "name": "meta.cmd.msl",
+          "begin": "(?i)(?:\\x20+\\|\\x20+|(?\u003c=else\\x20)|^\\x20*|\\)|\\G)\\x20*(?!\\|\\|\\x20)(\\/+)?([!|.]{1,2})?(?:(?![{};%\u0026$:]|if|else(?:if)?|while)([^\\s]+))",
           "end": "(?=\\z|\\x20\\|\\x20[^\\x20]|\\x20}|$)",
           "patterns": [
             {
@@ -142,13 +145,13 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.other.command.symbol.mrc"
+              "name": "keyword.other.command.symbol.msl"
             },
             "2": {
-              "name": "keyword.other.command.symbol.mrc"
+              "name": "keyword.other.command.symbol.msl"
             },
             "3": {
-              "name": "support.function.name.mrc"
+              "name": "support.function.name.msl"
             }
           }
         }
@@ -157,7 +160,7 @@
     "comment_block": {
       "patterns": [
         {
-          "name": "comment.block.mrc",
+          "name": "comment.block.msl",
           "begin": "^(?:\\x20*)\\/\\*",
           "end": "^(?:\\x20*)\\*\\/$"
         }
@@ -166,7 +169,7 @@
     "comment_documentation": {
       "patterns": [
         {
-          "name": "comment.block.documentation.mrc",
+          "name": "comment.block.documentation.msl",
           "begin": "^(?:\\x20*)(\\/\\*\\*)$",
           "end": "^(?:\\x20*)\\*\\/$",
           "patterns": [
@@ -180,8 +183,8 @@
     "comment_line": {
       "patterns": [
         {
-          "name": "comment.line.semicolon.mrc",
-          "begin": "(?\u003c=\\G|\\x20\\|\\x20|^)(?:\\x20*);",
+          "name": "comment.line.semicolon.msl",
+          "begin": "(?\u003c=^|\\x20\\|\\x20|\\G)(?:\\x20*);",
           "end": "(?=\\z|\\x20+\\|\\x20+[^\\s]|\\x20}|$)"
         }
       ]
@@ -202,7 +205,7 @@
     "conditionals": {
       "patterns": [
         {
-          "name": "meta.conditional.mrc",
+          "name": "meta.conditional.msl",
           "begin": "(?i)(?:(?\u003c=\\x20\\|\\x20|^|\\G)\\x20*(if|elseif|while)|(?:(?\u003c=\\))\\x20+(\u0026\u0026|\\|\\|)))\\x20+(?=\\()",
           "end": "(?=\\)(?:\\x20|$))",
           "patterns": [
@@ -215,15 +218,15 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.control.conditional.mrc"
+              "name": "keyword.control.conditional.msl"
             },
             "2": {
-              "name": "keyword.control.conditional.mrc"
+              "name": "keyword.control.conditional.msl"
             }
           }
         },
         {
-          "name": "keyword.control.conditional.mrc",
+          "name": "keyword.control.conditional.msl",
           "match": "(?i)(?\u003c=\\x20\\|\\x20|^)\\x20*(else)\\b"
         }
       ]
@@ -231,7 +234,7 @@
     "conditionals_content": {
       "patterns": [
         {
-          "name": "keyword.operator.mrc",
+          "name": "keyword.operator.msl",
           "match": "(?i)((?\u003c=\\x20)!?(?:==?=?|(?:\u003c|\u003e)=?|\\/\\/|\\\\|\u0026|is(?:in(?:cs)?|wm(?:cs)?|(?:al)?num|letter|alpha|(?:low|upp)er|on|(?:a|h)?op|a?voice|reg|chan|ban|quiet|ignore|protected|notify|admin|owner|quiet|url))(?=\\x20|\\))|(?\u003c=\\()!(?=\\$|%|\u0026))"
         },
         {
@@ -242,7 +245,7 @@
     "constants": {
       "patterns": [
         {
-          "name": "constant.numeric.mrc",
+          "name": "constant.numeric.msl",
           "match": "(?\u003c=\\x20|^|\\(|,)-?\\d+(\\.\\d+)?(?=\\x20|$|\\)|,)"
         }
       ]
@@ -250,7 +253,7 @@
     "dialog": {
       "patterns": [
         {
-          "name": "meta.dialog.code.mrc",
+          "name": "meta.dialog.code.msl",
           "begin": "(?i)^(dialog)\\x20+(?:(-l)\\x20+)?(?!-l)([^\\s]+)\\s*(?={)",
           "end": "(?\u003c=}$)",
           "patterns": [
@@ -260,13 +263,13 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "storage.type.dialog.mrc"
+              "name": "storage.type.dialog.msl"
             },
             "2": {
-              "name": "storage.modifier.dialog.mrc"
+              "name": "storage.modifier.dialog.msl"
             },
             "3": {
-              "name": "entity.name.section.mrc"
+              "name": "entity.name.section.msl"
             }
           }
         }
@@ -278,7 +281,7 @@
           "include": "#comments"
         },
         {
-          "contentName": "string.quoted.double.control.mrc",
+          "contentName": "string.quoted.double.control.msl",
           "begin": "(?i)^\\x20*(title|icon|size|option|text|edit|button|check|radio|box|scroll|list|combo|icon|link|tab|menu|item)\\x20+",
           "end": "(?\u003c=$)",
           "patterns": [
@@ -288,7 +291,7 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.control.dialog.control.mrc"
+              "name": "keyword.control.dialog.control.msl"
             }
           }
         }
@@ -300,7 +303,7 @@
           "match": "(?i)\\x20*\\*\\x20+(@(?:author|command|const(?:ant)?|copyright|deprecated|event|example|experimental|global|identifier|ignore|license|nobadges|param(?:eter)?|arg(?:ument)?|prop|returns?|see|switch|todo|version))\\b",
           "captures": {
             "1": {
-              "name": "storage.type.class.mrc"
+              "name": "storage.type.class.msl"
             }
           }
         }
@@ -309,7 +312,7 @@
     "events": {
       "patterns": [
         {
-          "name": "meta.event.code.mrc",
+          "name": "meta.event.code.msl",
           "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:(?:action|notice|(?:client)?text):[^:]+:[^:]+:)\\s*",
           "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
@@ -319,12 +322,12 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "entity.name.type.event.mrc"
+              "name": "entity.name.type.event.msl"
             }
           }
         },
         {
-          "name": "meta.event.code.mrc",
+          "name": "meta.event.code.msl",
           "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:(?:active|input|tabcomp|mscroll):(?:\\*|#[^:]*|\\?|=|!|@[^:]*):)\\s*",
           "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
@@ -334,12 +337,12 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "entity.name.type.event.mrc"
+              "name": "entity.name.type.event.msl"
             }
           }
         },
         {
-          "name": "meta.event.code.mrc",
+          "name": "meta.event.code.msl",
           "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:(?:agent|appactive|connect(?:fail)?|disconnect|dns|exit|(?:un)?load|(?:midi|mp3|play|song|wave)end|nick|nosound|u?notify|ping|pong|quit|start|usermode|options|resume|song|suspend):)\\s*",
           "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
@@ -349,12 +352,12 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "entity.name.type.event.mrc"
+              "name": "entity.name.type.event.msl"
             }
           }
         },
         {
-          "name": "meta.event.code.mrc",
+          "name": "meta.event.code.msl",
           "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:(?:(?:un)?ban|(?:de)?help|(?:de|server)?op|(?:de)?owner|(?:de)?voice|invite|join|kick|(?:server|raw)?mode|part|topic|(?:de)?admin):(?:\\*|#[^:]*):)\\s*",
           "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
@@ -364,12 +367,12 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "entity.name.type.event.mrc"
+              "name": "entity.name.type.event.msl"
             }
           }
         },
         {
-          "name": "meta.event.code.mrc",
+          "name": "meta.event.code.msl",
           "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:(?:chat|ctcpreply|error|file(?:rcvd|sent)|(?:get|send)fail|logon|serv|signal|snotice|sock(?:close|listen|open|read|write)|udp(?:read|write)|vcmd|wallops|download|(?:un)?zip):[^:]+:)\\s*",
           "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
@@ -379,12 +382,12 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "entity.name.type.event.mrc"
+              "name": "entity.name.type.event.msl"
             }
           }
         },
         {
-          "name": "meta.event.code.mrc",
+          "name": "meta.event.code.msl",
           "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:(?:close|open):(?:\\*|\\?|=|!|@[^:]*):)\\s*",
           "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
@@ -394,12 +397,12 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "entity.name.type.event.mrc"
+              "name": "entity.name.type.event.msl"
             }
           }
         },
         {
-          "name": "meta.event.code.mrc",
+          "name": "meta.event.code.msl",
           "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:dccserver:(?:chat|send|fserve):)\\s*",
           "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
@@ -409,12 +412,12 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "entity.name.type.event.mrc"
+              "name": "entity.name.type.event.msl"
             }
           }
         },
         {
-          "name": "meta.event.code.mrc",
+          "name": "meta.event.code.msl",
           "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:dialog:[^:]+:(?:init|close|edit|sclick|dclick|menu|scroll|mouse|rclick|drop|\\*):[\\d\\-,\\*]+:)\\s*",
           "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
@@ -424,12 +427,12 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "entity.name.type.event.mrc"
+              "name": "entity.name.type.event.msl"
             }
           }
         },
         {
-          "name": "meta.event.code.mrc",
+          "name": "meta.event.code.msl",
           "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:hotlink:[^:]+:(?:\\*|#[^:]*|\\?|=|!|@[^:]*):)\\s*",
           "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
@@ -439,13 +442,13 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "entity.name.type.event.mrc"
+              "name": "entity.name.type.event.msl"
             }
           }
         },
         {
-          "name": "meta.event.code.mrc",
-          "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:key(?:down|up):(?:\\*|@[^:]*):(?:\\*|\\d+(?:,\\d+)*):)\\s*",
+          "name": "meta.event.code.msl",
+          "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:(?:key(?:down|up)|char):(?:\\*|@[^:]*):(?:\\*|\\d+(?:,\\d+)*):)\\s*",
           "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
             {
@@ -454,12 +457,12 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "entity.name.type.event.mrc"
+              "name": "entity.name.type.event.msl"
             }
           }
         },
         {
-          "name": "meta.event.code.mrc",
+          "name": "meta.event.code.msl",
           "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:parseline:(?:\\*|in|out):[^:]+:)\\s*",
           "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
@@ -469,12 +472,12 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "entity.name.type.event.mrc"
+              "name": "entity.name.type.event.msl"
             }
           }
         },
         {
-          "name": "meta.event.code.mrc",
+          "name": "meta.event.code.msl",
           "begin": "^(?i)(raw\\x20+[^:\\s]+:[^:]+:)\\s*",
           "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
@@ -484,12 +487,12 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "entity.name.type.event.mrc"
+              "name": "entity.name.type.event.msl"
             }
           }
         },
         {
-          "name": "meta.event.code.mrc",
+          "name": "meta.event.code.msl",
           "begin": "^(?i)(ctcp\\x20+[^:\\s]+:[^:]+:(?:\\*|#.*|\\?):)\\s*",
           "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
@@ -499,7 +502,7 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "entity.name.type.event.mrc"
+              "name": "entity.name.type.event.msl"
             }
           }
         }
@@ -508,7 +511,7 @@
     "group": {
       "patterns": [
         {
-          "name": "keyword.other.groupname.mrc",
+          "name": "keyword.other.groupname.msl",
           "match": "(?i)^#[^\\s]+ (on|off|end)(?:\\b)"
         }
       ]
@@ -526,37 +529,37 @@
     "identifiers_no_params": {
       "patterns": [
         {
-          "name": "keyword.other.identifier.mrc",
+          "name": "keyword.other.identifier.msl",
           "match": "(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)\\$\\$?~?(0|\\!|\u0026(?=$)|\\*|\\+\\+?|[1-9]+(-?([0-9]+)|[^\\s|\\)|,]+)?|active((c|w)id)?|a?date|adiirc(dir([^\\s,)]+)?|exe|ini)|address|admnick|agent(name|stat|ver)|album|anick|aop|app(active|bits|state)|artist|asctime|audio|auto|avoice|away(msg|time)?|banmask|batteryp?|beta|bit(rate|s)|bname|bnick|boldify|builddate|bw(downb?|name|recb?|sentb?|speed|upb?)|cal(ias|ler)|cancel|cb|cd|chan(modes|types)?|cid|clevel|cmd(box|line)|com(char|err|ment|pact)|cpu(cache|count|ident|load|mhz|name|vendor)|cr(eq|lf)?|ctimer?|ctrlenter|day(light)?|dbu(h|w)|dccignore|dccport|ddename|debug|devent|did|disk(free|total)|dlevel|dname|dock(panels)?|dotnet|download(err)?|dqwindow|ebeeps|email(addr)?|error|event(id|parms)?|exiting|false|fe(of|rr)|filename|filtered|find(dirn|filen)|flinen|frequency|fromeditbox|full(address|date|name|screen|title)|genre|getdir|gfx(ram)?|globalidle|gmt|halted|highlight|hnick|host|hotline(pos)?|ia(ddress|l)|ident|idle|ifmatch2?|ignore|in(midi(.(pos|length|fname|pause))?|mode|mp3|paste|song(.(pos|length|fname|pause))?|wave(.(pos|length|fname|pause))?|who)|ip|is(admin|id|wine)|kblayout|key(char|rpt|val)|knick|lactive(cid|wid)?|lag|layer|leftwin(cid|wid)?|length|lf|locked|log(dir|stamp(fmt)?)|lquitmsg|ltimer|maddress|matchkey|max(lenl|lenm|lens)|me|mem(freep?|total)|menu(bar|context|type)?|mididir|mircdir([^\\s,)]+)?|mircexe|mircini|mnick|modefirst|modelast|modespl|motherboard|mouse(.(x|y||mx|my|dx|dy|cx|cy|win|lb|key))?|mp3dir|msg(stamp|tags|x)|muted|mversion|naddress|nick(column|mode)?|network|newnick|no(tify)?|null|numeric|ok|online(server|total)?|op?nick|os(bits|build|edition|idle|installdate|major|minor|name|servicepack|version)?|parms|parse(line|type|utf)|passivedcc|pcre|percent(l|p)|pi|play(count|er(handle)?)|pnick|port(able)?|position|prefix(ctcp|emote|sys|user)?|progress|prop|protect|quickconnect|quitmessage|raddress|randomcolors|rating|raw(bytes|msgx?)|readn|realname|regerrstr|remote|result|screen(b|hz?|w)?|script(dir([^\\s,)]+)?|line|s)?|server(ip|target)?|sfstate|show|signal|site|size|snicks|snotify|sock(err|br|name)|song(path)?|sreq|ssl(cert((remote)?sha(1|256)|valid)|(lib)?dll|ready|version)?|starting|status(bar)?|stripped|switchbar|target|tempfn|ticks|time(out|stamp(fmt)?|zone)|tips|title(bar)?|toolbar|topic|totaltracks|track|treebar|true|ulevel|up(days|dating|hours|mins)|url|user(mode|name)|v1|v2|vcmd(stat|ver)|version|volume(b|p)?|vnick|wavedir|wid|wildsite|window|year|yes|ziperr)(?=\\s|\\)|,)"
         },
         {
           "match": "(?\u003c=\\s|\\(|\\,|\\.|^)(\\$\\$?~?(?:\\?(?:[^\\s=]+)?|s?dir|hfile))(?:(=)(\"(?:[^\"])*\"))?(?=\\s|\\)|,)",
           "captures": {
             "1": {
-              "name": "keyword.other.identifier.mrc"
+              "name": "keyword.other.identifier.msl"
             },
             "2": {
-              "name": "keyword.operator.mrc"
+              "name": "keyword.operator.msl"
             },
             "3": {
-              "name": "string.quoted.double.mrc"
+              "name": "string.quoted.double.msl"
             }
           }
         },
         {
-          "name": "keyword.other.identifier.mrc",
+          "name": "keyword.other.identifier.msl",
           "match": "(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)(\\=\\$\\$?~?nick)(?=\\b)"
         },
         {
-          "name": "support.function.name.mrc",
-          "match": "(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)(\\$\\$?~?[^\\s(),]+)(?=\\b)"
+          "name": "support.function.name.msl",
+          "match": "(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)(\\$\\$?(?!\\x21)[^\\s(),]+)(?=\\b)"
         }
       ]
     },
     "identifiers_params": {
       "patterns": [
         {
-          "begin": "(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)(\\$\\$?~?(\\+|abook|a?cos|abs|date|add(ress|tok(cs)?)|adilang|admnick|agent|alias|and|ansi2mirc|aop|asc(time)?|a?sin|a?tan|avoice|banlist|base|bfind|bindip|bit(off|on)|boldify|bvar|bytes|calias|cb|ceil|chan(nel)?|chat|chr|click|cnick|colou?r|com(call|chan|press|val)?|cosh?|count(cs)?|cpuload|crc|ctime|date|dccignore|dde|decode|decompress|decrypt|deltok|dialog|did(reg|tok|wm)?|disk(menu)?|dll(call)?|dns|dockpanels|download|duration|editbox(history)?|emoticons|encode|encodingmenu|encrypt|envvar|eval(next)?|eventtarget|exec|exists|fgetc|file|find(dir|file|tok(cs)?)|fline|floor|font|fopen|fread|fserve?|get(dir|dot|tok)?|gfx(ram)?|gmt|group|hash|height|hexcolor|hfind|hget|highlight|hmac|hmatch|hnick|hotlink|hotp|hregex|hypot|ial(chan)?|ibl|iel|ignore|iil|inellipse|ini(ck|topic)?|inpoly|input|in(round)?rect|insert|instok|int(ersect)?|invitemenu|iptype|iql|ircv3caps|is(alias|bit|dde|dir|file|lower|tok(cs)?|upper|utf)|keylocked|left|len|level|line(height|s)?|link|lock|lo(f|g(10)?)|long(fn|ip)|loop|lower|maddress|mask|matchtok(cs)?|md5|menuicon|mid|mk(log|nick)?fn|mode|mp3|msfile|msgtags|nadmnick|(nh)?nick|no(file|p?nick|t(ags|ify)?|path|qt)?|numtok|nvnick|ocolor|onpoly|op?nick|ord?|pic|play|plugins|portfree|pos(cs)?|powmod|prefix(emote|user)|puttok|qt|query|r(ands?|ead(ini)?|eg(ex|ml(ex)?|sub(ex)?)|em(ove(cs)?|tok(cs)?)|eplace(cs|x(cs)?)?|eptok(cs)?|gb|ight|ound|nick)?|samepath|scid|scon|screen(b|hz?|shot|w)?|script|sdir|send|server(vars)?|sfile|sha(1|2|256|384|512)|shortfn|sinh|slapsmenu|sline|snick|sock|sorttok(cs)?|sound|speak|spellcheck|sqrt|statusbar|str(ip)?|style|submenu|sysdir|tanh|timer|tip|token|toolbar|topicbox|totp|trust|ulist|unsafe|upper|uptime|url(get)?|utf(de|en)code|var|vc(md)?|vol|width|wildtok(cs)?|window|wmiquery|wrap|xor|zip))\\(",
+          "begin": "(?i)(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)(\\$\\$?~?(\\+|abook|a?cos|abs|date|add(ress|tok(cs)?)|adilang|admnick|agent|alias|and|ansi2mirc|aop|asc(time)?|a?sin|a?tan|avoice|banlist|base|bfind|bindip|bit(off|on)|boldify|bvar|bytes|calias|cb|ceil|chan(nel)?|chat|chr|click|cnick|colou?r|com(call|chan|press|val)?|cosh?|count(cs)?|cpuload|crc|ctime|date|dccignore|dde|decode|decompress|decrypt|deltok|dialog|did(reg|tok|wm)?|disk(menu)?|dll(call)?|dns|dockpanels|download|duration|editbox(history)?|emoticons|encode|encodingmenu|encrypt|envvar|eval(next)?|eventtarget|exec|exists|fgetc|file|find(dir|file|tok(cs)?)|fline|floor|font|fopen|fread|fserve?|get(dir|dot|tok)?|gfx(ram)?|gmt|group|hash|height|hexcolor|hfind|hget|highlight|hmac|hmatch|hnick|hotlink|hotp|hregex|hypot|ial(chan)?|ibl|iel|ignore|iil|inellipse|ini(ck|topic)?|inpoly|input|in(round)?rect|insert|instok|int(ersect)?|invitemenu|iptype|iql|ircv3caps|is(alias|bit|dde|dir|file|lower|tok(cs)?|upper|utf)|keylocked|left|len|level|line(height|s)?|link|lock|lo(f|g(10)?)|long(fn|ip)|loop|lower|maddress|mask|matchtok(cs)?|md5|menuicon|mid|mk(log|nick)?fn|mode|mp3|msfile|msgtags|nadmnick|(nh)?nick|no(file|p?nick|t(ags|ify)?|path|qt)?|numtok|nvnick|ocolor|onpoly|op?nick|ord?|pic|play|plugins|portfree|pos(cs)?|powmod|prefix(emote|user)|puttok|qt|query|r(ands?|ead(ini)?|egml(ex)?|em(ove(cs)?|tok(cs)?)|eplace(cs|x(cs)?)?|eptok(cs)?|gb|ight|ound|nick)?|samepath|scid|scon|screen(b|hz?|shot|w)?|script|sdir|send|server(vars)?|sfile|sha(1|2|256|384|512)|shortfn|sinh|slapsmenu|sline|snick|sock|sorttok(cs)?|sound|speak|spellcheck|sqrt|statusbar|str(ip)?|style|submenu|sysdir|tanh|timer|tip|token|toolbar|topicbox|totp|trust|ulist|unsafe|upper|uptime|url(get)?|utf(de|en)code|var|vc(md)?|vol|width|wildtok(cs)?|window|wmiquery|wrap|xor|zip))\\(",
           "end": "(?i)\\)(?:\\.([^\\s|\\)|,]+))?",
           "patterns": [
             {
@@ -565,18 +568,18 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.other.identifier.mrc"
+              "name": "keyword.other.identifier.msl"
             }
           },
           "endCaptures": {
             "1": {
-              "name": "keyword.other.identifier.property.mrc"
+              "name": "keyword.other.identifier.property.msl"
             }
           }
         },
         {
-          "begin": "(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)(\\$\\$?~?calc)\\(",
-          "end": "(?i)\\)(?:\\.([^\\s|\\)|,]+))?",
+          "begin": "(?i)(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)(\\$\\$?~?calc)\\(",
+          "end": "\\)",
           "patterns": [
             {
               "include": "#parameters"
@@ -587,18 +590,13 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.other.identifier.mrc"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "keyword.other.identifier.property.mrc"
+              "name": "keyword.other.identifier.msl"
             }
           }
         },
         {
-          "begin": "(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)(\\$\\$?~?iif)\\(",
-          "end": "(?i)\\)(?:\\.([^\\s|\\)|,]+))?",
+          "begin": "(?i)(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)(\\$\\$?~?iif)\\(",
+          "end": "\\)",
           "patterns": [
             {
               "include": "#conditionals_content"
@@ -609,12 +607,29 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.other.identifier.mrc"
+              "name": "keyword.other.identifier.msl"
             }
-          },
-          "endCaptures": {
+          }
+        },
+        {
+          "begin": "(?i)(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)(\\$\\$?~?reg(?:ex|sub(?:ex)?))\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "match": "(\\/(?:(?!\\/[gimsxAEDUuXSF]+?\\)).)*\\/([gimsxAEDUuXSF]+)?)",
+              "captures": {
+                "1": {
+                  "name": "string.regexp.msl"
+                }
+              }
+            },
+            {
+              "include": "#parameters"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "keyword.other.identifier.property.mrc"
+              "name": "keyword.other.identifier.msl"
             }
           }
         },
@@ -628,12 +643,12 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "support.function.name.mrc"
+              "name": "support.function.name.msl"
             }
           },
           "endCaptures": {
             "1": {
-              "name": "keyword.other.identifier.property.mrc"
+              "name": "keyword.other.identifier.property.msl"
             }
           }
         }
@@ -642,7 +657,7 @@
     "menu": {
       "patterns": [
         {
-          "name": "meta.menu.code.mrc",
+          "name": "meta.menu.code.msl",
           "begin": "(?i)^(menu)\\x20+((?:status|channel|query|nicklist|menubar|(?:channel)?link|@[^\\x20,]+|\\*)(?:,(?:status|channel|query|nicklist|menubar|(?:channel)?link|@[^\\x20,]+))*|\\*)\\x20+{",
           "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|}$",
           "patterns": [
@@ -652,10 +667,10 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "storage.type.menu.mrc"
+              "name": "storage.type.menu.msl"
             },
             "2": {
-              "name": "storage.modifier.function.mrc"
+              "name": "storage.modifier.function.msl"
             }
           }
         }
@@ -670,7 +685,7 @@
           "include": "#parameters"
         },
         {
-          "begin": "(?:^\\x20*|\\G)\\x20*(?:\\.+)?((?:mouse|(?:s|d(?:r|m)?|u|r|lb|m)click)|leave|drop)(?:\\x20*:\\x20*)?",
+          "begin": "(?:^\\s*|\\G)\\x20*((?:mouse|(?:s|d(?:r|m)?|u|r|lb|m)click)|leave|drop)(?:\\x20*:\\x20*)?",
           "end": "(?=\\z|\\x20}|$)",
           "patterns": [
             {
@@ -679,12 +694,12 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.other.menu.item.mrc"
+              "name": "keyword.other.menu.item.msl"
             }
           }
         },
         {
-          "begin": "^\\x20*",
+          "begin": "^\\x20*(?!$)",
           "end": "(?=\\z|\\x20}|$)",
           "patterns": [
             {
@@ -719,7 +734,7 @@
     "switches": {
       "patterns": [
         {
-          "name": "keyword.other.switch.mrc",
+          "name": "keyword.other.switch.msl",
           "match": "(?\u003c=\\x20)[-+][[:alnum:]]+(?=\\s)"
         }
       ]
@@ -727,11 +742,11 @@
     "variables": {
       "patterns": [
         {
-          "name": "variable.other.normal.mrc",
+          "name": "variable.other.normal.msl",
           "match": "(?\u003c![^(,\\x20!])(%)[^\\x20),]+"
         },
         {
-          "name": "variable.other.binary.mrc",
+          "name": "variable.other.binary.msl",
           "match": "(?\u003c![^(,\\x20!])(\u0026)[^\\x20),]+"
         }
       ]