diff --git a/tests/__snapshots__/EditorTest__testOpenPHP__1.json b/tests/__snapshots__/EditorTest__testOpenPHP__1.json index 4d1b6fa..e7b6320 100644 --- a/tests/__snapshots__/EditorTest__testOpenPHP__1.json +++ b/tests/__snapshots__/EditorTest__testOpenPHP__1.json @@ -17,18 +17,18 @@ 3, 3, 9, - 4, - 4, - 4, - 4, - 4, - 4, - 4, - 4, - 4, - 4, - 4, - 4, + 12, + 12, + 12, + 12, + 12, + 12, + 12, + 12, + 12, + 12, + 12, + 12, 7, 6, 9, @@ -54,10 +54,10 @@ 3, 3, 0, - 0, - 0, - 0, - 0, + 12, + 12, + 12, + 12, 0, 9, 9 @@ -87,9 +87,9 @@ 3, 3, 0, - 0, - 0, - 0, + 12, + 12, + 12, 0, 3, 3, @@ -102,10 +102,10 @@ 3, 3, 0, - 0, - 0, - 0, - 0, + 12, + 12, + 12, + 12, 0, 9 ], @@ -338,23 +338,23 @@ 3, 3, 0, - 0, - 0, - 0, + 12, + 12, + 12, 9, - 4, - 4, - 4, + 12, + 12, + 12, 0, 8, 8, 7, 0, - 4, - 4, - 4, - 4, - 4, + 12, + 12, + 12, + 12, + 12, 0, 8, 8, @@ -383,24 +383,24 @@ 8, 7, 0, - 4, - 4, - 4, - 4, - 4, - 4, + 12, + 12, + 12, + 12, + 12, + 12, 0, 8, 8, 9, 7, 0, - 4, - 4, - 4, - 4, - 4, - 4, + 12, + 12, + 12, + 12, + 12, + 12, 7 ], "idx": 13 @@ -436,23 +436,23 @@ 3, 3, 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 12, + 12, + 12, + 12, + 12, + 12, + 12, + 12, + 12, 9, 9, 7, 0, - 4, - 4, - 4, - 4, + 12, + 12, + 12, + 12, 0, 9, 9 @@ -523,12 +523,12 @@ 3, 3, 0, - 0, - 0, - 0, - 0, - 0, - 0, + 12, + 12, + 12, + 12, + 12, + 12, 0, 3, 3, @@ -538,9 +538,9 @@ 3, 3, 0, - 0, - 0, - 0, + 12, + 12, + 12, 0, 3, 3, @@ -553,10 +553,10 @@ 3, 3, 0, - 0, - 0, - 0, - 0, + 12, + 12, + 12, + 12, 0, 9 ], @@ -585,23 +585,23 @@ 3, 3, 0, - 0, - 0, - 0, + 12, + 12, + 12, 9, - 4, - 4, - 4, + 12, + 12, + 12, 0, 8, 8, 7, 0, - 4, - 4, - 4, - 4, - 4, + 12, + 12, + 12, + 12, + 12, 0, 8, 8, @@ -630,12 +630,12 @@ 8, 7, 0, - 4, - 4, - 4, - 4, - 4, - 4, + 12, + 12, + 12, + 12, + 12, + 12, 0, 8, 8, @@ -654,12 +654,12 @@ 9, 7, 0, - 4, - 4, - 4, - 4, - 4, - 4 + 12, + 12, + 12, + 12, + 12, + 12 ], "idx": 22 }, @@ -693,22 +693,22 @@ 0, 7, 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 12, + 12, + 12, + 12, + 12, + 12, + 12, 9, 8, 8, 7, 0, - 4, - 4, - 4, - 4, + 12, + 12, + 12, + 12, 9, 7 ], @@ -822,37 +822,37 @@ 3, 3, 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 12, + 12, + 12, + 12, + 12, + 12, + 12, + 12, + 12, + 12, 9, - 4, - 4, - 4, + 12, + 12, + 12, 0, 8, 8, 7, 0, - 4, - 4, - 4, + 12, + 12, + 12, 0, 8, 8, 9, 7, 0, - 4, - 4, - 4 + 12, + 12, + 12 ], "idx": 30 }, @@ -886,13 +886,13 @@ 7, 7, 7, - 0, + 12, 7, 7, 7, - 0, - 0, - 0, + 12, + 12, + 12, 9, 9, 7 @@ -922,15 +922,15 @@ 8, 7, 7, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 12, + 12, + 12, + 12, + 12, + 12, + 12, + 12, + 12, 9, 9, 7 @@ -1124,9 +1124,9 @@ 3, 3, 0, - 0, - 0, - 0, + 12, + 12, + 12, 0, 9 ], @@ -1155,11 +1155,11 @@ 3, 3, 0, - 0, - 0, - 0, - 0, - 0, + 12, + 12, + 12, + 12, + 12, 9, 9, 7, @@ -1235,15 +1235,15 @@ 7, 7, 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 6, + 6, + 6, + 6, + 6, + 6, + 6, + 6, + 6, 7 ], "idx": 50 @@ -1406,14 +1406,14 @@ 7, 7, 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 6, + 6, + 6, + 6, + 6, + 6, + 6, + 6, 7 ], "idx": 54 @@ -1449,16 +1449,16 @@ 7, 7, 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 6, + 6, + 6, + 6, + 6, + 6, + 6, + 6, + 6, + 6, 7 ], "idx": 55 @@ -1497,19 +1497,19 @@ 7, 7, 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 6, + 6, + 6, + 6, + 6, + 6, + 6, + 6, + 6, + 6, + 6, + 6, + 6, 7 ], "idx": 56 @@ -1613,9 +1613,9 @@ 3, 0, 9, - 4, - 4, - 4, + 12, + 12, + 12, 0, 8, 8, @@ -1868,12 +1868,12 @@ 3, 3, 0, - 0, - 0, - 0, - 0, - 0, - 0, + 12, + 12, + 12, + 12, + 12, + 12, 9, 9, 7 @@ -2083,6 +2083,24 @@ ], "idx": 90 }, + { + "render": "#{Attribute]", + "hl": [ + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1 + ], + "idx": 91 + }, { "render": "$q = ($x !== 2)", "hl": [ @@ -2102,7 +2120,7 @@ 6, 9 ], - "idx": 91 + "idx": 92 }, { "render": " ? 'yes'", @@ -2119,7 +2137,7 @@ 5, 5 ], - "idx": 92 + "idx": 93 }, { "render": " : 'no';", @@ -2136,12 +2154,12 @@ 5, 7 ], - "idx": 93 + "idx": 94 }, { "render": "", "hl": [], - "idx": 94 + "idx": 95 }, { "render": "\/*", @@ -2149,7 +2167,7 @@ 2, 2 ], - "idx": 95 + "idx": 96 }, { "render": "Heredoc", @@ -2162,7 +2180,7 @@ 2, 2 ], - "idx": 96 + "idx": 97 }, { "render": "*\/$z = $x + $y;", @@ -2183,7 +2201,7 @@ 8, 7 ], - "idx": 97 + "idx": 98 }, { "render": "$sql = <<{x}<\/foo>", @@ -2350,7 +2368,7 @@ 5, 5 ], - "idx": 104 + "idx": 105 }, { "render": "TEMPLATE;", @@ -2365,12 +2383,12 @@ 9, 7 ], - "idx": 105 + "idx": 106 }, { "render": "", "hl": [], - "idx": 106 + "idx": 107 }, { "render": "?>", @@ -2378,7 +2396,7 @@ 9, 9 ], - "idx": 107 + "idx": 108 }, { "render": "", @@ -2399,7 +2417,7 @@ 0, 0 ], - "idx": 108 + "idx": 109 }, { "render": "", @@ -2421,7 +2439,7 @@ 0, 0 ], - "idx": 109 + "idx": 110 }, { "render": "", @@ -2433,7 +2451,7 @@ 0, 0 ], - "idx": 110 + "idx": 111 }, { "render": "HTML<\/title>", @@ -2458,7 +2476,7 @@ 0, 0 ], - "idx": 111 + "idx": 112 }, { "render": "<\/head>", @@ -2471,7 +2489,7 @@ 0, 0 ], - "idx": 112 + "idx": 113 }, { "render": "<body>", @@ -2483,7 +2501,7 @@ 0, 0 ], - "idx": 113 + "idx": 114 }, { "render": "<h1><?= $_SERVER['HTTP_HOST'] ?><\/h1>", @@ -2526,7 +2544,7 @@ 0, 0 ], - "idx": 114 + "idx": 115 }, { "render": "<\/body>", @@ -2539,7 +2557,7 @@ 0, 0 ], - "idx": 115 + "idx": 116 }, { "render": "<\/html>", @@ -2552,7 +2570,7 @@ 0, 0 ], - "idx": 116 + "idx": 117 }, { "render": "<?php exit(); ?>", @@ -2574,7 +2592,7 @@ 9, 9 ], - "idx": 117 + "idx": 118 } ], "dirty": 0, @@ -2591,82 +2609,7 @@ "keywords1": [ "?php", "$this", - "__halt_compiler", - "abstract", - "and", - "array", - "as", - "break", - "callable", - "case", - "catch", - "class", - "clone", - "const", - "continue", - "declare", - "default", - "die", - "do", - "echo", - "else", - "elseif", - "empty", - "enddeclare", - "endfor", - "endforeach", - "endif", - "endswitch", - "endwhile", - "eval", - "exit", - "extends", - "final", - "finally", - "for", - "foreach", - "function", - "global", - "goto", - "if", - "implements", - "include", - "include_once", - "instanceof", - "insteadof", - "interface", - "isset", - "list", - "namespace", - "new", - "or", - "print", - "private", - "protected", - "public", - "require", - "require_once", - "return", - "static", - "switch", - "throw", - "trait", - "try", - "unset", - "use", - "var", - "while", - "xor", - "yield", - "yield from", - "__CLASS__", - "__DIR__", - "__FILE__", - "__FUNCTION__", - "__LINE__", - "__METHOD__", - "__NAMESPACE__", - "__TRAIT__" + "__halt_compiler" ], "keywords2": [ "int", @@ -5943,83 +5886,23 @@ ], "92": [ { - "type": 315, - "typeName": "T_VARIABLE", - "char": "$q", + "type": 388, + "typeName": "T_COMMENT", + "char": "#{Attribute]", "line": 92 }, { "type": 393, "typeName": "T_WHITESPACE", - "char": " ", - "line": 92 - }, - { - "type": 61, - "typeName": "=", - "char": "=", - "line": 92 - }, - { - "type": 393, - "typeName": "T_WHITESPACE", - "char": " ", - "line": 92 - }, - { - "type": 40, - "typeName": "(", - "char": "(", - "line": 92 - }, - { - "type": 315, - "typeName": "T_VARIABLE", - "char": "$x", - "line": 92 - }, - { - "type": 393, - "typeName": "T_WHITESPACE", - "char": " ", - "line": 92 - }, - { - "type": 290, - "typeName": "T_IS_NOT_IDENTICAL", - "char": "!==", - "line": 92 - }, - { - "type": 393, - "typeName": "T_WHITESPACE", - "char": " ", - "line": 92 - }, - { - "type": 309, - "typeName": "T_LNUMBER", - "char": "2", - "line": 92 - }, - { - "type": 41, - "typeName": ")", - "char": ")", - "line": 92 - }, - { - "type": 393, - "typeName": "T_WHITESPACE", - "char": "\n ", + "char": "\n", "line": 92 } ], "93": [ { - "type": 63, - "typeName": "?", - "char": "?", + "type": 315, + "typeName": "T_VARIABLE", + "char": "$q", "line": 93 }, { @@ -6029,9 +5912,57 @@ "line": 93 }, { - "type": 318, - "typeName": "T_CONSTANT_ENCAPSED_STRING", - "char": "'yes'", + "type": 61, + "typeName": "=", + "char": "=", + "line": 93 + }, + { + "type": 393, + "typeName": "T_WHITESPACE", + "char": " ", + "line": 93 + }, + { + "type": 40, + "typeName": "(", + "char": "(", + "line": 93 + }, + { + "type": 315, + "typeName": "T_VARIABLE", + "char": "$x", + "line": 93 + }, + { + "type": 393, + "typeName": "T_WHITESPACE", + "char": " ", + "line": 93 + }, + { + "type": 290, + "typeName": "T_IS_NOT_IDENTICAL", + "char": "!==", + "line": 93 + }, + { + "type": 393, + "typeName": "T_WHITESPACE", + "char": " ", + "line": 93 + }, + { + "type": 309, + "typeName": "T_LNUMBER", + "char": "2", + "line": 93 + }, + { + "type": 41, + "typeName": ")", + "char": ")", "line": 93 }, { @@ -6043,9 +5974,9 @@ ], "94": [ { - "type": 58, - "typeName": ":", - "char": ":", + "type": 63, + "typeName": "?", + "char": "?", "line": 94 }, { @@ -6057,29 +5988,55 @@ { "type": 318, "typeName": "T_CONSTANT_ENCAPSED_STRING", - "char": "'no'", - "line": 94 - }, - { - "type": 59, - "typeName": ";", - "char": ";", + "char": "'yes'", "line": 94 }, { "type": 393, "typeName": "T_WHITESPACE", - "char": "\n\n", + "char": "\n ", "line": 94 } ], - "95": [], - "96": [ + "95": [ + { + "type": 58, + "typeName": ":", + "char": ":", + "line": 95 + }, + { + "type": 393, + "typeName": "T_WHITESPACE", + "char": " ", + "line": 95 + }, + { + "type": 318, + "typeName": "T_CONSTANT_ENCAPSED_STRING", + "char": "'no'", + "line": 95 + }, + { + "type": 59, + "typeName": ";", + "char": ";", + "line": 95 + }, + { + "type": 393, + "typeName": "T_WHITESPACE", + "char": "\n\n", + "line": 95 + } + ], + "96": [], + "97": [ { "type": 388, "typeName": "T_COMMENT", "char": "\/*", - "line": 96, + "line": 97, "original": { "string": "\/*\nHeredoc\n*\/", "lines": [ @@ -6090,93 +6047,25 @@ } } ], - "97": [ - { - "type": -1, - "typeName": "RAW", - "char": "Heredoc", - "line": 97 - } - ], "98": [ { "type": -1, "typeName": "RAW", - "char": "*\/", - "line": 98 - }, - { - "type": 315, - "typeName": "T_VARIABLE", - "char": "$z", - "line": 98 - }, - { - "type": 393, - "typeName": "T_WHITESPACE", - "char": " ", - "line": 98 - }, - { - "type": 61, - "typeName": "=", - "char": "=", - "line": 98 - }, - { - "type": 393, - "typeName": "T_WHITESPACE", - "char": " ", - "line": 98 - }, - { - "type": 315, - "typeName": "T_VARIABLE", - "char": "$x", - "line": 98 - }, - { - "type": 393, - "typeName": "T_WHITESPACE", - "char": " ", - "line": 98 - }, - { - "type": 43, - "typeName": "+", - "char": "+", - "line": 98 - }, - { - "type": 393, - "typeName": "T_WHITESPACE", - "char": " ", - "line": 98 - }, - { - "type": 315, - "typeName": "T_VARIABLE", - "char": "$y", - "line": 98 - }, - { - "type": 59, - "typeName": ";", - "char": ";", - "line": 98 - }, - { - "type": 393, - "typeName": "T_WHITESPACE", - "char": "\n", + "char": "Heredoc", "line": 98 } ], "99": [ + { + "type": -1, + "typeName": "RAW", + "char": "*\/", + "line": 99 + }, { "type": 315, "typeName": "T_VARIABLE", - "char": "$sql", + "char": "$z", "line": 99 }, { @@ -6197,11 +6086,79 @@ "char": " ", "line": 99 }, + { + "type": 315, + "typeName": "T_VARIABLE", + "char": "$x", + "line": 99 + }, + { + "type": 393, + "typeName": "T_WHITESPACE", + "char": " ", + "line": 99 + }, + { + "type": 43, + "typeName": "+", + "char": "+", + "line": 99 + }, + { + "type": 393, + "typeName": "T_WHITESPACE", + "char": " ", + "line": 99 + }, + { + "type": 315, + "typeName": "T_VARIABLE", + "char": "$y", + "line": 99 + }, + { + "type": 59, + "typeName": ";", + "char": ";", + "line": 99 + }, + { + "type": 393, + "typeName": "T_WHITESPACE", + "char": "\n", + "line": 99 + } + ], + "100": [ + { + "type": 315, + "typeName": "T_VARIABLE", + "char": "$sql", + "line": 100 + }, + { + "type": 393, + "typeName": "T_WHITESPACE", + "char": " ", + "line": 100 + }, + { + "type": 61, + "typeName": "=", + "char": "=", + "line": 100 + }, + { + "type": 393, + "typeName": "T_WHITESPACE", + "char": " ", + "line": 100 + }, { "type": 394, "typeName": "T_START_HEREDOC", "char": "<<<SQL", - "line": 99, + "line": 100, "original": { "string": "<<<SQL\n", "lines": [ @@ -6211,36 +6168,36 @@ } } ], - "100": [ + "101": [ { "type": 317, "typeName": "T_ENCAPSED_AND_WHITESPACE", "char": " SELECT * FROM \"foo\" WHERE \"bar\"='baz' AND id=", - "line": 100 + "line": 101 }, { "type": 397, "typeName": "T_CURLY_OPEN", "char": "{", - "line": 100 + "line": 101 }, { "type": 315, "typeName": "T_VARIABLE", "char": "$x", - "line": 100 + "line": 101 }, { "type": 125, "typeName": "}", "char": "}", - "line": 100 + "line": 101 }, { "type": 317, "typeName": "T_ENCAPSED_AND_WHITESPACE", "char": ";", - "line": 100, + "line": 101, "original": { "string": ";\n", "lines": [ @@ -6250,71 +6207,71 @@ } } ], - "101": [ + "102": [ { "type": 395, "typeName": "T_END_HEREDOC", "char": "SQL", - "line": 101 + "line": 102 }, { "type": 59, "typeName": ";", "char": ";", - "line": 101 + "line": 102 }, { "type": 393, "typeName": "T_WHITESPACE", "char": "\n\n", - "line": 101 + "line": 102 } ], - "102": [], - "103": [ + "103": [], + "104": [ { "type": 388, "typeName": "T_COMMENT", "char": "\/* Nowdoc *\/", - "line": 103 + "line": 104 }, { "type": 393, "typeName": "T_WHITESPACE", "char": "\n", - "line": 103 + "line": 104 } ], - "104": [ + "105": [ { "type": 315, "typeName": "T_VARIABLE", "char": "$template", - "line": 104 + "line": 105 }, { "type": 393, "typeName": "T_WHITESPACE", "char": " ", - "line": 104 + "line": 105 }, { "type": 61, "typeName": "=", "char": "=", - "line": 104 + "line": 105 }, { "type": 393, "typeName": "T_WHITESPACE", "char": " ", - "line": 104 + "line": 105 }, { "type": 394, "typeName": "T_START_HEREDOC", "char": "<<<'TEMPLATE'", - "line": 104, + "line": 105, "original": { "string": "<<<'TEMPLATE'\n", "lines": [ @@ -6324,12 +6281,12 @@ } } ], - "105": [ + "106": [ { "type": 317, "typeName": "T_ENCAPSED_AND_WHITESPACE", "char": " <foo>{x}<\/foo>", - "line": 105, + "line": 106, "original": { "string": " <foo>{x}<\/foo>\n", "lines": [ @@ -6339,33 +6296,33 @@ } } ], - "106": [ + "107": [ { "type": 395, "typeName": "T_END_HEREDOC", "char": "TEMPLATE", - "line": 106 + "line": 107 }, { "type": 59, "typeName": ";", "char": ";", - "line": 106 + "line": 107 }, { "type": 393, "typeName": "T_WHITESPACE", "char": "\n\n", - "line": 106 + "line": 107 } ], - "107": [], - "108": [ + "108": [], + "109": [ { "type": 392, "typeName": "T_CLOSE_TAG", "char": "?>", - "line": 108, + "line": 109, "original": { "string": "?>\n", "lines": [ @@ -6375,12 +6332,12 @@ } } ], - "109": [ + "110": [ { "type": 316, "typeName": "T_INLINE_HTML", "char": "<!DOCTYPE html>", - "line": 109, + "line": 110, "original": { "string": "<!DOCTYPE html>\n<html lang=\"en\">\n<head>\n<title>HTML<\/title>\n<\/head>\n<body>\n<h1>", "lines": [ @@ -6395,19 +6352,11 @@ } } ], - "110": [ - { - "type": -1, - "typeName": "RAW", - "char": "<html lang=\"en\">", - "line": 110 - } - ], "111": [ { "type": -1, "typeName": "RAW", - "char": "<head>", + "char": "<html lang=\"en\">", "line": 111 } ], @@ -6415,7 +6364,7 @@ { "type": -1, "typeName": "RAW", - "char": "<title>HTML<\/title>", + "char": "<head>", "line": 112 } ], @@ -6423,7 +6372,7 @@ { "type": -1, "typeName": "RAW", - "char": "<\/head>", + "char": "<title>HTML<\/title>", "line": 113 } ], @@ -6431,7 +6380,7 @@ { "type": -1, "typeName": "RAW", - "char": "<body>", + "char": "<\/head>", "line": 114 } ], @@ -6439,62 +6388,70 @@ { "type": -1, "typeName": "RAW", - "char": "<h1>", + "char": "<body>", "line": 115 + } + ], + "116": [ + { + "type": -1, + "typeName": "RAW", + "char": "<h1>", + "line": 116 }, { "type": 391, "typeName": "T_OPEN_TAG_WITH_ECHO", "char": "<?=", - "line": 115 + "line": 116 }, { "type": 393, "typeName": "T_WHITESPACE", "char": " ", - "line": 115 + "line": 116 }, { "type": 315, "typeName": "T_VARIABLE", "char": "$_SERVER", - "line": 115 + "line": 116 }, { "type": 91, "typeName": "[", "char": "[", - "line": 115 + "line": 116 }, { "type": 318, "typeName": "T_CONSTANT_ENCAPSED_STRING", "char": "'HTTP_HOST'", - "line": 115 + "line": 116 }, { "type": 93, "typeName": "]", "char": "]", - "line": 115 + "line": 116 }, { "type": 393, "typeName": "T_WHITESPACE", "char": " ", - "line": 115 + "line": 116 }, { "type": 392, "typeName": "T_CLOSE_TAG", "char": "?>", - "line": 115 + "line": 116 }, { "type": 316, "typeName": "T_INLINE_HTML", "char": "<\/h1>", - "line": 115, + "line": 116, "original": { "string": "<\/h1>\n<\/body>\n<\/html>\n", "lines": [ @@ -6506,64 +6463,64 @@ } } ], - "116": [ - { - "type": -1, - "typeName": "RAW", - "char": "<\/body>", - "line": 116 - } - ], "117": [ { "type": -1, "typeName": "RAW", - "char": "<\/html>", + "char": "<\/body>", "line": 117 } ], "118": [ + { + "type": -1, + "typeName": "RAW", + "char": "<\/html>", + "line": 118 + } + ], + "119": [ { "type": 390, "typeName": "T_OPEN_TAG", "char": "<?php ", - "line": 118 + "line": 119 }, { "type": 323, "typeName": "T_EXIT", "char": "exit", - "line": 118 + "line": 119 }, { "type": 40, "typeName": "(", "char": "(", - "line": 118 + "line": 119 }, { "type": 41, "typeName": ")", "char": ")", - "line": 118 + "line": 119 }, { "type": 59, "typeName": ";", "char": ";", - "line": 118 + "line": 119 }, { "type": 393, "typeName": "T_WHITESPACE", "char": " ", - "line": 118 + "line": 119 }, { "type": 392, "typeName": "T_CLOSE_TAG", "char": "?>", - "line": 118 + "line": 119 } ] }