ultraviolet 0.10.0 → 0.10.1

data/syntax/pmwiki.syntax

@@ -0,0 +1,113 @@
+--- 
+name: PmWiki
+fileTypes: 
+- pmwiki
+scopeName: text.pmwiki
+uuid: B991CA22-EE93-410C-A4EB-7578D9CE6C8D
+patterns: 
+- name: keyword.control.line-break.pmwiki
+  match: \\\\$
+- name: keyword.control.line-break.pmwiki
+  match: \[\[<<\]\]
+- name: keyword.control.continue-line.pmwiki
+  match: \\$
+- name: markup.raw.monospace.pmwiki
+  begin: ^\s+
+  end: $
+  patterns: 
+  - include: text.pmwiki
+- name: meta.indented-paragraph.pmwiki
+  captures: 
+    "1": 
+      name: keyword.control.indented-paragraph.pmwiki
+  begin: ^(-+>)
+  end: $
+  patterns: 
+  - include: text.pmwiki
+- name: markup.heading.pmwiki
+  captures: 
+    "1": 
+      name: keyword.control.heading.pmwiki
+  begin: ^(!+)
+  end: $
+- name: markup.list.unnumbered.pmwiki
+  captures: 
+    "1": 
+      name: keyword.control.bullet-list.pmwiki
+  begin: ^(\*+)
+  end: $
+  patterns: 
+  - include: text.pmwiki
+- name: markup.list.numbered.pmwiki
+  captures: 
+    "1": 
+      name: keyword.control.number-list.pmwiki
+  begin: ^(#+)
+  end: $
+  patterns: 
+  - include: text.pmwiki
+- name: meta.term-definition.pmwiki
+  captures: 
+    "1": 
+      name: keyword.control.term-definition.pmwiki
+    "2": 
+      name: entity.name.type.term.pmwiki
+    "3": 
+      name: keyword.control.term-definition.pmwiki
+    "4": 
+      name: string.unquoted.definition.pmwiki
+  match: ^(:+)(.*)(:)(.*)$
+- name: meta.separator.pmwiki
+  match: ^-{4,}.*$
+- name: markup.italic.emphasis.pmwiki
+  begin: "''"
+  end: "''(?!')"
+  patterns: 
+  - include: text.pmwiki
+- name: markup.bold.strong.pmwiki
+  begin: "'''"
+  end: "'''"
+  patterns: 
+  - include: text.pmwiki
+- name: markup.raw.monospace.pmwiki
+  begin: "@@"
+  end: "@@"
+  patterns: 
+  - include: text.pmwiki
+- name: meta.style.larger.pmwiki
+  begin: \[\+
+  end: \+\]
+  patterns: 
+  - include: text.pmwiki
+- name: meta.style.smaller.pmwiki
+  begin: \[-
+  end: -\]
+  patterns: 
+  - include: text.pmwiki
+- name: meta.normal-word.pmwiki
+  match: `\w+
+- name: markup.underline.pmwiki
+  match: \b\u\w+\u\w+
+- name: meta.link.inline.pmwiki
+  begin: \[\[#
+  contentName: string.other.link.title.pmwiki
+  end: \]\]
+- name: meta.link.inline.pmwiki
+  captures: 
+    "1": 
+      name: markup.underline.link.pmwiki
+    "2": 
+      name: keyword.control.link.pmwiki
+    "3": 
+      name: string.other.link.title.pmwiki
+  match: \[\[(.*?)\s*(\||->)\s*(.*?)\]\]
+- name: meta.link.inline.pmwiki
+  captures: 
+    "1": 
+      name: markup.underline.link.pmwiki
+  match: \[\[(.*?)\]\]
+- name: markup.raw.verbatim-text.pmwiki
+  begin: \[=
+  end: =\]
+- include: text.html.basic
+keyEquivalent: ^~P

data/syntax/property_list.syntax

@@ -32,7 +32,8 @@ repository:
   openstep: 
     patterns: 
     - include: "#openstep_comment"
-    - include: "#openstep_plist"
+    - include: "#openstep_dictionary"
+    - include: "#openstep_array"
     - include: "#openstep_stray-char"
   xml_tags: 
     patterns: 
@@ -514,20 +515,9 @@ repository:
       patterns: 
       - include: "#openstep_string-contents"
     - name: constant.numeric.plist
-      match: "[-+]?\\d+(\\.\\d*)?(E[-+]\\d+)?"
+      match: "[-+]?\\d+(\\.\\d*)?(E[-+]\\d+)?(?!\\w)"
     - name: string.unquoted.plist
       match: "[-a-zA-Z0-9_.]+"
-  openstep_plist: 
-    name: meta.rule.plist.plist
-    captures: 
-      "0": 
-        name: punctuation.section.plist.plist
-    begin: \{
-    end: \}
-    patterns: 
-    - include: "#openstep_comment"
-    - include: "#openstep_name"
-    - include: "#openstep_stray-char"
   openstep_name: 
     patterns: 
     - name: meta.rule.named.plist
@@ -631,7 +621,7 @@ patterns:
   patterns: 
   - include: "#xml"
 - name: source.plist
-  begin: (?=\s*({|//|/\*))
+  begin: (?=\s*({|\(|//|/\*))
   end: \Z(?!\n)
   patterns: 
   - include: "#openstep"

data/syntax/python.syntax

@@ -15,7 +15,7 @@ repository:
     endCaptures: 
       "1": 
         name: punctuation.separator.parameters.python
-    begin: \b([a-zA-Z_][a-zA-Z_0-9]*)\s*(=)
+    begin: \b([a-zA-Z_][a-zA-Z_0-9]*)\s*(=)(?!=)
     beginCaptures: 
       "1": 
         name: variable.parameter.function.python
@@ -23,7 +23,7 @@ repository:
         name: keyword.operator.assignment.python
     end: \s*(?:(,)|(?=$\n?|[\)]))
     patterns: 
-    - include: $base
+    - include: $self
   generic_names: 
     match: "[A-Za-z_][A-Za-z0-9_]*"
   escaped_char: 
@@ -79,6 +79,7 @@ repository:
       - include: "#illegal_names"
       - include: "#magic_function_names"
       - include: "#magic_variable_names"
+      - include: "#language_variables"
       - include: "#generic_names"
   builtin_types: 
     name: support.type.python
@@ -483,6 +484,9 @@ repository:
       - include: "#constant_placeholder"
       - include: "#escaped_char"
       comment: double quoted string
+  language_variables: 
+    name: variable.language.python
+    match: \b(self|cls)\b
   escaped_unicode_char: 
     captures: 
       "1": 
@@ -597,7 +601,7 @@ patterns:
       contentName: entity.other.inherited-class.python
       end: \s*(?:(,)|(?=\)))
       patterns: 
-      - include: $base
+      - include: $self
 - name: meta.class.python
   endCaptures: 
     "1": 
@@ -688,7 +692,7 @@ patterns:
     end: (?=\))
     patterns: 
     - include: "#keyword_arguments"
-    - include: $base
+    - include: $self
   comment: a decorator may be a function call which returns a decorator.
 - name: meta.function.decorator.python
   begin: ^\s*(?=@\s*[A-Za-z_][A-Za-z0-9_]*(?:\.[a-zA-Z_][a-zA-Z_0-9]*)*)
@@ -714,7 +718,7 @@ patterns:
   end: (\))
   patterns: 
   - include: "#keyword_arguments"
-  - include: $base
+  - include: $self
 - name: meta.function-call.python
   endCaptures: 
     "1": 
@@ -734,7 +738,7 @@ patterns:
     end: (?=\))
     patterns: 
     - include: "#keyword_arguments"
-    - include: $base
+    - include: $self
 - name: meta.item-access.python
   begin: (?=[A-Za-z_][A-Za-z0-9_]*(?:\.[a-zA-Z_][a-zA-Z_0-9]*)*\s*\[)
   end: (\])
@@ -753,7 +757,7 @@ patterns:
         name: punctuation.definition.arguments.begin.python
     end: (?=\])
     patterns: 
-    - include: $base
+    - include: $self
 - name: meta.item-access.python
   endCaptures: 
     "1": 
@@ -765,7 +769,7 @@ patterns:
       name: punctuation.definition.arguments.begin.python
   end: (\])
   patterns: 
-  - include: $base
+  - include: $self
 - captures: 
     "1": 
       name: storage.type.function.python
@@ -775,8 +779,7 @@ patterns:
       name: storage.type.class.python
   match: \b(class)\b
 - include: "#line_continuation"
-- name: variable.language.python
-  match: \b(self|cls)\b
+- include: "#language_variables"
 - name: constant.language.python
   match: \b(None|True|False|Ellipsis|NotImplemented)\b
 - include: "#string_quoted_single"
@@ -785,7 +788,7 @@ patterns:
 - begin: (\()
   end: (\))
   patterns: 
-  - include: $base
+  - include: $self
 - captures: 
     "1": 
       name: punctuation.definition.list.begin.python
@@ -811,7 +814,7 @@ patterns:
     contentName: meta.structure.list.item.python
     end: \s*(?:(,)|(?=\]))
     patterns: 
-    - include: $base
+    - include: $self
 - name: meta.structure.tuple.python
   captures: 
     "1": 
@@ -847,7 +850,7 @@ patterns:
     contentName: meta.structure.dictionary.key.python
     end: \s*(?:(?=\})|(\:))
     patterns: 
-    - include: $base
+    - include: $self
   - endCaptures: 
       "1": 
         name: punctuation.separator.dictionary.python
@@ -855,7 +858,7 @@ patterns:
     contentName: meta.structure.dictionary.value.python
     end: \s*(?:(?=\})|(,))
     patterns: 
-    - include: $base
+    - include: $self
 foldingStopMarker: ^\s*$|^\s*\}|^\s*\]|^\s*\)|^\s*"""\s*$
 keyEquivalent: ^~P
 comment: "\n\

data/syntax/release_notes.syntax

@@ -20,11 +20,16 @@ patterns:
   patterns: 
   - name: markup.underline.link
     match: (https?|ftp|mailto):\S+?(?=[)>,.':;"]*(\s|$)|$)
-  - name: keyword.other.release-notes
-    captures: 
+  - captures: 
       "1": 
+        name: keyword.other.release-notes
+      "2": 
         name: punctuation.definition.keyword.release-notes
-    match: (\[)(NEW|FIXED|CHANGED|REMOVED|INFO)(\])
+      "3": 
+        name: punctuation.definition.keyword.release-notes
+      "4": 
+        name: constant.other.bundle-name.release-notes
+    match: ((\[)(?:NEW|FIXED|CHANGED|REMOVED|INFO)(\])) (?:(.+? bundle):)?
   - name: meta.ticket.release-notes
     captures: 
       "1": 
@@ -35,3 +40,7 @@ patterns:
   - name: meta.word.camel-case
     match: \b[A-Z]*[a-z]+[A-Z]\w*\b
     comment: "I do not want spell checking for CamelCase words. Since this is generally when quoting various API\xE2\x80\x99s, I have deliberately used A-Z and a-z (ASCII) -- Allan"
+  - captures: 
+      "1": 
+        name: constant.other.committer-name.release-notes
+    match: "\\((G(erd Knops|a(vin Kistner|rrett J. Woodworth)|ra(nt Hollingworth|eme Rocher))|R(yan McCuaig|ich Barton|o(ss Harmes|ger Braunstein|b(ert Rainthorpe| (Rix|Bevan))))|M(i(cha(il Pishchagin|el Sheets)|tch Chapman|etek B\xC4\x85k|k(e Mellor|ael S\xC3\xA4ker))|a(t(s Persson|t(hew Gilbert|eo Spinelli| Pelletier))|r(tin Str\xC3\xB6m|k Grimes)|x Williams))|B(ill Duenskie|ob Fleck|en(oit Gagnon|jamin Jackson| Perry)|arrett Clark|r(ian (Donovan|Lalor)|ett Terpstra|ad (Miller|Choate)))|H(enrik Nyh|adley Wickham)|S(t(ephen Skubik-Peplaski|\xC3\xA9phane Payrard|anley Rost)|imon (Gregory|Strandgaard)|u(ne Foldager|dara Williams)|ebastian Gr\xC3\xA4\xC3\x9Fl|am DeVore)|Nathan Youngman|C(h(a(ndler McWilliams|rilaos Skiadas)|ris(topher Forsythe| (Thomas|Jenkins)))|iar\xC3\xA1n Walsh)|T(homas Aylott|o(rsten Becker|m Lazar|bias Luetke)|akaaki Kato|roy Mcilvena)|Ian (Joyner|White)|Ollivier Robert|D(om(inique Peretti|enico Carbotta)|uane Johnson|a(n(iel Harple| Kelley)|vid (Glasser|Bonnet|Hansson|Powers|Wikler))|rew Colthorp)|J(iun Wei Chia|o(shua Emmons|nathan (Ragan-Kelley|Chaffer)|e Maller|achim M\xC3\xA5rtensson)|ustin French|eroen van der Ham|a(cob Rus|y Soffian|kub Ne\xC5\xA1et\xC5\x99il|m(is Buck|es (Edward Gray II|A. Baker))))|Paul(o Jorge Lopes de Moura| Bissex)|Eric Hsu|K(umar McMillan|evin Ballard)|F(ergus Bremner|abien POTENCIER|lorent Pillet|r(\xC3\xA9d\xC3\xA9ric Ball\xC3\xA9riaux|ank Brault))|Wil(son Miner|liam (D. Neumann|Prater))|A(n(thony Underwood|d(y Herbert|ers Thid|rew Henson))|dam Sanderson|urelio Marinho Jargas|parajita Fishman|l(e( Mu\xC3\xB1oz|xand(er John Ross|re Girard))|an Schussman|lan Odgaard)|mro Nasr))\\)$"

data/syntax/ruby_experimental.syntax

@@ -104,14 +104,14 @@ foldingStartMarker: "(?x)^\n\
   \t"
 patterns: 
 - name: meta.function-call.method.without-arguments.ruby
-  begin: (?<=[^\.]\.|::)(?=[a-zA-Z][a-zA-Z0-9_!?=]*[^a-zA-Z0-9_!?=])
-  end: (?<=[a-zA-Z0-9_!?=])(?=[^a-zA-Z0-9_!?=])
+  begin: (?<=[^\.]\.|::)(?=[a-zA-Z][a-zA-Z0-9_!?]*[^a-zA-Z0-9_!?])
+  end: (?<=[a-zA-Z0-9_!?])(?=[^a-zA-Z0-9_!?])
   patterns: 
   - include: "#known_function_names"
   - name: entity.name.function.ruby
-    match: ([a-zA-Z][a-zA-Z0-9_!?=]*)(?=[^a-zA-Z0-9_!?=])
+    match: ([a-zA-Z][a-zA-Z0-9_!?]*)(?=[^a-zA-Z0-9_!?])
 - name: meta.function-call.method.with-arguments.ruby
-  begin: (?<=[^\.])(?=(\.|::)[a-zA-Z][a-zA-Z0-9_!?=]*\()(\.|::)
+  begin: (?<=[^\.])(?=(\.|::)[a-zA-Z][a-zA-Z0-9_!?]*\()(\.|::)
   beginCaptures: 
     "1": 
       name: punctuation.separator.method.ruby
@@ -120,21 +120,21 @@ patterns:
   - include: "#nest_function_parens"
   - include: "#known_function_names"
   - name: entity.name.function.ruby
-    match: ([a-zA-Z][a-zA-Z0-9_!?=]*)(?=\()
+    match: ([a-zA-Z][a-zA-Z0-9_!?]*)(?=\()
   - include: $self
 - name: meta.function-call.ruby
-  begin: (?=[a-zA-Z0-9_!?=]+\()
+  begin: (?=[a-zA-Z0-9_!?]+\()
   end: (?<=\))
   patterns: 
   - include: "#nest_function_parens"
   - include: "#known_function_names"
   - name: entity.name.function.ruby
-    match: ([a-zA-Z0-9_!?=]+)(?=\()
+    match: ([a-zA-Z0-9_!?]+)(?=\()
   - include: $self
 - include: "#leading-space"
 - include: source.ruby
 - name: variable.other.ruby
-  match: ((?<=\W)\b|^)\w+\b(?=\s*([\]\)\}\=\+\-\*\/\^\$\:\,]|<\s|<<\s))
+  match: ((?<=\W)\b|^)\w+\b(?=\s*([\]\)\}\=\+\-\*\/\^\$\,]|<\s|<<\s))
   comment: This is kindof experimental. There really is no way to perfectly match all regular variables, but you can pretty well assume that any normal word in certain curcumstances that havnt already been scoped as something else are probably variables, and the advantages beat the potential errors
 foldingStopMarker: "(?x)\n\
   \t\t(   (^|;) \\s*+ end   \\s*+ ([#].*)? $\n\

data/syntax/standard_ml.syntax

@@ -2,7 +2,36 @@
 name: Standard ML
 fileTypes: 
 - sml
+- sig
 scopeName: source.ml
+repository: 
+  spec: 
+    patterns: 
+    - name: meta.spec.ml.type
+      captures: 
+        "1": 
+          name: keyword.other.ml
+      match: \b(type)\b
+    - name: meta.spec.ml.datatype
+      captures: 
+        "1": 
+          name: keyword.other.ml
+      match: \b(datatype)\b
+    - name: meta.spec.ml.val
+      captures: 
+        "1": 
+          name: keyword.other.ml
+      match: "\\b(val)\\s*\\w+:"
+    - name: meta.spec.ml.structure
+      captures: 
+        "1": 
+          name: keyword.other.ml
+      match: "\\b(structure)\\s*\\w+:"
+    - name: meta.spec.ml.include
+      captures: 
+        "1": 
+          name: keyword.other.ml
+      match: \b(include)\b
 uuid: 9B148AEA-F723-4EDE-8B7F-2F4FD730BC3A
 foldingStartMarker: \(\*|\b(struct|sig)\b
 patterns: 
@@ -13,10 +42,23 @@ patterns:
   begin: \(\*
   end: \*\)
 - name: keyword.other.ml
-  match: \b(val|type|datatype|structure|struct|signature|sig|functor|end|as|if|then|else|andalso|orelse|let|in|abstype|local|where|case|of|fn|raise|exception|handle)\b
-- captures: 
+  match: \b(val|datatype|struct|as|let|in|abstype|local|where|case|of|fn|raise|exception|handle|ref|infix)\b
+- name: meta.module.sigdec.ml
+  captures: 
     "1": 
-      name: keyword.other.ml
+      name: keyword.other.delimiter.ml
+    "2": 
+      name: keyword.other.delimiter.ml
+  begin: \b(sig)\b
+  end: \b(end)\b
+  patterns: 
+  - include: "#spec"
+- name: keyword.control.ml
+  match: \b(if|then|else)\b
+- name: meta.definition.fun.ml
+  captures: 
+    "1": 
+      name: keyword.control.fun.ml
     "2": 
       name: entity.name.function.ml
   match: \b(fun|and)\s+([\w']+)\b
@@ -41,5 +83,39 @@ patterns:
   match: (#")(\\)?.(")
 - name: constant.numeric.ml
   match: \b\d*\.?\d+\b
+- name: keyword.operator.logical.ml
+  match: \b(andalso|orelse|not)\b
+- name: meta.module.dec.ml
+  captures: 
+    "1": 
+      name: storage.type.module.binder.ml
+    "2": 
+      name: entity.name.type.module.ml
+  begin: |-
+    (?x)\b
+    					(functor|structure|signature|funsig)\s+
+    					(\w+)\s* # identifier
+  end: (?==|:)
+- name: keyword.other.module.ml
+  match: \b(open)\b
+- name: constant.language.ml
+  match: \b(nil|true|false|NONE|SOME)\b
+- name: meta.typeabbrev.ml
+  captures: 
+    "1": 
+      name: keyword.other.typeabbrev.ml
+    "2": 
+      name: variable.other.typename.ml
+  begin: ^\s*(type|eqtype) .* =
+  end: $
+  patterns: 
+  - name: meta.typeexp.ml
+    match: (([a-zA-Z0-9\.\* ]|(\->))*)
+- name: meta.type.ascription.ml
+  captures: 
+    "2": 
+      name: constant.other.type.ml
+  match: "[^:](:)\\s*(([a-zA-Z0-9\\.\\*\\_ ]|(\\->))*)"
+  comment: type annotation/ascription
 foldingStopMarker: \*\)|\bend\b
 keyEquivalent: ^~S