| @@ -104,16 +104,8 @@ | ||
| 104 | 104 | "close-bracket": { |
| 105 | 105 | "match": "(?x)\\]", |
| 106 | 106 | "name": "punctuation.squarebracket.close.ql" |
| 107 | 107 | }, |
| 108 | - "open-angle": { | |
| 109 | - "match": "(?x)<", | |
| 110 | - "name": "punctuation.anglebracket.open.ql" | |
| 111 | - }, | |
| 112 | - "close-angle": { | |
| 113 | - "match": "(?x)>", | |
| 114 | - "name": "punctuation.anglebracket.close.ql" | |
| 115 | - }, | |
| 116 | 108 | "operator-or-punctuation": { |
| 117 | 109 | "patterns": [ |
| 118 | 110 | { |
| 119 | 111 | "include": "#relational-operator" |
| @@ -155,14 +147,8 @@ | ||
| 155 | 147 | "include": "#open-bracket" |
| 156 | 148 | }, |
| 157 | 149 | { |
| 158 | 150 | "include": "#close-bracket" |
| 159 | - }, | |
| 160 | - { | |
| 161 | - "include": "#open-angle" | |
| 162 | - }, | |
| 163 | - { | |
| 164 | - "include": "#close-angle" | |
| 165 | 151 | } |
| 166 | 152 | ] |
| 167 | 153 | }, |
| 168 | 154 | "dont-care": { |
| @@ -544,12 +530,8 @@ | ||
| 544 | 530 | "abstract": { |
| 545 | 531 | "match": "(?x)\\b(?:abstract)(?:(?!(?:[0-9A-Za-z_])))", |
| 546 | 532 | "name": "storage.modifier.abstract.ql" |
| 547 | 533 | }, |
| 548 | - "additional": { | |
| 549 | - "match": "(?x)\\b(?:additional)(?:(?!(?:[0-9A-Za-z_])))", | |
| 550 | - "name": "storage.modifier.additional.ql" | |
| 551 | - }, | |
| 552 | 534 | "bindingset": { |
| 553 | 535 | "match": "(?x)\\b(?:bindingset)(?:(?!(?:[0-9A-Za-z_])))", |
| 554 | 536 | "name": "storage.modifier.bindingset.ql" |
| 555 | 537 | }, |
| @@ -556,12 +538,8 @@ | ||
| 556 | 538 | "cached": { |
| 557 | 539 | "match": "(?x)\\b(?:cached)(?:(?!(?:[0-9A-Za-z_])))", |
| 558 | 540 | "name": "storage.modifier.cached.ql" |
| 559 | 541 | }, |
| 560 | - "default": { | |
| 561 | - "match": "(?x)\\b(?:default)(?:(?!(?:[0-9A-Za-z_])))", | |
| 562 | - "name": "storage.modifier.default.ql" | |
| 563 | - }, | |
| 564 | 542 | "deprecated": { |
| 565 | 543 | "match": "(?x)\\b(?:deprecated)(?:(?!(?:[0-9A-Za-z_])))", |
| 566 | 544 | "name": "storage.modifier.deprecated.ql" |
| 567 | 545 | }, |
| @@ -610,11 +588,8 @@ | ||
| 610 | 588 | { |
| 611 | 589 | "include": "#abstract" |
| 612 | 590 | }, |
| 613 | 591 | { |
| 614 | - "include": "#additional" | |
| 615 | - }, | |
| 616 | - { | |
| 617 | 592 | "include": "#bindingset" |
| 618 | 593 | }, |
| 619 | 594 | { |
| 620 | 595 | "include": "#cached" |
| @@ -619,11 +594,8 @@ | ||
| 619 | 594 | { |
| 620 | 595 | "include": "#cached" |
| 621 | 596 | }, |
| 622 | 597 | { |
| 623 | - "include": "#default" | |
| 624 | - }, | |
| 625 | - { | |
| 626 | 598 | "include": "#deprecated" |
| 627 | 599 | }, |
| 628 | 600 | { |
| 629 | 601 | "include": "#external" |
| @@ -672,8 +644,17 @@ | ||
| 672 | 644 | "begin": "(?x)(?<=/\\*\\*)([^*]|\\*(?!/))*$", |
| 673 | 645 | "while": "(?x)(^|\\G)\\s*([^*]|\\*(?!/))(?=([^*]|[*](?!/))*$)", |
| 674 | 646 | "patterns": [ |
| 675 | 647 | { |
| 648 | + "include": "text.html.markdown#fenced_code_block" | |
| 649 | + }, | |
| 650 | + { | |
| 651 | + "include": "text.html.markdown#lists" | |
| 652 | + }, | |
| 653 | + { | |
| 654 | + "include": "text.html.markdown#inline" | |
| 655 | + }, | |
| 656 | + { | |
| 676 | 657 | "match": "(?x)\\G\\s* (@\\S+)", |
| 677 | 658 | "name": "keyword.tag.ql" |
| 678 | 659 | } |
| 679 | 660 | ] |
| @@ -730,51 +711,18 @@ | ||
| 730 | 711 | "include": "#annotation" |
| 731 | 712 | } |
| 732 | 713 | ] |
| 733 | 714 | }, |
| 734 | - "instantiation-args": { | |
| 735 | - "name": "meta.type.parameters.ql", | |
| 736 | - "patterns": [ | |
| 737 | - { | |
| 738 | - "include": "#instantiation-args" | |
| 739 | - }, | |
| 740 | - { | |
| 741 | - "include": "#non-context-sensitive" | |
| 742 | - }, | |
| 743 | - { | |
| 744 | - "match": "(?x)(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))", | |
| 715 | + "import-directive": { | |
| 716 | + "end": "(?x)(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))) (?!\\s*(\\.|\\:\\:))", | |
| 717 | + "endCaptures": { | |
| 718 | + "0": { | |
| 745 | 719 | "name": "entity.name.type.namespace.ql" |
| 746 | 720 | } |
| 747 | - ], | |
| 748 | - "begin": "(?x)((?:<))", | |
| 749 | - "beginCaptures": { | |
| 750 | - "1": { | |
| 751 | - "patterns": [ | |
| 752 | - { | |
| 753 | - "include": "#open-angle" | |
| 754 | - } | |
| 755 | - ] | |
| 756 | - } | |
| 757 | 721 | }, |
| 758 | - "end": "(?x)((?:>))", | |
| 759 | - "endCaptures": { | |
| 760 | - "1": { | |
| 761 | - "patterns": [ | |
| 762 | - { | |
| 763 | - "include": "#close-angle" | |
| 764 | - } | |
| 765 | - ] | |
| 766 | - } | |
| 767 | - } | |
| 768 | - }, | |
| 769 | - "import-directive": { | |
| 770 | - "end": "(?x)(?<!\\bimport)(?<=(?:\\>)|[A-Za-z0-9_]) (?!\\s*(\\.|\\:\\:|\\,|(?:<)))", | |
| 771 | 722 | "name": "meta.block.import-directive.ql", |
| 772 | 723 | "patterns": [ |
| 773 | 724 | { |
| 774 | - "include": "#instantiation-args" | |
| 775 | - }, | |
| 776 | - { | |
| 777 | 725 | "include": "#non-context-sensitive" |
| 778 | 726 | }, |
| 779 | 727 | { |
| 780 | 728 | "match": "(?x)(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))", |
| @@ -902,9 +850,9 @@ | ||
| 902 | 850 | "match": "(?x)(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))) (?=\\s*\\:\\:)", |
| 903 | 851 | "name": "entity.name.type.namespace.ql" |
| 904 | 852 | }, |
| 905 | 853 | "predicate-or-field-declaration": { |
| 906 | - "begin": "(?x)(?:(?=(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))))(?!(?:(?:(?:\\b(?:_)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:and)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:any)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:asc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:avg)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:by)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:class)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:concat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:count)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:desc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:else)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:exists)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:extends)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:false)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forall)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forex)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:if)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:implies)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:import)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:in)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:instanceof)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:max)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:min)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:module)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:newtype)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:none)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:not)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:or)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:order)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:rank)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:result)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictconcat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictcount)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictsum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:sum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:super)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:then)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:this)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:true)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:unique)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_]))))))|(?:(?:(?:\\b(?:abstract)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:additional)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:bindingset)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:cached)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:default)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:deprecated)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:external)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:final)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:language)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:library)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:override)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:pragma)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:private)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:query)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:signature)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:transient)(?:(?!(?:[0-9A-Za-z_])))))))) | (?=(?:(?:(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))))) | (?=(?:@[a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))))", | |
| 854 | + "begin": "(?x)(?:(?=(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))))(?!(?:(?:(?:\\b(?:_)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:and)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:any)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:asc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:avg)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:by)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:class)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:concat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:count)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:desc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:else)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:exists)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:extends)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:false)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forall)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forex)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:if)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:implies)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:import)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:in)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:instanceof)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:max)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:min)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:module)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:newtype)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:none)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:not)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:or)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:order)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:rank)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:result)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictconcat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictcount)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictsum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:sum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:super)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:then)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:this)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:true)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:unique)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_]))))))|(?:(?:(?:\\b(?:abstract)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:bindingset)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:cached)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:deprecated)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:external)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:final)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:language)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:library)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:override)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:pragma)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:private)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:query)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:signature)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:transient)(?:(?!(?:[0-9A-Za-z_])))))))) | (?=(?:(?:(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))))) | (?=(?:@[a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))))", | |
| 907 | 855 | "end": "(?x)(?<=\\}|;)", |
| 908 | 856 | "name": "meta.block.predicate-or-field-declaration.ql", |
| 909 | 857 | "patterns": [ |
| 910 | 858 | { |