tm-grammars 1.22.19 → 1.23.0

package/grammars/qml.json

@@ -39,9 +39,9 @@
     "attributes-value": {
       "patterns": [
         {
-          "begin": "(?<=\\w)\\s*\\:\\s*(?=[A-Z]\\w*\\s*\\{)",
+          "begin": "(?<=\\w)\\s*:\\s*(?=[A-Z]\\w*\\s*\\{)",
           "description": "A QML object as value.",
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#object"
@@ -49,9 +49,9 @@
           ]
         },
         {
-          "begin": "(?<=\\w)\\s*\\:\\s*\\[",
+          "begin": "(?<=\\w)\\s*:\\s*\\[",
           "description": "A list as value.",
-          "end": "\\](.*)$",
+          "end": "](.*)$",
           "endCaptures": {
             "0": {
               "patterns": [
@@ -71,14 +71,14 @@
           ]
         },
         {
-          "begin": "(?<=\\w)\\s*\\:(?=\\s*\\{?\\s*$)",
+          "begin": "(?<=\\w)\\s*:(?=\\s*\\{?\\s*$)",
           "description": "A block of JavaScript code as value.",
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "begin": "\\{",
               "contentName": "meta.embedded.block.js",
-              "end": "\\}",
+              "end": "}",
               "patterns": [
                 {
                   "include": "source.js"
@@ -88,10 +88,10 @@
           ]
         },
         {
-          "begin": "(?<=\\w)\\s*\\:",
+          "begin": "(?<=\\w)\\s*:",
           "contentName": "meta.embedded.line.js",
           "description": "A JavaScript expression as value.",
-          "end": ";|$|(?=\\})",
+          "end": ";|$|(?=})",
           "patterns": [
             {
               "include": "source.js"
@@ -103,7 +103,7 @@
     "comment": {
       "patterns": [
         {
-          "begin": "(\\/\\/:)",
+          "begin": "(//:)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.qml.tr"
@@ -117,7 +117,7 @@
           ]
         },
         {
-          "begin": "(\\/\\/[~|=])\\s*([A-Za-z_$][\\w$.\\[\\]]*)",
+          "begin": "(//[~|=])\\s*([A-Za-z_$][\\w$.\\[\\]]*)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.qml.tr"
@@ -134,7 +134,7 @@
           ]
         },
         {
-          "begin": "(\\/\\/)",
+          "begin": "(//)",
           "beginCaptures": {
             "1": {
               "name": "comment.line.double-slash.qml"
@@ -148,13 +148,13 @@
           ]
         },
         {
-          "begin": "(\\/\\*)",
+          "begin": "(/\\*)",
           "beginCaptures": {
             "1": {
               "name": "comment.line.double-slash.qml"
             }
           },
-          "end": "(\\*\\/)",
+          "end": "(\\*/)",
           "endCaptures": {
             "1": {
               "name": "comment.line.double-slash.qml"
@@ -207,7 +207,7 @@
               "name": "variable.parameter.qml"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "include": "$self"
@@ -288,7 +288,7 @@
               "name": "storage.type.qml"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "begin": "([_a-zA-Z]\\w*)\\s*\\(",
@@ -307,7 +307,7 @@
             {
               "begin": "\\{",
               "contentName": "meta.embedded.block.js",
-              "end": "\\}",
+              "end": "}",
               "patterns": [
                 {
                   "include": "source.js"
@@ -327,7 +327,7 @@
               "name": "entity.name.type.qml"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "include": "$self"

package/grammars/qss.json

@@ -38,7 +38,7 @@
           "name": "support.constant.property-value.named-color.qss"
         },
         {
-          "match": "#([0-9a-fA-F]{3}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})\\b",
+          "match": "#(\\h{3}|\\h{6}|\\h{8})\\b",
           "name": "support.constant.property-value.color.qss"
         }
       ]
@@ -71,7 +71,7 @@
               "name": "entity.name.tag.qss"
             }
           },
-          "match": "(#)([a-zA-Z][a-zA-Z0-9_-]*)"
+          "match": "(#)([a-zA-Z][a-zA-Z0-9_\\-]*)"
         }
       ]
     },
@@ -117,7 +117,7 @@
       "patterns": [
         {
           "begin": "\\[",
-          "end": "\\]",
+          "end": "]",
           "patterns": [
             {
               "include": "#comment-block"
@@ -137,7 +137,7 @@
       "patterns": [
         {
           "begin": ":",
-          "end": ";|(?=\\})",
+          "end": ";|(?=})",
           "patterns": [
             {
               "include": "#comment-block"
@@ -146,7 +146,7 @@
               "include": "#color"
             },
             {
-              "begin": "\\b(qlineargradient|qradialgradient|qconicalgradient)\\s*\\(",
+              "begin": "\\b(q(?:lineargradient|radialgradient|conicalgradient))\\s*\\(",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.qss"
@@ -215,7 +215,7 @@
       "patterns": [
         {
           "begin": "\\{",
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "include": "#comment-block"
@@ -267,7 +267,7 @@
     "stylable-widgets": {
       "patterns": [
         {
-          "match": "\\b(QAbstractScrollArea|QAbstractItemView|QCheckBox|QColumnView|QComboBox|QDateEdit|QDateTimeEdit|QDialog|QDialogButtonBox|QDockWidget|QDoubleSpinBox|QFrame|QGroupBox|QHeaderView|QLabel|QLineEdit|QListView|QListWidget|QMainWindow|QMenu|QMenuBar|QMessageBox|QProgressBar|QPlainTextEdit|QPushButton|QRadioButton|QScrollBar|QSizeGrip|QSlider|QSpinBox|QSplitter|QStatusBar|QTabBar|QTabWidget|QTableView|QTableWidget|QTextEdit|QTimeEdit|QToolBar|QToolButton|QToolBox|QToolTip|QTreeView|QTreeWidget|QWidget)\\b",
+          "match": "\\b(Q(?:AbstractScrollArea|AbstractItemView|CheckBox|ColumnView|ComboBox|DateEdit|DateTimeEdit|Dialog|DialogButtonBox|DockWidget|DoubleSpinBox|Frame|GroupBox|HeaderView|Label|LineEdit|ListView|ListWidget|MainWindow|Menu|MenuBar|MessageBox|ProgressBar|PlainTextEdit|PushButton|RadioButton|ScrollBar|SizeGrip|Slider|SpinBox|Splitter|StatusBar|TabBar|TabWidget|TableView|TableWidget|TextEdit|TimeEdit|ToolBar|ToolButton|ToolBox|ToolTip|TreeView|TreeWidget|Widget))\\b",
           "name": "entity.name.type.qss"
         }
       ]

package/grammars/r.json

@@ -68,7 +68,7 @@
               "name": "punctuation.section.brackets.single.begin.r"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.brackets.single.end.r"
@@ -88,7 +88,7 @@
             }
           },
           "contentName": "meta.item-access.arguments.r",
-          "end": "\\]\\]",
+          "end": "]]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.brackets.double.end.r"
@@ -107,7 +107,7 @@
               "name": "punctuation.section.braces.begin.r"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.braces.end.r"
@@ -221,35 +221,35 @@
           "name": "constant.language.r"
         },
         {
-          "match": "\\b0(x|X)[0-9a-fA-F]+i\\b",
+          "match": "\\b0([xX])\\h+i\\b",
           "name": "constant.numeric.imaginary.hexadecimal.r"
         },
         {
-          "match": "\\b[0-9]+\\.?[0-9]*(?:(e|E)(\\+|-)?[0-9]+)?i\\b",
+          "match": "\\b[0-9]+\\.?[0-9]*(?:([eE])([+\\-])?[0-9]+)?i\\b",
           "name": "constant.numeric.imaginary.decimal.r"
         },
         {
-          "match": "\\.[0-9]+(?:(e|E)(\\+|-)?[0-9]+)?i\\b",
+          "match": "\\.[0-9]+(?:([eE])([+\\-])?[0-9]+)?i\\b",
           "name": "constant.numeric.imaginary.decimal.r"
         },
         {
-          "match": "\\b0(x|X)[0-9a-fA-F]+L\\b",
+          "match": "\\b0([xX])\\h+L\\b",
           "name": "constant.numeric.integer.hexadecimal.r"
         },
         {
-          "match": "\\b(?:[0-9]+\\.?[0-9]*)(?:(e|E)(\\+|-)?[0-9]+)?L\\b",
+          "match": "\\b[0-9]+\\.?[0-9]*(?:([eE])([+\\-])?[0-9]+)?L\\b",
           "name": "constant.numeric.integer.decimal.r"
         },
         {
-          "match": "\\b0(x|X)[0-9a-fA-F]+\\b",
+          "match": "\\b0([xX])\\h+\\b",
           "name": "constant.numeric.float.hexadecimal.r"
         },
         {
-          "match": "\\b[0-9]+\\.?[0-9]*(?:(e|E)(\\+|-)?[0-9]+)?\\b",
+          "match": "\\b[0-9]+\\.?[0-9]*(?:([eE])([+\\-])?[0-9]+)?\\b",
           "name": "constant.numeric.float.decimal.r"
         },
         {
-          "match": "\\.[0-9]+(?:(e|E)(\\+|-)?[0-9]+)?\\b",
+          "match": "\\.[0-9]+(?:([eE])([+\\-])?[0-9]+)?\\b",
           "name": "constant.numeric.float.decimal.r"
         }
       ]
@@ -292,7 +292,7 @@
               "name": "keyword.control.r"
             }
           },
-          "match": "((?:`[^`\\\\]*(?:\\\\.[^`\\\\]*)*`)|(?:[[:alpha:].][[:alnum:]._]*))\\s*(<?<-|=(?!=))\\s*(function|\\\\)(?!\\w)",
+          "match": "(`[^`\\\\]*(?:\\\\.[^`\\\\]*)*`|[[:alpha:].][[:alnum:]._]*)\\s*(<?<-|=(?!=))\\s*(function|\\\\)(?!\\w)",
           "name": "meta.function.r",
           "patterns": [
             {
@@ -375,7 +375,7 @@
           "name": "keyword.control.r"
         },
         {
-          "match": "(\\-|\\+|\\*|\\/|%\\/%|%%|%\\*%|%o%|%x%|\\^)",
+          "match": "([\\-+*/]|%/%|%%|%\\*%|%o%|%x%|\\^)",
           "name": "keyword.operator.arithmetic.r"
         },
         {
@@ -383,11 +383,11 @@
           "name": "keyword.operator.assignment.r"
         },
         {
-          "match": "(==|<=|>=|!=|<>|<|>|%in%)",
+          "match": "(==|<=|>=|!=|<>|[<>]|%in%)",
           "name": "keyword.operator.comparison.r"
         },
         {
-          "match": "(!|&{1,2}|[|]{1,2})",
+          "match": "(!|&{1,2}|\\|{1,2})",
           "name": "keyword.operator.logical.r"
         },
         {
@@ -395,11 +395,11 @@
           "name": "keyword.operator.pipe.r"
         },
         {
-          "match": "(%between%|%chin%|%like%|%\\+%|%\\+replace%|%:%|%do%|%dopar%|%>%|%<>%|%T>%|%\\$%)",
+          "match": "(%(?:between%|chin%|like%|\\+%|\\+replace%|:%|do%|dopar%|>%|<>%|T>%|\\$%))",
           "name": "keyword.operator.other.r"
         },
         {
-          "match": "(\\.\\.\\.|\\$|:|\\~|@)",
+          "match": "(\\.\\.\\.|[$:~@])",
           "name": "keyword.other.r"
         }
       ]