diff --git a/.gitignore b/.gitignore index 08fd19b07..7a11f45cf 100644 --- a/.gitignore +++ b/.gitignore @@ -299,4 +299,5 @@ dist test-results.xml # Colorization test failure diffs -test/*.actual +test/**/*.actual +test/**/*.full-scope-result.txt diff --git a/test/colorization/inputs/deep-nested.FULL-SCOPE.json b/test/colorization/inputs/deep-nested.FULL-SCOPE.json new file mode 100644 index 000000000..ca9ffad9b --- /dev/null +++ b/test/colorization/inputs/deep-nested.FULL-SCOPE.json @@ -0,0 +1,184 @@ +{ + "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "location": { + "type": "string" + }, + "networkInterfaceName": { + "type": "string" + }, + "networkSecurityGroupName": { + "type": "string" + }, + "networkSecurityGroupRules": { + "type": "array" + }, + "subnetName": { + "type": "string" + }, + "virtualNetworkName": { + "type": "string" + }, + "addressPrefixes": { + "type": "array" + }, + "subnets": { + "type": "array" + }, + "publicIpAddressName": { + "type": "string" + }, + "publicIpAddressType": { + "type": "string" + }, + "publicIpAddressSku": { + "type": "string" + }, + "virtualMachineName": { + "type": "string" + }, + "osDiskType": { + "type": "string" + }, + "virtualMachineSize": { + "type": "string" + }, + "adminUsername": { + "type": "string" + }, + "adminPassword": { + "type": "secureString" + }, + "diagnosticsStorageAccountName": { + "type": "string" + } + }, + "variables": { + "$TEST": "['test1']", + "vnetId": "[resourceId(resourceGroup().name,'Microsoft.Network/virtualNetworks', parameters('virtualNetworkName'))]", + "subnetRef": "[concat(variables('vnetId'), '/subnets/', parameters('subnetName'))]" + }, + "resources": [ + { + "name": "[parameters('networkInterfaceName')]", + "type": "Microsoft.Network/networkInterfaces", + "apiVersion": "2018-10-01", + "location": "[parameters('location')]", + "dependsOn": [ + "[concat('Microsoft.Network/networkSecurityGroups/', parameters('networkSecurityGroupName'))]", + "[concat('Microsoft.Network/virtualNetworks/', parameters('virtualNetworkName'))]", + "[concat('Microsoft.Network/publicIpAddresses/', parameters('publicIpAddressName'))]" + ], + "properties": { + "ipConfigurations": [ + { + "name": "ipconfig1", + "properties": { + "subnet": { + "id": "[variables('subnetRef')]" + }, + "privateIPAllocationMethod": "Dynamic", + "publicIpAddress": { + "id": "[resourceId(resourceGroup().name, 'Microsoft.Network/publicIpAddresses', parameters('publicIpAddressName'))]" + } + } + } + ], + "networkSecurityGroup": { + "id": "[variables('nsgId')]" + } + }, + "tags": {} + }, + { + "name": "[parameters('networkSecurityGroupName')]", + "type": "Microsoft.Network/networkSecurityGroups", + "apiVersion": "2018-08-01", + "location": "[parameters('location')]", + "properties": { + "securityRules": "[parameters('networkSecurityGroupRules')]" + }, + "tags": {} + }, + { + "name": "[parameters('virtualNetworkName')]", + "type": "Microsoft.Network/virtualNetworks", + "apiVersion": "2018-08-01", + "location": "[parameters('location')]", + "properties": { + "addressSpace": { + "addressPrefixes": "[parameters('addressPrefixes')]" + }, + "subnets": "[parameters('subnets')]" + }, + "tags": {} + }, + { + "name": "[parameters('publicIpAddressName')]", + "type": "Microsoft.Network/publicIpAddresses", + "apiVersion": "2018-08-01", + "location": "[parameters('location')]", + "properties": { + "publicIpAllocationMethod": "[parameters('publicIpAddressType')]" + }, + "sku": { + "name": "[parameters('publicIpAddressSku')]" + }, + "tags": {} + }, + { + "name": "[parameters('virtualMachineName')]", + "type": "Microsoft.Compute/virtualMachines", + "apiVersion": "2018-06-01", + "location": "[parameters('location')]", + "dependsOn": [ + "[concat('Microsoft.Network/networkInterfaces/', parameters('networkInterfaceName'))]" + ], + "properties": { + "hardwareProfile": { + "vmSize": "[parameters('virtualMachineSize')]" + }, + "storageProfile": { + "osDisk": { + "createOption": "fromImage", + "managedDisk": { + "storageAccountType": "[parameters('osDiskType')]" + } + }, + "imageReference": { + "publisher": "Canonical", + "offer": "UbuntuServer", + "sku": "18.04-LTS", + "version": "latest" + } + }, + "networkProfile": { + "networkInterfaces": [ + { + "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaceName'))]" + } + ] + }, + "osProfile": { + "computerName": "[parameters('virtualMachineName')]", + "adminUsername": "[parameters('adminUsername')]", + "adminPassword": "[parameters('adminPassword')]" + }, + "diagnosticsProfile": { + "bootDiagnostics": { + "enabled": true, + "$TEST": "['test2']" + } + } + }, + "tags": {} + } + ], + "outputs": { + "adminUsername": { + "type": "string", + "value": "[parameters('adminUsername')]" + } + } +} diff --git a/test/colorization/inputs/variables.FULL-SCOPE.jsonc b/test/colorization/inputs/variables.FULL-SCOPE.jsonc new file mode 100644 index 000000000..e3ace0b9f --- /dev/null +++ b/test/colorization/inputs/variables.FULL-SCOPE.jsonc @@ -0,0 +1,9 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#", + + // With string literal - all same color (except parens) + "$TEST1": "[variables('myvar')]", + + // With expression - normal expression colors inside 'variables' + "$TEST2": "[variables(concat('myvar', 'a'))]" +} diff --git a/test/colorization/results/array-access.INVALID.json.txt b/test/colorization/results/array-access.INVALID.json.txt index fa14c20fe..5d2b44e2f 100644 --- a/test/colorization/results/array-access.INVALID.json.txt +++ b/test/colorization/results/array-access.INVALID.json.txt @@ -1,20 +1,20 @@ TEST STRING: "[a()]]" -"[ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -a source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -() source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -] source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.expected-expression.tle.arm -]" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +a {{scope-unknownfunction}} +() {{scope-parentheses-funccall}} +] invalid.illegal.expected-expression.tle.arm +]" {{scope-expression-end}} TEST STRING: "[a()[]]" -"[ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -a source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -() source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -[] source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.empty-array-access.tle.arm -]" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +a {{scope-unknownfunction}} +() {{scope-parentheses-funccall}} +[] invalid.illegal.empty-array-access.tle.arm +]" {{scope-expression-end}} TEST STRING: "[a()[ ]]" -"[ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -a source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -() source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -[ ] source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.empty-array-access.tle.arm -]" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +a {{scope-unknownfunction}} +() {{scope-parentheses-funccall}} +[ ] invalid.illegal.empty-array-access.tle.arm +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/array-access.jsonc.txt b/test/colorization/results/array-access.jsonc.txt index 2c475a2df..92bb0d74a 100644 --- a/test/colorization/results/array-access.jsonc.txt +++ b/test/colorization/results/array-access.jsonc.txt @@ -1,57 +1,57 @@ TEST STRING: "[my.var('array0')[1]]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -my source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespaceandfunction-dot}} -var source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-userfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -array0 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-number}} -] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +my {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +var {{scope-userfunction}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +array0 {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +[ {{scope-arrayaccess-brackets}} +1 {{scope-number}} +] {{scope-arrayaccess-brackets}} +]" {{scope-expression-end}} TEST STRING: "[a()[1][2]]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-number}} -] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -2 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-number}} -] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +a {{scope-unknownfunction}} +() {{scope-parentheses-funccall}} +[ {{scope-arrayaccess-brackets}} +1 {{scope-number}} +] {{scope-arrayaccess-brackets}} +[ {{scope-arrayaccess-brackets}} +2 {{scope-number}} +] {{scope-arrayaccess-brackets}} +]" {{scope-expression-end}} TEST STRING: "[my.func(1).array1[0]]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -my source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespaceandfunction-dot}} -func source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-userfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-dot}} -array1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-propname}} -[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -0 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-number}} -] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +my {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +func {{scope-userfunction}} +( {{scope-parentheses-funccall}} +1 {{scope-number}} +) {{scope-parentheses-funccall}} +. {{scope-propaccess-dot}} +array1 {{scope-propaccess-propname}} +[ {{scope-arrayaccess-brackets}} +0 {{scope-number}} +] {{scope-arrayaccess-brackets}} +]" {{scope-expression-end}} TEST STRING: "[my.var('array0')[copyIndex()]]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -my source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespaceandfunction-dot}} -var source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-userfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -array0 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -copyIndex source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-builtin}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +my {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +var {{scope-userfunction}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +array0 {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +[ {{scope-arrayaccess-brackets}} +copyIndex {{scope-builtin}} +() {{scope-parentheses-funccall}} +] {{scope-arrayaccess-brackets}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/brackets-in-string.jsonc.txt b/test/colorization/results/brackets-in-string.jsonc.txt index 862724d5d..45692ef55 100644 --- a/test/colorization/results/brackets-in-string.jsonc.txt +++ b/test/colorization/results/brackets-in-string.jsonc.txt @@ -1,6 +1,6 @@ TEST STRING: "['[hello]']" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-start}} -[hello] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-end}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +' {{scope-string-start}} +[hello] {{scope-string-contents}} +' {{scope-string-end}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/deep-nested.FULL-SCOPE.json.txt b/test/colorization/results/deep-nested.FULL-SCOPE.json.txt new file mode 100644 index 000000000..b82fd663a --- /dev/null +++ b/test/colorization/results/deep-nested.FULL-SCOPE.json.txt @@ -0,0 +1,13 @@ +TEST STRING: "['test1']" +"[ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-start}} +' source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-string-contents}} {{scope-string-start}} +test1 source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-string-contents}} +' source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-string-contents}} {{scope-string-end}} +]" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-end}} + +TEST STRING: "['test2']" +"[ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-start}} +' source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-string-contents}} {{scope-string-start}} +test2 source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-string-contents}} +' source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-string-contents}} {{scope-string-end}} +]" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/deep-nested.json.txt b/test/colorization/results/deep-nested.json.txt index b82fd663a..324c27777 100644 --- a/test/colorization/results/deep-nested.json.txt +++ b/test/colorization/results/deep-nested.json.txt @@ -1,13 +1,13 @@ TEST STRING: "['test1']" -"[ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-start}} -' source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-string-contents}} {{scope-string-start}} -test1 source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-string-contents}} -' source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-string-contents}} {{scope-string-end}} -]" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +' {{scope-string-start}} +test1 {{scope-string-contents}} +' {{scope-string-end}} +]" {{scope-expression-end}} TEST STRING: "['test2']" -"[ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-start}} -' source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-string-contents}} {{scope-string-start}} -test2 source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-string-contents}} -' source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-string-contents}} {{scope-string-end}} -]" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +' {{scope-string-start}} +test2 {{scope-string-contents}} +' {{scope-string-end}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/empty-expression.json.txt b/test/colorization/results/empty-expression.json.txt index 1a78bdd22..dddcc1bcc 100644 --- a/test/colorization/results/empty-expression.json.txt +++ b/test/colorization/results/empty-expression.json.txt @@ -1,3 +1,3 @@ TEST STRING: "[]" -"[ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -]" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/empty-expression.jsonc.txt b/test/colorization/results/empty-expression.jsonc.txt index db299d905..dddcc1bcc 100644 --- a/test/colorization/results/empty-expression.jsonc.txt +++ b/test/colorization/results/empty-expression.jsonc.txt @@ -1,3 +1,3 @@ TEST STRING: "[]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/empty-string.NOT-EXPR.json.txt b/test/colorization/results/empty-string.NOT-EXPR.json.txt index 01295751c..2cb72af60 100644 --- a/test/colorization/results/empty-string.NOT-EXPR.json.txt +++ b/test/colorization/results/empty-string.NOT-EXPR.json.txt @@ -1,3 +1,3 @@ TEST STRING: "" -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.end.json.arm \ No newline at end of file +" punctuation.definition.string.begin.json.arm +" punctuation.definition.string.end.json.arm \ No newline at end of file diff --git a/test/colorization/results/empty-string.NOT-EXPR.jsonc.txt b/test/colorization/results/empty-string.NOT-EXPR.jsonc.txt index acba67914..2cb72af60 100644 --- a/test/colorization/results/empty-string.NOT-EXPR.jsonc.txt +++ b/test/colorization/results/empty-string.NOT-EXPR.jsonc.txt @@ -1,3 +1,3 @@ TEST STRING: "" -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.end.json.arm \ No newline at end of file +" punctuation.definition.string.begin.json.arm +" punctuation.definition.string.end.json.arm \ No newline at end of file diff --git a/test/colorization/results/end-bracket-in-string.jsonc.txt b/test/colorization/results/end-bracket-in-string.jsonc.txt index dd15fbe40..9f1aaaa87 100644 --- a/test/colorization/results/end-bracket-in-string.jsonc.txt +++ b/test/colorization/results/end-bracket-in-string.jsonc.txt @@ -1,6 +1,6 @@ TEST STRING: "[']']" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-start}} -] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-end}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +' {{scope-string-start}} +] {{scope-string-contents}} +' {{scope-string-end}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/escaped-double-quote.jsonc.txt b/test/colorization/results/escaped-double-quote.jsonc.txt index 12e88ffb7..c01527627 100644 --- a/test/colorization/results/escaped-double-quote.jsonc.txt +++ b/test/colorization/results/escaped-double-quote.jsonc.txt @@ -1,21 +1,21 @@ TEST STRING: "['Hi,\"Mom\"']" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-start}} -Hi, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} -\" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-json-escape-chars}} -Mom source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} -\" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-json-escape-chars}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-end}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +' {{scope-string-start}} +Hi, {{scope-string-contents}} +\" {{scope-json-escape-chars}} +Mom {{scope-string-contents}} +\" {{scope-json-escape-chars}} +' {{scope-string-end}} +]" {{scope-expression-end}} TEST STRING: "['\\\r\n\b\t\f']" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-start}} -\\ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-json-escape-chars}} -\r source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-json-escape-chars}} -\n source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-json-escape-chars}} -\b source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-json-escape-chars}} -\t source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-json-escape-chars}} -\f source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-json-escape-chars}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-end}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +' {{scope-string-start}} +\\ {{scope-json-escape-chars}} +\r {{scope-json-escape-chars}} +\n {{scope-json-escape-chars}} +\b {{scope-json-escape-chars}} +\t {{scope-json-escape-chars}} +\f {{scope-json-escape-chars}} +' {{scope-string-end}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/expected-expression.INVALID.jsonc.txt b/test/colorization/results/expected-expression.INVALID.jsonc.txt index f34b49836..b94ee5688 100644 --- a/test/colorization/results/expected-expression.INVALID.jsonc.txt +++ b/test/colorization/results/expected-expression.INVALID.jsonc.txt @@ -1,19 +1,19 @@ TEST STRING: "[.]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.expected-expression.tle.arm -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +. invalid.illegal.expected-expression.tle.arm +]" {{scope-expression-end}} TEST STRING: "[,]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.expected-expression.tle.arm -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +, invalid.illegal.expected-expression.tle.arm +]" {{scope-expression-end}} TEST STRING: "[~]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -~ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.expected-expression.tle.arm -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +~ invalid.illegal.expected-expression.tle.arm +]" {{scope-expression-end}} TEST STRING: "[]]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.expected-expression.tle.arm -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +] invalid.illegal.expected-expression.tle.arm +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/expr-as-property-key.jsonc.txt b/test/colorization/results/expr-as-property-key.jsonc.txt index d2ca557e4..22b197dc2 100644 --- a/test/colorization/results/expr-as-property-key.jsonc.txt +++ b/test/colorization/results/expr-as-property-key.jsonc.txt @@ -1,62 +1,62 @@ -{ source.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.begin.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.begin.json.comments -$schema source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments support.type.property-name -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments punctuation.separator.dictionary.key-value.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.begin.json.arm +{ punctuation.definition.dictionary.begin.json.comments +" punctuation.support.type.property-name.begin.json.comments +$schema support.type.property-name +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +" punctuation.definition.string.begin.json.arm https://schema.management.azure.com/schemas/2018-05-01/deploymentTemplate.json# - source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.quoted.double.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.end.json.arm -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments punctuation.separator.dictionary.pair.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -resources source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm punctuation.definition.array.begin.json.arm -{ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.begin.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -apiVersion source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -2018-05-01 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.end.json.arm -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.pair.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -name source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.begin.json.arm + string.quoted.double.json.comments +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.comments +" punctuation.support.type.property-name.begin.json.comments +resources support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +[ punctuation.definition.array.begin.json.arm +{ punctuation.definition.dictionary.begin.json.arm +" punctuation.support.type.property-name.begin.json.arm +apiVersion support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +" punctuation.definition.string.begin.json.arm +2018-05-01 string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.arm +" punctuation.support.type.property-name.begin.json.arm +name support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +" punctuation.definition.string.begin.json.arm pid-c2d704c2-409b-401c-bd3e-3b0703bf255e - source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.end.json.arm -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.pair.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -type source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.begin.json.arm + string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.arm +" punctuation.support.type.property-name.begin.json.arm +type support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +" punctuation.definition.string.begin.json.arm Microsoft.Resources/deployments - source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.end.json.arm -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.pair.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -properties source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -{ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.begin.json.arm -// source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm comment.line.double-slash.js punctuation.definition.comment.json.arm -Expression as key source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm comment.line.double-slash.js -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.expression.tle.arm {{scope-expression-start}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.expression.tle.arm {{scope-string-contents}} {{scope-string-start}} -mode source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.expression.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.expression.tle.arm {{scope-string-contents}} {{scope-string-end}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.expression.tle.arm {{scope-expression-end}} -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -Incremental source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.end.json.arm -} source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.end.json.arm -} source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.end.json.arm -] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.array.json.arm punctuation.definition.array.end.json.arm -} source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments \ No newline at end of file + string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.arm +" punctuation.support.type.property-name.begin.json.arm +properties support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +{ punctuation.definition.dictionary.begin.json.arm +// punctuation.definition.comment.json.arm +Expression as key comment.line.double-slash.js +"[ {{scope-expression-start}} +' {{scope-string-start}} +mode {{scope-string-contents}} +' {{scope-string-end}} +]" {{scope-expression-end}} +: punctuation.separator.dictionary.key-value.json.arm +" punctuation.definition.string.begin.json.arm +Incremental string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm +} punctuation.definition.dictionary.end.json.arm +} punctuation.definition.dictionary.end.json.arm +] punctuation.definition.array.end.json.arm +} meta.arm-deployment-template.json.comments \ No newline at end of file diff --git a/test/colorization/results/expr-vs-string.is-expression.jsonc.txt b/test/colorization/results/expr-vs-string.is-expression.jsonc.txt index a0a67860f..2b9fca1af 100644 --- a/test/colorization/results/expr-vs-string.is-expression.jsonc.txt +++ b/test/colorization/results/expr-vs-string.is-expression.jsonc.txt @@ -1,72 +1,72 @@ TEST STRING: "['I said Hi! He''s here']" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-start}} -I said Hi! He source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} -'' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-escapedapostrophe}} -s here source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-end}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +' {{scope-string-start}} +I said Hi! He {{scope-string-contents}} +'' {{scope-escapedapostrophe}} +s here {{scope-string-contents}} +' {{scope-string-end}} +]" {{scope-expression-end}} TEST STRING: "['I said\"Hi! He''s here!\"']" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-start}} -I said source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} -\" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-json-escape-chars}} -Hi! He source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} -'' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-escapedapostrophe}} -s here! source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} -\" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-json-escape-chars}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-end}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +' {{scope-string-start}} +I said {{scope-string-contents}} +\" {{scope-json-escape-chars}} +Hi! He {{scope-string-contents}} +'' {{scope-escapedapostrophe}} +s here! {{scope-string-contents}} +\" {{scope-json-escape-chars}} +' {{scope-string-end}} +]" {{scope-expression-end}} TEST STRING: "[concat('This is a',1,'-line','expression',4,'you!')]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -concat source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -This is a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} --line source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -expression source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -4 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -you! source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +concat {{scope-builtin}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +This is a {{scope-string-contents}} +' {{scope-string-end}} +, {{scope-funcargs-separator}} +1 {{scope-number}} +, {{scope-funcargs-separator}} +' {{scope-string-start}} +-line {{scope-string-contents}} +' {{scope-string-end}} +, {{scope-funcargs-separator}} +' {{scope-string-start}} +expression {{scope-string-contents}} +' {{scope-string-end}} +, {{scope-funcargs-separator}} +4 {{scope-number}} +, {{scope-funcargs-separator}} +' {{scope-string-start}} +you! {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[concat('This is a',3,'-line','expression',4,'you!')]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -concat source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -This is a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -3 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} --line source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -expression source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -4 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -you! source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +concat {{scope-builtin}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +This is a {{scope-string-contents}} +' {{scope-string-end}} +, {{scope-funcargs-separator}} +3 {{scope-number}} +, {{scope-funcargs-separator}} +' {{scope-string-start}} +-line {{scope-string-contents}} +' {{scope-string-end}} +, {{scope-funcargs-separator}} +' {{scope-string-start}} +expression {{scope-string-contents}} +' {{scope-string-end}} +, {{scope-funcargs-separator}} +4 {{scope-number}} +, {{scope-funcargs-separator}} +' {{scope-string-start}} +you! {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} diff --git a/test/colorization/results/expr-vs-string.is-string.NOT-EXPR.jsonc.txt b/test/colorization/results/expr-vs-string.is-string.NOT-EXPR.jsonc.txt index be2a13d3b..9bbe8c2fb 100644 --- a/test/colorization/results/expr-vs-string.is-string.NOT-EXPR.jsonc.txt +++ b/test/colorization/results/expr-vs-string.is-string.NOT-EXPR.jsonc.txt @@ -1,46 +1,46 @@ TEST STRING: "[[2]]" -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -[[2]] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.end.json.arm +" punctuation.definition.string.begin.json.arm +[[2]] string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm TEST STRING: "[[[four]five]" -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -[[[four]five] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.end.json.arm +" punctuation.definition.string.begin.json.arm +[[[four]five] string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm TEST STRING: "[['I said\"Hi! He''s here!\"]" -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -[['I said source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm -\" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm constant.character.escape.json.arm -Hi! He''s here! source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm -\" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm constant.character.escape.json.arm -] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.end.json.arm +" punctuation.definition.string.begin.json.arm +[['I said string.quoted.double.json.arm +\" constant.character.escape.json.arm +Hi! He''s here! string.quoted.double.json.arm +\" constant.character.escape.json.arm +] string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm TEST STRING: "[pre]post" -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -[pre]post source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.end.json.arm +" punctuation.definition.string.begin.json.arm +[pre]post string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm TEST STRING: "[[three]four" -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -[[three]four source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.end.json.arm +" punctuation.definition.string.begin.json.arm +[[three]four string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm TEST STRING: "[starts with whitespace]" -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.begin.json.arm +" punctuation.definition.string.begin.json.arm [starts with whitespace] - source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.end.json.arm + string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm TEST STRING: "[ends with whitespace]" -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.begin.json.arm +" punctuation.definition.string.begin.json.arm [ends with whitespace] - source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.end.json.arm + string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm TEST STRING: "[ChefInSpec]InstalledApplicationLinuxResource1;AttributesYmlContent" -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.begin.json.arm +" punctuation.definition.string.begin.json.arm [ChefInSpec]InstalledApplicationLinuxResource1;AttributesYmlContent - source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.end.json.arm \ No newline at end of file + string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm diff --git a/test/colorization/results/expr-vs-string.multiline.NOT-EXPR.jsonc.txt b/test/colorization/results/expr-vs-string.multiline.NOT-EXPR.jsonc.txt index cc0973015..27edd2f14 100644 --- a/test/colorization/results/expr-vs-string.multiline.NOT-EXPR.jsonc.txt +++ b/test/colorization/results/expr-vs-string.multiline.NOT-EXPR.jsonc.txt @@ -1,17 +1,17 @@ TEST STRING: "[[2]]" -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -[[2 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm -]] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.end.json.arm +" punctuation.definition.string.begin.json.arm +[[2 string.quoted.double.json.arm +]] string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm TEST STRING: "[[[four]five]" -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -[[[four] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm -five] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.end.json.arm +" punctuation.definition.string.begin.json.arm +[[[four] string.quoted.double.json.arm +five] string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm TEST STRING: "[starts with whitespace]" -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.begin.json.arm +" punctuation.definition.string.begin.json.arm [starts with whitespace] - source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.end.json.arm \ No newline at end of file + string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm diff --git a/test/colorization/results/float.INVALID.jsonc.txt b/test/colorization/results/float.INVALID.jsonc.txt index 10749902f..0f3577e97 100644 --- a/test/colorization/results/float.INVALID.jsonc.txt +++ b/test/colorization/results/float.INVALID.jsonc.txt @@ -1,11 +1,11 @@ TEST STRING: "[1.]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-number}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.expected-expression.tle.arm -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +1 {{scope-number}} +. invalid.illegal.expected-expression.tle.arm +]" {{scope-expression-end}} TEST STRING: "[-.2]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} --. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.expected-expression.tle.arm -2 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-number}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +-. invalid.illegal.expected-expression.tle.arm +2 {{scope-number}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/float.jsonc.txt b/test/colorization/results/float.jsonc.txt index c6a3d110d..087ce463e 100644 --- a/test/colorization/results/float.jsonc.txt +++ b/test/colorization/results/float.jsonc.txt @@ -1,29 +1,29 @@ TEST STRING: "[1.1]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -1.1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-number}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +1.1 {{scope-number}} +]" {{scope-expression-end}} TEST STRING: "[-0.2]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} --0.2 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-number}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +-0.2 {{scope-number}} +]" {{scope-expression-end}} TEST STRING: "[-1.2e34]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} --1.2e34 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-number}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +-1.2e34 {{scope-number}} +]" {{scope-expression-end}} TEST STRING: "[1E2]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -1E2 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-number}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +1E2 {{scope-number}} +]" {{scope-expression-end}} TEST STRING: "[1E+2]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -1E+2 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-number}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +1E+2 {{scope-number}} +]" {{scope-expression-end}} TEST STRING: "[1E-2]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -1E-2 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-number}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +1E-2 {{scope-number}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/function-call-do-not-match-wellknown-prefix-from-id.jsonc.txt b/test/colorization/results/function-call-do-not-match-wellknown-prefix-from-id.jsonc.txt index e17d4d645..5f5530303 100644 --- a/test/colorization/results/function-call-do-not-match-wellknown-prefix-from-id.jsonc.txt +++ b/test/colorization/results/function-call-do-not-match-wellknown-prefix-from-id.jsonc.txt @@ -1,11 +1,11 @@ TEST STRING: "[reference2()]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -reference2 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +reference2 {{scope-unknownfunction}} +() {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[addme()]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -addme source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +addme {{scope-unknownfunction}} +() {{scope-parentheses-funccall}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/function-call-incomplete.jsonc.txt b/test/colorization/results/function-call-incomplete.jsonc.txt index e6ecd2e79..050a37e94 100644 --- a/test/colorization/results/function-call-incomplete.jsonc.txt +++ b/test/colorization/results/function-call-incomplete.jsonc.txt @@ -1,16 +1,16 @@ TEST STRING: "[sum]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -sum source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +sum {{scope-unknownfunction}} +]" {{scope-expression-end}} TEST STRING: "[reference]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -reference source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +reference {{scope-builtin}} +]" {{scope-expression-end}} TEST STRING: "[user.func]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -user source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespaceandfunction-dot}} -func source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-userfunction}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +user {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +func {{scope-userfunction}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/function-call-no-args.jsonc.txt b/test/colorization/results/function-call-no-args.jsonc.txt index bad7b8e72..2acb4697e 100644 --- a/test/colorization/results/function-call-no-args.jsonc.txt +++ b/test/colorization/results/function-call-no-args.jsonc.txt @@ -1,4 +1,4 @@ TEST STRING: "[max]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -max source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +max {{scope-builtin}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/function-call-simple-nested.INVALID.jsonc.txt b/test/colorization/results/function-call-simple-nested.INVALID.jsonc.txt index 3da442eb4..1c39671bc 100644 --- a/test/colorization/results/function-call-simple-nested.INVALID.jsonc.txt +++ b/test/colorization/results/function-call-simple-nested.INVALID.jsonc.txt @@ -1,12 +1,12 @@ TEST STRING: "[a)]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.expected-expression.tle.arm -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +a {{scope-unknownfunction}} +) invalid.illegal.expected-expression.tle.arm +]" {{scope-expression-end}} TEST STRING: "[b())]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -b source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.expected-expression.tle.arm -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +b {{scope-unknownfunction}} +() {{scope-parentheses-funccall}} +) invalid.illegal.expected-expression.tle.arm +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/function-call-simple-nested.jsonc.txt b/test/colorization/results/function-call-simple-nested.jsonc.txt index e38c3c678..f3eafc9d4 100644 --- a/test/colorization/results/function-call-simple-nested.jsonc.txt +++ b/test/colorization/results/function-call-simple-nested.jsonc.txt @@ -1,21 +1,21 @@ TEST STRING: "[a(b())]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -b source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-unknownfunction}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +a {{scope-unknownfunction}} +( {{scope-parentheses-funccall}} +b {{scope-unknownfunction}} +() {{scope-parentheses-funccall}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[max1(max2(max3()))]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -max1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -max2 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-unknownfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -max3 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-unknownfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +max1 {{scope-unknownfunction}} +( {{scope-parentheses-funccall}} +max2 {{scope-unknownfunction}} +( {{scope-parentheses-funccall}} +max3 {{scope-unknownfunction}} +( {{scope-parentheses-funccall}} +) {{scope-parentheses-funccall}} +) {{scope-parentheses-funccall}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/function-multiple-args-nested.jsonc.txt b/test/colorization/results/function-multiple-args-nested.jsonc.txt index 7381aff44..c9ded6761 100644 --- a/test/colorization/results/function-multiple-args-nested.jsonc.txt +++ b/test/colorization/results/function-multiple-args-nested.jsonc.txt @@ -1,38 +1,38 @@ TEST STRING: "[max(1,max(2,my.max(max(4,'5'),'6'),7),8,9,10)]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -max source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -max source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -2 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -my source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-usernamespaceandfunction-dot}} -max source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-userfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -max source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -4 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -5 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -6 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -7 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -8 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -9 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -10 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +max {{scope-builtin}} +( {{scope-parentheses-funccall}} +1 {{scope-number}} +, {{scope-funcargs-separator}} +max {{scope-builtin}} +( {{scope-parentheses-funccall}} +2 {{scope-number}} +, {{scope-funcargs-separator}} +my {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +max {{scope-userfunction}} +( {{scope-parentheses-funccall}} +max {{scope-builtin}} +( {{scope-parentheses-funccall}} +4 {{scope-number}} +, {{scope-funcargs-separator}} +' {{scope-string-start}} +5 {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +, {{scope-funcargs-separator}} +' {{scope-string-start}} +6 {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +, {{scope-funcargs-separator}} +7 {{scope-number}} +) {{scope-parentheses-funccall}} +, {{scope-funcargs-separator}} +8 {{scope-number}} +, {{scope-funcargs-separator}} +9 {{scope-number}} +, {{scope-funcargs-separator}} +10 {{scope-number}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/function-multiple-args.INVALID.jsonc.txt b/test/colorization/results/function-multiple-args.INVALID.jsonc.txt index 9abb32e87..30bea0014 100644 --- a/test/colorization/results/function-multiple-args.INVALID.jsonc.txt +++ b/test/colorization/results/function-multiple-args.INVALID.jsonc.txt @@ -1,21 +1,21 @@ TEST STRING: "[max(1;2)]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -max source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -; source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm invalid.illegal.expected-comma.tle.arm -2 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +max {{scope-builtin}} +( {{scope-parentheses-funccall}} +1 {{scope-number}} +; invalid.illegal.expected-comma.tle.arm +2 {{scope-number}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[max(1,min()))]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -max source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -min source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-builtin}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.expected-expression.tle.arm -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +max {{scope-builtin}} +( {{scope-parentheses-funccall}} +1 {{scope-number}} +, {{scope-funcargs-separator}} +min {{scope-builtin}} +() {{scope-parentheses-funccall}} +) {{scope-parentheses-funccall}} +) invalid.illegal.expected-expression.tle.arm +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/function-multiple-args.jsonc.txt b/test/colorization/results/function-multiple-args.jsonc.txt index 1eacac933..64f307f08 100644 --- a/test/colorization/results/function-multiple-args.jsonc.txt +++ b/test/colorization/results/function-multiple-args.jsonc.txt @@ -1,23 +1,23 @@ TEST STRING: "[max(1.2,-3,'a()')]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -max source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -1.2 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} --3 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -a() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +max {{scope-builtin}} +( {{scope-parentheses-funccall}} +1.2 {{scope-number}} +, {{scope-funcargs-separator}} +-3 {{scope-number}} +, {{scope-funcargs-separator}} +' {{scope-string-start}} +a() {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[max(1,2)]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -max source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -2 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +max {{scope-builtin}} +( {{scope-parentheses-funccall}} +1 {{scope-number}} +, {{scope-funcargs-separator}} +2 {{scope-number}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/function-single-arg.jsonc.txt b/test/colorization/results/function-single-arg.jsonc.txt index d52830107..61568bf08 100644 --- a/test/colorization/results/function-single-arg.jsonc.txt +++ b/test/colorization/results/function-single-arg.jsonc.txt @@ -1,43 +1,43 @@ TEST STRING: "[max(1.2)]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -max source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -1.2 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +max {{scope-builtin}} +( {{scope-parentheses-funccall}} +1.2 {{scope-number}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[me.say('hello')]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -me source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespaceandfunction-dot}} -say source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-userfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -hello source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +me {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +say {{scope-userfunction}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +hello {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[a(b())]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -b source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-unknownfunction}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +a {{scope-unknownfunction}} +( {{scope-parentheses-funccall}} +b {{scope-unknownfunction}} +() {{scope-parentheses-funccall}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[a.b(c('string'))]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespaceandfunction-dot}} -b source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-userfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -c source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-unknownfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -string source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +a {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +b {{scope-userfunction}} +( {{scope-parentheses-funccall}} +c {{scope-unknownfunction}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +string {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/function-types.jsonc.txt b/test/colorization/results/function-types.jsonc.txt index edbd8041a..66111ea99 100644 --- a/test/colorization/results/function-types.jsonc.txt +++ b/test/colorization/results/function-types.jsonc.txt @@ -1,43 +1,43 @@ TEST STRING: "[variables('a')]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -variables source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.variables-reference.tle.arm {{scope-variables}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.variables-reference.tle.arm {{scope-parentheses-funccall}} -'a' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.variables-reference.tle.arm {{scope-variable}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.variables-reference.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +variables {{scope-variables}} +( {{scope-parentheses-funccall}} +'a' {{scope-variable}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[parameters('b')]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -parameters source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.parameters-reference.tle.arm {{scope-parameters}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.parameters-reference.tle.arm {{scope-parentheses-funccall}} -'b' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.parameters-reference.tle.arm {{scope-parameter}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.parameters-reference.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +parameters {{scope-parameters}} +( {{scope-parentheses-funccall}} +'b' {{scope-parameter}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[my.parameters('c')]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -my source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespaceandfunction-dot}} -parameters source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-userfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -c source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +my {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +parameters {{scope-userfunction}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +c {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[max(1)]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -max source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +max {{scope-builtin}} +( {{scope-parentheses-funccall}} +1 {{scope-number}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[unknown(1)]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -unknown source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +unknown {{scope-unknownfunction}} +( {{scope-parentheses-funccall}} +1 {{scope-number}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/functions-case-insensitive.jsonc.txt b/test/colorization/results/functions-case-insensitive.jsonc.txt index 4d59e5cdc..3555139ee 100644 --- a/test/colorization/results/functions-case-insensitive.jsonc.txt +++ b/test/colorization/results/functions-case-insensitive.jsonc.txt @@ -1,39 +1,39 @@ TEST STRING: "[VARIables('a')]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -VARIables source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +VARIables {{scope-builtin}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +a {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[paraMETErs('b')]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -paraMETErs source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -b source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +paraMETErs {{scope-builtin}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +b {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[my.Parameters('c')]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -my source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespaceandfunction-dot}} -Parameters source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-userfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -c source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +my {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +Parameters {{scope-userfunction}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +c {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[mAX(1)]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -mAX source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +mAX {{scope-builtin}} +( {{scope-parentheses-funccall}} +1 {{scope-number}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/integer.INVALID.jsonc.txt b/test/colorization/results/integer.INVALID.jsonc.txt index 15f6ac41e..2c90352e3 100644 --- a/test/colorization/results/integer.INVALID.jsonc.txt +++ b/test/colorization/results/integer.INVALID.jsonc.txt @@ -1,9 +1,9 @@ TEST STRING: "[-]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -- source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.expected-expression.tle.arm -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +- invalid.illegal.expected-expression.tle.arm +]" {{scope-expression-end}} TEST STRING: "[+]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -+ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.expected-expression.tle.arm -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} ++ invalid.illegal.expected-expression.tle.arm +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/integer.jsonc.txt b/test/colorization/results/integer.jsonc.txt index 34ae57e3f..38a5ca2ae 100644 --- a/test/colorization/results/integer.jsonc.txt +++ b/test/colorization/results/integer.jsonc.txt @@ -1,29 +1,29 @@ TEST STRING: "[1]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-number}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +1 {{scope-number}} +]" {{scope-expression-end}} TEST STRING: "[0]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -0 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-number}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +0 {{scope-number}} +]" {{scope-expression-end}} TEST STRING: "[0123]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -0123 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-number}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +0123 {{scope-number}} +]" {{scope-expression-end}} TEST STRING: "[-123]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} --123 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-number}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +-123 {{scope-number}} +]" {{scope-expression-end}} TEST STRING: "[+1]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -+1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-number}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} ++1 {{scope-number}} +]" {{scope-expression-end}} TEST STRING: "[1]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-number}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +1 {{scope-number}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/invalid-expressions.INVALID.jsonc.txt b/test/colorization/results/invalid-expressions.INVALID.jsonc.txt index 8cbab05e2..2553284a0 100644 --- a/test/colorization/results/invalid-expressions.INVALID.jsonc.txt +++ b/test/colorization/results/invalid-expressions.INVALID.jsonc.txt @@ -1,4 +1,4 @@ TEST STRING: "[?]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -? source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.expected-expression.tle.arm -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +? invalid.illegal.expected-expression.tle.arm +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/multiline.jsonc.txt b/test/colorization/results/multiline.jsonc.txt index 6fb5b5295..eae6038be 100644 --- a/test/colorization/results/multiline.jsonc.txt +++ b/test/colorization/results/multiline.jsonc.txt @@ -1,42 +1,42 @@ TEST STRING: "[1]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-number}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +1 {{scope-number}} +]" {{scope-expression-end}} TEST STRING: "[parameters('array')[0].prop1]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -parameters source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.parameters-reference.tle.arm {{scope-parameters}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.parameters-reference.tle.arm {{scope-parentheses-funccall}} -'array' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.parameters-reference.tle.arm {{scope-parameter}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.parameters-reference.tle.arm {{scope-parentheses-funccall}} -[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -0 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-number}} -] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-dot}} -prop1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-propname}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +parameters {{scope-parameters}} +( {{scope-parentheses-funccall}} +'array' {{scope-parameter}} +) {{scope-parentheses-funccall}} +[ {{scope-arrayaccess-brackets}} +0 {{scope-number}} +] {{scope-arrayaccess-brackets}} +. {{scope-propaccess-dot}} +prop1 {{scope-propaccess-propname}} +]" {{scope-expression-end}} TEST STRING: "[my.func('string',123.432)]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -my source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespaceandfunction-dot}} -func source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-userfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -string source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -123.432 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-number}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +my {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +func {{scope-userfunction}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +string {{scope-string-contents}} +' {{scope-string-end}} +, {{scope-funcargs-separator}} +123.432 {{scope-number}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[parameters('array')[0]]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -parameters source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.parameters-reference.tle.arm {{scope-parameters}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.parameters-reference.tle.arm {{scope-parentheses-funccall}} -'array' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.parameters-reference.tle.arm {{scope-parameter}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.parameters-reference.tle.arm {{scope-parentheses-funccall}} -[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -0 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-number}} -] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +parameters {{scope-parameters}} +( {{scope-parentheses-funccall}} +'array' {{scope-parameter}} +) {{scope-parentheses-funccall}} +[ {{scope-arrayaccess-brackets}} +0 {{scope-number}} +] {{scope-arrayaccess-brackets}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/no-schema.NOT-ARM.jsonc.txt b/test/colorization/results/no-schema.NOT-ARM.jsonc.txt index 0410f07c2..db3e9d780 100644 --- a/test/colorization/results/no-schema.NOT-ARM.jsonc.txt +++ b/test/colorization/results/no-schema.NOT-ARM.jsonc.txt @@ -1,70 +1,70 @@ -/* source.json.comments comment.block.json.comments punctuation.definition.comment.json.comments +/* punctuation.definition.comment.json.comments Should be colorized exactly as plain JSONC ("[]" strings should be colorized as regular strings) - source.json.comments comment.block.json.comments -*/ source.json.comments comment.block.json.comments punctuation.definition.comment.json.comments -// source.json.comments comment.line.double-slash.js punctuation.definition.comment.json.comments -Another comment source.json.comments comment.line.double-slash.js -{ source.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.begin.json.comments -" source.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -parameters source.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments -" source.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -{ source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.begin.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -guid source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -{ source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.begin.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -type source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments punctuation.definition.string.begin.json.comments -string source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments punctuation.definition.string.end.json.comments -, source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.pair.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -defaultValue source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments punctuation.definition.string.begin.json.comments -[newGuid()] source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments punctuation.definition.string.end.json.comments -} source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.end.json.comments -} source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.end.json.comments -, source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.pair.json.comments -" source.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -variables source.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments -" source.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -{ source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.begin.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -defaultValue source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments punctuation.definition.string.begin.json.comments -[reference('a')] source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments punctuation.definition.string.end.json.comments -, source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.pair.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -number source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -1.23 source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments constant.numeric.json.comments -, source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.pair.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -emptyString source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments punctuation.definition.string.begin.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments punctuation.definition.string.end.json.comments -, source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.pair.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -emptyFakeExpression source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments punctuation.definition.string.begin.json.comments -[] source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments punctuation.definition.string.end.json.comments -} source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.end.json.comments -} source.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.end.json.comments \ No newline at end of file + comment.block.json.comments +*/ punctuation.definition.comment.json.comments +// punctuation.definition.comment.json.comments +Another comment comment.line.double-slash.js +{ punctuation.definition.dictionary.begin.json.comments +" punctuation.support.type.property-name.begin.json.comments +parameters support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +{ punctuation.definition.dictionary.begin.json.comments +" punctuation.support.type.property-name.begin.json.comments +guid support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +{ punctuation.definition.dictionary.begin.json.comments +" punctuation.support.type.property-name.begin.json.comments +type support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +" punctuation.definition.string.begin.json.comments +string string.quoted.double.json.comments +" punctuation.definition.string.end.json.comments +, punctuation.separator.dictionary.pair.json.comments +" punctuation.support.type.property-name.begin.json.comments +defaultValue support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +" punctuation.definition.string.begin.json.comments +[newGuid()] string.quoted.double.json.comments +" punctuation.definition.string.end.json.comments +} punctuation.definition.dictionary.end.json.comments +} punctuation.definition.dictionary.end.json.comments +, punctuation.separator.dictionary.pair.json.comments +" punctuation.support.type.property-name.begin.json.comments +variables support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +{ punctuation.definition.dictionary.begin.json.comments +" punctuation.support.type.property-name.begin.json.comments +defaultValue support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +" punctuation.definition.string.begin.json.comments +[reference('a')] string.quoted.double.json.comments +" punctuation.definition.string.end.json.comments +, punctuation.separator.dictionary.pair.json.comments +" punctuation.support.type.property-name.begin.json.comments +number support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +1.23 constant.numeric.json.comments +, punctuation.separator.dictionary.pair.json.comments +" punctuation.support.type.property-name.begin.json.comments +emptyString support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +" punctuation.definition.string.begin.json.comments +" punctuation.definition.string.end.json.comments +, punctuation.separator.dictionary.pair.json.comments +" punctuation.support.type.property-name.begin.json.comments +emptyFakeExpression support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +" punctuation.definition.string.begin.json.comments +[] string.quoted.double.json.comments +" punctuation.definition.string.end.json.comments +} punctuation.definition.dictionary.end.json.comments +} punctuation.definition.dictionary.end.json.comments \ No newline at end of file diff --git a/test/colorization/results/parameters.jsonc.txt b/test/colorization/results/parameters.jsonc.txt index e46329488..e9c606be1 100644 --- a/test/colorization/results/parameters.jsonc.txt +++ b/test/colorization/results/parameters.jsonc.txt @@ -1,24 +1,24 @@ TEST STRING: "[parameters('myparam')]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -parameters source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.parameters-reference.tle.arm {{scope-parameters}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.parameters-reference.tle.arm {{scope-parentheses-funccall}} -'myparam' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.parameters-reference.tle.arm {{scope-parameter}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.parameters-reference.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +parameters {{scope-parameters}} +( {{scope-parentheses-funccall}} +'myparam' {{scope-parameter}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[parameters(concat('myparam','a'))]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -parameters source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-parameters}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -concat source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -myparam source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +parameters {{scope-parameters}} +( {{scope-parentheses-funccall}} +concat {{scope-builtin}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +myparam {{scope-string-contents}} +' {{scope-string-end}} +, {{scope-funcargs-separator}} +' {{scope-string-start}} +a {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/property-access-after-array-access.jsonc.txt b/test/colorization/results/property-access-after-array-access.jsonc.txt index a4a7844f4..baadc0927 100644 --- a/test/colorization/results/property-access-after-array-access.jsonc.txt +++ b/test/colorization/results/property-access-after-array-access.jsonc.txt @@ -1,14 +1,14 @@ TEST STRING: "[properties('array')[0].prop1]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -properties source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -array source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -0 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-number}} -] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-dot}} -prop1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-propname}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +properties {{scope-unknownfunction}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +array {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +[ {{scope-arrayaccess-brackets}} +0 {{scope-number}} +] {{scope-arrayaccess-brackets}} +. {{scope-propaccess-dot}} +prop1 {{scope-propaccess-propname}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/property-access-do-not-match-function-names.jsonc.txt b/test/colorization/results/property-access-do-not-match-function-names.jsonc.txt index 4785dbcf7..771a6f642 100644 --- a/test/colorization/results/property-access-do-not-match-function-names.jsonc.txt +++ b/test/colorization/results/property-access-do-not-match-function-names.jsonc.txt @@ -1,13 +1,13 @@ TEST STRING: "[variables('a').add.reference.listCredentials]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -variables source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.variables-reference.tle.arm {{scope-variables}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.variables-reference.tle.arm {{scope-parentheses-funccall}} -'a' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.variables-reference.tle.arm {{scope-variable}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.variables-reference.tle.arm {{scope-parentheses-funccall}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-dot}} -add source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-propname}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-dot}} -reference source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-propname}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-dot}} -listCredentials source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-propname}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +variables {{scope-variables}} +( {{scope-parentheses-funccall}} +'a' {{scope-variable}} +) {{scope-parentheses-funccall}} +. {{scope-propaccess-dot}} +add {{scope-propaccess-propname}} +. {{scope-propaccess-dot}} +reference {{scope-propaccess-propname}} +. {{scope-propaccess-dot}} +listCredentials {{scope-propaccess-propname}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/property-access.INVALID.jsonc.txt b/test/colorization/results/property-access.INVALID.jsonc.txt index 366fc363d..691a136e4 100644 --- a/test/colorization/results/property-access.INVALID.jsonc.txt +++ b/test/colorization/results/property-access.INVALID.jsonc.txt @@ -1,25 +1,25 @@ TEST STRING: "[a().]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.expected-expression.tle.arm -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +a {{scope-unknownfunction}} +() {{scope-parentheses-funccall}} +. invalid.illegal.expected-expression.tle.arm +]" {{scope-expression-end}} TEST STRING: "[a.b().d.]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespaceandfunction-dot}} -b source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-userfunction}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-dot}} -d source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-propname}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.expected-expression.tle.arm -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +a {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +b {{scope-userfunction}} +() {{scope-parentheses-funccall}} +. {{scope-propaccess-dot}} +d {{scope-propaccess-propname}} +. invalid.illegal.expected-expression.tle.arm +]" {{scope-expression-end}} TEST STRING: "[a().1]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm invalid.illegal.expected-expression.tle.arm -1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-number}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +a {{scope-unknownfunction}} +() {{scope-parentheses-funccall}} +. invalid.illegal.expected-expression.tle.arm +1 {{scope-number}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/property-access.jsonc.txt b/test/colorization/results/property-access.jsonc.txt index 81f0b4a87..19ade8571 100644 --- a/test/colorization/results/property-access.jsonc.txt +++ b/test/colorization/results/property-access.jsonc.txt @@ -1,72 +1,72 @@ TEST STRING: "[a().b$]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-dot}} -b$ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-propname}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +a {{scope-unknownfunction}} +() {{scope-parentheses-funccall}} +. {{scope-propaccess-dot}} +b$ {{scope-propaccess-propname}} +]" {{scope-expression-end}} TEST STRING: "[a.b().c.de1]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespaceandfunction-dot}} -b source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-userfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-dot}} -c source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-propname}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-dot}} -de1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-propname}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +a {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +b {{scope-userfunction}} +( {{scope-parentheses-funccall}} +) {{scope-parentheses-funccall}} +. {{scope-propaccess-dot}} +c {{scope-propaccess-propname}} +. {{scope-propaccess-dot}} +de1 {{scope-propaccess-propname}} +]" {{scope-expression-end}} TEST STRING: "[max(a.b().c1$_,d().e.f)]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -max source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-usernamespaceandfunction-dot}} -b source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-userfunction}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.property-access.tle.arm {{scope-propaccess-dot}} -c1$_ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.property-access.tle.arm {{scope-propaccess-propname}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -d source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-unknownfunction}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.property-access.tle.arm {{scope-propaccess-dot}} -e source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.property-access.tle.arm {{scope-propaccess-propname}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.property-access.tle.arm {{scope-propaccess-dot}} -f source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.property-access.tle.arm {{scope-propaccess-propname}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +max {{scope-builtin}} +( {{scope-parentheses-funccall}} +a {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +b {{scope-userfunction}} +() {{scope-parentheses-funccall}} +. {{scope-propaccess-dot}} +c1$_ {{scope-propaccess-propname}} +, {{scope-funcargs-separator}} +d {{scope-unknownfunction}} +() {{scope-parentheses-funccall}} +. {{scope-propaccess-dot}} +e {{scope-propaccess-propname}} +. {{scope-propaccess-dot}} +f {{scope-propaccess-propname}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[a()[0].a.b]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -0 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-number}} -] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-dot}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-propname}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-dot}} -b source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-propname}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +a {{scope-unknownfunction}} +() {{scope-parentheses-funccall}} +[ {{scope-arrayaccess-brackets}} +0 {{scope-number}} +] {{scope-arrayaccess-brackets}} +. {{scope-propaccess-dot}} +a {{scope-propaccess-propname}} +. {{scope-propaccess-dot}} +b {{scope-propaccess-propname}} +]" {{scope-expression-end}} TEST STRING: "[concat('a/',my.param('b'))]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -concat source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -a/ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -my source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-usernamespaceandfunction-dot}} -param source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-userfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -b source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +concat {{scope-builtin}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +a/ {{scope-string-contents}} +' {{scope-string-end}} +, {{scope-funcargs-separator}} +my {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +param {{scope-userfunction}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +b {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/regular-string.NOT-EXPR.jsonc.txt b/test/colorization/results/regular-string.NOT-EXPR.jsonc.txt index 46e568699..c1f5abe1c 100644 --- a/test/colorization/results/regular-string.NOT-EXPR.jsonc.txt +++ b/test/colorization/results/regular-string.NOT-EXPR.jsonc.txt @@ -1,4 +1,4 @@ TEST STRING: "abc['hello']" -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -abc['hello'] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.arm punctuation.definition.string.end.json.arm \ No newline at end of file +" punctuation.definition.string.begin.json.arm +abc['hello'] string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm \ No newline at end of file diff --git a/test/colorization/results/simple-template-http.json.txt b/test/colorization/results/simple-template-http.json.txt index 644531a15..c4b07d76f 100644 --- a/test/colorization/results/simple-template-http.json.txt +++ b/test/colorization/results/simple-template-http.json.txt @@ -1,39 +1,39 @@ -{ source.json meta.structure.dictionary.json punctuation.definition.dictionary.begin.json -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.begin.json.comments -$schema source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments support.type.property-name -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.end.json.comments -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments punctuation.separator.dictionary.key-value.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.begin.json.arm +{ punctuation.definition.dictionary.begin.json +" punctuation.support.type.property-name.begin.json.comments +$schema support.type.property-name +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +" punctuation.definition.string.begin.json.arm http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json# - source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.quoted.double.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.end.json.arm -, source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments punctuation.separator.dictionary.pair.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -parameters source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -{ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm punctuation.definition.dictionary.begin.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -guid source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -{ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.begin.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -type source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -string source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.end.json.arm -, source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.pair.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -defaultValue source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -"[ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-start}} -subscription source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-builtin}} -() source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-end}} -} source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.end.json.arm -} source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm punctuation.definition.dictionary.end.json.arm -} source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments \ No newline at end of file + string.quoted.double.json.comments +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.comments +" punctuation.support.type.property-name.begin.json.comments +parameters support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +{ punctuation.definition.dictionary.begin.json.arm +" punctuation.support.type.property-name.begin.json.arm +guid support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +{ punctuation.definition.dictionary.begin.json.arm +" punctuation.support.type.property-name.begin.json.arm +type support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +" punctuation.definition.string.begin.json.arm +string string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.arm +" punctuation.support.type.property-name.begin.json.arm +defaultValue support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +"[ {{scope-expression-start}} +subscription {{scope-builtin}} +() {{scope-parentheses-funccall}} +]" {{scope-expression-end}} +} punctuation.definition.dictionary.end.json.arm +} punctuation.definition.dictionary.end.json.arm +} meta.arm-deployment-template.json.comments \ No newline at end of file diff --git a/test/colorization/results/simple-template-https.json.txt b/test/colorization/results/simple-template-https.json.txt index 29dfcd892..97148d21b 100644 --- a/test/colorization/results/simple-template-https.json.txt +++ b/test/colorization/results/simple-template-https.json.txt @@ -1,39 +1,39 @@ -{ source.json meta.structure.dictionary.json punctuation.definition.dictionary.begin.json -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.begin.json.comments -$schema source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments support.type.property-name -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.end.json.comments -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments punctuation.separator.dictionary.key-value.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.begin.json.arm +{ punctuation.definition.dictionary.begin.json +" punctuation.support.type.property-name.begin.json.comments +$schema support.type.property-name +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +" punctuation.definition.string.begin.json.arm https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json# - source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.quoted.double.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.end.json.arm -, source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments punctuation.separator.dictionary.pair.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -parameters source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -{ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm punctuation.definition.dictionary.begin.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -guid source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -{ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.begin.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -type source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -string source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.end.json.arm -, source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.pair.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -defaultValue source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -"[ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-start}} -subscription source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-builtin}} -() source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-end}} -} source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.end.json.arm -} source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm punctuation.definition.dictionary.end.json.arm -} source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments \ No newline at end of file + string.quoted.double.json.comments +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.comments +" punctuation.support.type.property-name.begin.json.comments +parameters support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +{ punctuation.definition.dictionary.begin.json.arm +" punctuation.support.type.property-name.begin.json.arm +guid support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +{ punctuation.definition.dictionary.begin.json.arm +" punctuation.support.type.property-name.begin.json.arm +type support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +" punctuation.definition.string.begin.json.arm +string string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.arm +" punctuation.support.type.property-name.begin.json.arm +defaultValue support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +"[ {{scope-expression-start}} +subscription {{scope-builtin}} +() {{scope-parentheses-funccall}} +]" {{scope-expression-end}} +} punctuation.definition.dictionary.end.json.arm +} punctuation.definition.dictionary.end.json.arm +} meta.arm-deployment-template.json.comments \ No newline at end of file diff --git a/test/colorization/results/simple-template-no-expressions.NOT-EXPR.json.txt b/test/colorization/results/simple-template-no-expressions.NOT-EXPR.json.txt index 475762768..b9298dd26 100644 --- a/test/colorization/results/simple-template-no-expressions.NOT-EXPR.json.txt +++ b/test/colorization/results/simple-template-no-expressions.NOT-EXPR.json.txt @@ -1,36 +1,36 @@ -{ source.json meta.structure.dictionary.json punctuation.definition.dictionary.begin.json -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.begin.json.comments -$schema source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments support.type.property-name -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.end.json.comments -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments punctuation.separator.dictionary.key-value.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.begin.json.arm +{ punctuation.definition.dictionary.begin.json +" punctuation.support.type.property-name.begin.json.comments +$schema support.type.property-name +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +" punctuation.definition.string.begin.json.arm http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json# - source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.quoted.double.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.end.json.arm -, source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments punctuation.separator.dictionary.pair.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -parameters source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -{ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm punctuation.definition.dictionary.begin.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -guid source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -{ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.begin.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -type source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -string source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.end.json.arm -, source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.pair.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -defaultValue source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -1.23 source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm constant.numeric.json.arm -} source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.end.json.arm -} source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm punctuation.definition.dictionary.end.json.arm -} source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments \ No newline at end of file + string.quoted.double.json.comments +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.comments +" punctuation.support.type.property-name.begin.json.comments +parameters support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +{ punctuation.definition.dictionary.begin.json.arm +" punctuation.support.type.property-name.begin.json.arm +guid support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +{ punctuation.definition.dictionary.begin.json.arm +" punctuation.support.type.property-name.begin.json.arm +type support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +" punctuation.definition.string.begin.json.arm +string string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.arm +" punctuation.support.type.property-name.begin.json.arm +defaultValue support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +1.23 constant.numeric.json.arm +} punctuation.definition.dictionary.end.json.arm +} punctuation.definition.dictionary.end.json.arm +} meta.arm-deployment-template.json.comments \ No newline at end of file diff --git a/test/colorization/results/simple-template-no-expressions.NOT-EXPR.jsonc.txt b/test/colorization/results/simple-template-no-expressions.NOT-EXPR.jsonc.txt index af3fc8705..377e47518 100644 --- a/test/colorization/results/simple-template-no-expressions.NOT-EXPR.jsonc.txt +++ b/test/colorization/results/simple-template-no-expressions.NOT-EXPR.jsonc.txt @@ -1,38 +1,38 @@ -// source.json.comments comment.line.double-slash.js punctuation.definition.comment.json.comments -Comment source.json.comments comment.line.double-slash.js -{ source.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.begin.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.begin.json.comments -$schema source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments support.type.property-name -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments punctuation.separator.dictionary.key-value.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.begin.json.arm +// punctuation.definition.comment.json.comments +Comment comment.line.double-slash.js +{ punctuation.definition.dictionary.begin.json.comments +" punctuation.support.type.property-name.begin.json.comments +$schema support.type.property-name +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +" punctuation.definition.string.begin.json.arm http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json# - source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.quoted.double.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.end.json.arm -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments punctuation.separator.dictionary.pair.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -parameters source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -{ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm punctuation.definition.dictionary.begin.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -guid source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -{ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.begin.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -type source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -string source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.end.json.arm -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.pair.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -defaultValue source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -1.23 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm constant.numeric.json.arm -} source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.end.json.arm -} source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm punctuation.definition.dictionary.end.json.arm -} source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments \ No newline at end of file + string.quoted.double.json.comments +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.comments +" punctuation.support.type.property-name.begin.json.comments +parameters support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +{ punctuation.definition.dictionary.begin.json.arm +" punctuation.support.type.property-name.begin.json.arm +guid support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +{ punctuation.definition.dictionary.begin.json.arm +" punctuation.support.type.property-name.begin.json.arm +type support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +" punctuation.definition.string.begin.json.arm +string string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.arm +" punctuation.support.type.property-name.begin.json.arm +defaultValue support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +1.23 constant.numeric.json.arm +} punctuation.definition.dictionary.end.json.arm +} punctuation.definition.dictionary.end.json.arm +} meta.arm-deployment-template.json.comments \ No newline at end of file diff --git a/test/colorization/results/simple-template-no-hash.json.txt b/test/colorization/results/simple-template-no-hash.json.txt index 822248e09..601875b1a 100644 --- a/test/colorization/results/simple-template-no-hash.json.txt +++ b/test/colorization/results/simple-template-no-hash.json.txt @@ -1,39 +1,39 @@ -{ source.json meta.structure.dictionary.json punctuation.definition.dictionary.begin.json -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.begin.json.comments -$schema source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments support.type.property-name -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.end.json.comments -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments punctuation.separator.dictionary.key-value.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.begin.json.arm +{ punctuation.definition.dictionary.begin.json +" punctuation.support.type.property-name.begin.json.comments +$schema support.type.property-name +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +" punctuation.definition.string.begin.json.arm https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json - source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.quoted.double.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.end.json.arm -, source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments punctuation.separator.dictionary.pair.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -parameters source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -{ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm punctuation.definition.dictionary.begin.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -guid source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -{ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.begin.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -type source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -string source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.end.json.arm -, source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.pair.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -defaultValue source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -"[ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-start}} -subscription source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-builtin}} -() source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-end}} -} source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.end.json.arm -} source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm punctuation.definition.dictionary.end.json.arm -} source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments \ No newline at end of file + string.quoted.double.json.comments +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.comments +" punctuation.support.type.property-name.begin.json.comments +parameters support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +{ punctuation.definition.dictionary.begin.json.arm +" punctuation.support.type.property-name.begin.json.arm +guid support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +{ punctuation.definition.dictionary.begin.json.arm +" punctuation.support.type.property-name.begin.json.arm +type support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +" punctuation.definition.string.begin.json.arm +string string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.arm +" punctuation.support.type.property-name.begin.json.arm +defaultValue support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +"[ {{scope-expression-start}} +subscription {{scope-builtin}} +() {{scope-parentheses-funccall}} +]" {{scope-expression-end}} +} punctuation.definition.dictionary.end.json.arm +} punctuation.definition.dictionary.end.json.arm +} meta.arm-deployment-template.json.comments \ No newline at end of file diff --git a/test/colorization/results/simple-template-subscription-deployment.json.txt b/test/colorization/results/simple-template-subscription-deployment.json.txt index 3c7cfec43..61eea5a0c 100644 --- a/test/colorization/results/simple-template-subscription-deployment.json.txt +++ b/test/colorization/results/simple-template-subscription-deployment.json.txt @@ -1,39 +1,39 @@ -{ source.json meta.structure.dictionary.json punctuation.definition.dictionary.begin.json -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.begin.json.comments -$schema source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments support.type.property-name -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.end.json.comments -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments punctuation.separator.dictionary.key-value.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.begin.json.arm +{ punctuation.definition.dictionary.begin.json +" punctuation.support.type.property-name.begin.json.comments +$schema support.type.property-name +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +" punctuation.definition.string.begin.json.arm https://schema.management.azure.com/schemas/2015-01-01/subscriptionDeploymentTemplate.json# - source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.quoted.double.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.end.json.arm -, source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments punctuation.separator.dictionary.pair.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -parameters source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -{ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm punctuation.definition.dictionary.begin.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -guid source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -{ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.begin.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -type source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -string source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.end.json.arm -, source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.pair.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -defaultValue source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -"[ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-start}} -subscription source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-builtin}} -() source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-end}} -} source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.end.json.arm -} source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm punctuation.definition.dictionary.end.json.arm -} source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments \ No newline at end of file + string.quoted.double.json.comments +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.comments +" punctuation.support.type.property-name.begin.json.comments +parameters support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +{ punctuation.definition.dictionary.begin.json.arm +" punctuation.support.type.property-name.begin.json.arm +guid support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +{ punctuation.definition.dictionary.begin.json.arm +" punctuation.support.type.property-name.begin.json.arm +type support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +" punctuation.definition.string.begin.json.arm +string string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.arm +" punctuation.support.type.property-name.begin.json.arm +defaultValue support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +"[ {{scope-expression-start}} +subscription {{scope-builtin}} +() {{scope-parentheses-funccall}} +]" {{scope-expression-end}} +} punctuation.definition.dictionary.end.json.arm +} punctuation.definition.dictionary.end.json.arm +} meta.arm-deployment-template.json.comments \ No newline at end of file diff --git a/test/colorization/results/simple-template-unknown-version.jsonc.txt b/test/colorization/results/simple-template-unknown-version.jsonc.txt index ca71f9577..1f04d239e 100644 --- a/test/colorization/results/simple-template-unknown-version.jsonc.txt +++ b/test/colorization/results/simple-template-unknown-version.jsonc.txt @@ -1,42 +1,42 @@ -{ source.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.begin.json.comments -// source.json.comments meta.structure.dictionary.json.comments comment.line.double-slash.js punctuation.definition.comment.json.comments +{ punctuation.definition.dictionary.begin.json.comments +// punctuation.definition.comment.json.comments We ignore the version number so that we won't choke on future versions - thus we should consider this a valid template file and do colorization - source.json.comments meta.structure.dictionary.json.comments comment.line.double-slash.js -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.begin.json.comments -$schema source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments support.type.property-name -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments punctuation.separator.dictionary.key-value.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.begin.json.arm + comment.line.double-slash.js +" punctuation.support.type.property-name.begin.json.comments +$schema support.type.property-name +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +" punctuation.definition.string.begin.json.arm https://schema.management.azure.com/schemas/2031-01-02-alpha/subscriptionDeploymentTemplate.json# - source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.quoted.double.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.end.json.arm -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments punctuation.separator.dictionary.pair.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -parameters source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -{ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm punctuation.definition.dictionary.begin.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -guid source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -{ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.begin.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -type source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.begin.json.arm -string source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm string.quoted.double.json.arm punctuation.definition.string.end.json.arm -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.pair.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.begin.json.arm -defaultValue source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm string.json.arm support.type.property-name.json.arm punctuation.support.type.property-name.end.json.arm -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm punctuation.separator.dictionary.key-value.json.arm -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-start}} -subscription source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-builtin}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.expression.tle.arm {{scope-expression-end}} -} source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm meta.structure.dictionary.value.json.arm meta.structure.dictionary.json.arm punctuation.definition.dictionary.end.json.arm -} source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.arm punctuation.definition.dictionary.end.json.arm -} source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments \ No newline at end of file + string.quoted.double.json.comments +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.comments +" punctuation.support.type.property-name.begin.json.comments +parameters support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +{ punctuation.definition.dictionary.begin.json.arm +" punctuation.support.type.property-name.begin.json.arm +guid support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +{ punctuation.definition.dictionary.begin.json.arm +" punctuation.support.type.property-name.begin.json.arm +type support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +" punctuation.definition.string.begin.json.arm +string string.quoted.double.json.arm +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.arm +" punctuation.support.type.property-name.begin.json.arm +defaultValue support.type.property-name.json.arm +" punctuation.support.type.property-name.end.json.arm +: punctuation.separator.dictionary.key-value.json.arm +"[ {{scope-expression-start}} +subscription {{scope-builtin}} +() {{scope-parentheses-funccall}} +]" {{scope-expression-end}} +} punctuation.definition.dictionary.end.json.arm +} punctuation.definition.dictionary.end.json.arm +} meta.arm-deployment-template.json.comments \ No newline at end of file diff --git a/test/colorization/results/string-not-ended.jsonc.txt b/test/colorization/results/string-not-ended.jsonc.txt index f16bd2ab8..2b0a87970 100644 --- a/test/colorization/results/string-not-ended.jsonc.txt +++ b/test/colorization/results/string-not-ended.jsonc.txt @@ -1,18 +1,18 @@ -{ source.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.begin.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.begin.json.comments -$schema source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments support.type.property-name -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments support.type.property-name punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments punctuation.separator.dictionary.key-value.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.begin.json.arm +{ punctuation.definition.dictionary.begin.json.comments +" punctuation.support.type.property-name.begin.json.comments +$schema support.type.property-name +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +" punctuation.definition.string.begin.json.arm http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json# - source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.quoted.double.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.quoted.double.json.comments punctuation.definition.string.end.json.arm -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments punctuation.separator.dictionary.pair.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments -Test1 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments -" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments -: source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-start}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} -} source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} \ No newline at end of file + string.quoted.double.json.comments +" punctuation.definition.string.end.json.arm +, punctuation.separator.dictionary.pair.json.comments +" punctuation.support.type.property-name.begin.json.comments +Test1 support.type.property-name.json.comments +" punctuation.support.type.property-name.end.json.comments +: punctuation.separator.dictionary.key-value.json.comments +"[ {{scope-expression-start}} +' {{scope-string-start}} +]" {{scope-string-contents}} +} {{scope-string-contents}} \ No newline at end of file diff --git a/test/colorization/results/string-with-escaped-apostrophes.jsonc.txt b/test/colorization/results/string-with-escaped-apostrophes.jsonc.txt index d0a12b5d8..646914c69 100644 --- a/test/colorization/results/string-with-escaped-apostrophes.jsonc.txt +++ b/test/colorization/results/string-with-escaped-apostrophes.jsonc.txt @@ -1,15 +1,15 @@ TEST STRING: "['That''s all, folks!']" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-start}} -That source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} -'' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-escapedapostrophe}} -s all, folks! source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-end}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +' {{scope-string-start}} +That {{scope-string-contents}} +'' {{scope-escapedapostrophe}} +s all, folks! {{scope-string-contents}} +' {{scope-string-end}} +]" {{scope-expression-end}} TEST STRING: "['''''']" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-start}} -'''' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-escapedapostrophe}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-end}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +' {{scope-string-start}} +'''' {{scope-escapedapostrophe}} +' {{scope-string-end}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/string.jsonc.txt b/test/colorization/results/string.jsonc.txt index 2f646060f..5d388f636 100644 --- a/test/colorization/results/string.jsonc.txt +++ b/test/colorization/results/string.jsonc.txt @@ -1,17 +1,17 @@ TEST STRING: "['abc123']" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-start}} -abc123 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-end}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +' {{scope-string-start}} +abc123 {{scope-string-contents}} +' {{scope-string-end}} +]" {{scope-expression-end}} TEST STRING: "['Say\"hello\"!']" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-start}} -Say source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} -\" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-json-escape-chars}} -hello source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} -\" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-json-escape-chars}} -! source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-string-contents}} {{scope-string-end}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +' {{scope-string-start}} +Say {{scope-string-contents}} +\" {{scope-json-escape-chars}} +hello {{scope-string-contents}} +\" {{scope-json-escape-chars}} +! {{scope-string-contents}} +' {{scope-string-end}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/tricky-parens-in-string-vs-func-args.jsonc.txt b/test/colorization/results/tricky-parens-in-string-vs-func-args.jsonc.txt index 04f586ea3..01e178a26 100644 --- a/test/colorization/results/tricky-parens-in-string-vs-func-args.jsonc.txt +++ b/test/colorization/results/tricky-parens-in-string-vs-func-args.jsonc.txt @@ -1,10 +1,10 @@ TEST STRING: "[max('abcdef)]\"')]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -max source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -abcdef)] source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -\" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-json-escape-chars}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +max {{scope-builtin}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +abcdef)] {{scope-string-contents}} +\" {{scope-json-escape-chars}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/unicode.json.txt b/test/colorization/results/unicode.json.txt index c92bb3314..fc15f7580 100644 --- a/test/colorization/results/unicode.json.txt +++ b/test/colorization/results/unicode.json.txt @@ -1,28 +1,28 @@ TEST STRING: "[Flüsse.Bäche('array0')[1]]" -"[ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -Flüsse source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespace}} -. source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespaceandfunction-dot}} -Bäche source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-userfunction}} -( source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -array0 source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -[ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -1 source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-number}} -] source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.array-access.tle.arm {{scope-arrayaccess-brackets}} -]" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +Flüsse {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +Bäche {{scope-userfunction}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +array0 {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +[ {{scope-arrayaccess-brackets}} +1 {{scope-number}} +] {{scope-arrayaccess-brackets}} +]" {{scope-expression-end}} TEST STRING: "[γνῶθι().σεαυτόν]" -"[ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -γνῶθι source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -() source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -. source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-dot}} -σεαυτόν source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.property-access.tle.arm {{scope-propaccess-propname}} -]" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +γνῶθι {{scope-unknownfunction}} +() {{scope-parentheses-funccall}} +. {{scope-propaccess-dot}} +σεαυτόν {{scope-propaccess-propname}} +]" {{scope-expression-end}} TEST STRING: "[ᠠᠪᠴᠳᠡᠸ()]" -"[ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -ᠠᠪᠴᠳᠡᠸ source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-unknownfunction}} -() source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json meta.structure.dictionary.json meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +ᠠᠪᠴᠳᠡᠸ {{scope-unknownfunction}} +() {{scope-parentheses-funccall}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/user-function.jsonc.txt b/test/colorization/results/user-function.jsonc.txt index f52724dc4..99e7c13b2 100644 --- a/test/colorization/results/user-function.jsonc.txt +++ b/test/colorization/results/user-function.jsonc.txt @@ -1,24 +1,24 @@ TEST STRING: "[a.max()]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespaceandfunction-dot}} -max source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-userfunction}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +a {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +max {{scope-userfunction}} +() {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[$a.$max()]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -$a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespaceandfunction-dot}} -$max source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-userfunction}} -() source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +$a {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +$max {{scope-userfunction}} +() {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[_$_123._$max12$_$_()]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -_$_123 source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespace}} -. source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-usernamespaceandfunction-dot}} -_$max12$_$_ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-userfunction}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +_$_123 {{scope-usernamespace}} +. {{scope-usernamespaceandfunction-dot}} +_$max12$_$_ {{scope-userfunction}} +( {{scope-parentheses-funccall}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/variables.FULL-SCOPE.jsonc.txt b/test/colorization/results/variables.FULL-SCOPE.jsonc.txt new file mode 100644 index 000000000..c9017de56 --- /dev/null +++ b/test/colorization/results/variables.FULL-SCOPE.jsonc.txt @@ -0,0 +1,24 @@ +TEST STRING: "[variables('myvar')]" +"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} +variables source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.variables-reference.tle.arm {{scope-variables}} +( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.variables-reference.tle.arm {{scope-parentheses-funccall}} +'myvar' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.variables-reference.tle.arm {{scope-variable}} +) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.variables-reference.tle.arm {{scope-parentheses-funccall}} +]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} + +TEST STRING: "[variables(concat('myvar','a'))]" +"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} +variables source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-variables}} +( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} +concat source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-builtin}} +( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} +' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} +myvar source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} +' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} +, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} +' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} +a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} +' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} +) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} +) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} +]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/results/variables.jsonc.txt b/test/colorization/results/variables.jsonc.txt index c9017de56..d0d81f2b1 100644 --- a/test/colorization/results/variables.jsonc.txt +++ b/test/colorization/results/variables.jsonc.txt @@ -1,24 +1,24 @@ TEST STRING: "[variables('myvar')]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -variables source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.variables-reference.tle.arm {{scope-variables}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.variables-reference.tle.arm {{scope-parentheses-funccall}} -'myvar' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.variables-reference.tle.arm {{scope-variable}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.variables-reference.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} +"[ {{scope-expression-start}} +variables {{scope-variables}} +( {{scope-parentheses-funccall}} +'myvar' {{scope-variable}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} TEST STRING: "[variables(concat('myvar','a'))]" -"[ source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-start}} -variables source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-variables}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -concat source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-builtin}} -( source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -myvar source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -, source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-funcargs-separator}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-start}} -a source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} -' source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm {{scope-string-contents}} {{scope-string-end}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm meta.function-arguments.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -) source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm meta.function-call.tle.arm {{scope-parentheses-funccall}} -]" source.json.comments meta.structure.dictionary.json.comments meta.arm-deployment-template.json.comments meta.structure.dictionary.value.json.comments meta.expression.tle.arm {{scope-expression-end}} \ No newline at end of file +"[ {{scope-expression-start}} +variables {{scope-variables}} +( {{scope-parentheses-funccall}} +concat {{scope-builtin}} +( {{scope-parentheses-funccall}} +' {{scope-string-start}} +myvar {{scope-string-contents}} +' {{scope-string-end}} +, {{scope-funcargs-separator}} +' {{scope-string-start}} +a {{scope-string-contents}} +' {{scope-string-end}} +) {{scope-parentheses-funccall}} +) {{scope-parentheses-funccall}} +]" {{scope-expression-end}} \ No newline at end of file diff --git a/test/colorization/tle-colorization.test.ts b/test/colorization/tle-colorization.test.ts index 4355fe6e7..c2a80126e 100644 --- a/test/colorization/tle-colorization.test.ts +++ b/test/colorization/tle-colorization.test.ts @@ -87,16 +87,24 @@ async function assertUnchangedTokens(testPath: string, resultPath: string): Prom let testCases: ITestcase[]; + // ------------- USAGE TIP ------------ // If the test filename contains ".invalid.", then all testcases in it should have at least one "invalid" token. // Otherwise they should contain none. let shouldHaveInvalidTokens = !!testPath.match(/\.INVALID\./i); + // ------------- USAGE TIP ------------ // If the test filename contains ".not-arm.", then all testcases in it should not contain any arm-deployment tokens. // Otherwise they should have at least one. let shouldBeArmTemplate = !testPath.match(/\.NOT-ARM\./i); let shouldBeExpression = shouldBeArmTemplate && !testPath.match(/\.NOT-EXPR\./i); + // ------------- USAGE TIP ------------ + // If the test filename contains '.full-scope.', then the full scope will be output for each test, otherwise + // only the top of the scope stack will be output and compared (easier to compare changes that way). + let shouldCompareFullScope = !!testPath.match(/\.FULL-SCOPE\./i); + + // ------------- USAGE TIP ------------ // If the test contains code like this: // // "$TEST{xxx}": ", @@ -130,8 +138,8 @@ async function assertUnchangedTokens(testPath: string, resultPath: string): Prom // end of the dictionary value item getDictionaryNestingLevel(t.scopes) === dictionaryNestingLevel); if (nEnd < 0) { - let { fullString, text } = getTestcaseResults([{ testString: '', data: data.slice(nBegin) }]); - assert(false, `Couldn't find end of test string starting here:\\n${text}\n${fullString}`); + let { fullScopeString, text } = getTestcaseResults([{ testString: '', data: data.slice(nBegin) }]); + assert(false, `Couldn't find end of test string starting here:\\n${text}\n${fullScopeString}`); } nEnd -= 1; @@ -156,8 +164,8 @@ async function assertUnchangedTokens(testPath: string, resultPath: string): Prom // If no individual testcases found, the whole file is a single testcase testCases = testCases || [{ data }]; - let { results: testcaseResults, fullString: resultsFullString } = getTestcaseResults(testCases); - resultsFullString = normalize(resultsFullString.trim()); + let { results: testcaseResults, fullScopeString: resultsFullString, shortScopeString: resultsShortString } = getTestcaseResults(testCases); + let resultsString = shouldCompareFullScope ? resultsFullString : resultsShortString; let actualResultPath = `${resultPath}.actual`; let resultPathToWriteTo = OVERWRITE ? resultPath : actualResultPath; @@ -203,23 +211,23 @@ async function assertUnchangedTokens(testPath: string, resultPath: string): Prom } isJustDiff = true; - assert.equal(resultsFullString, previousResult); + assert.equal(resultsString, previousResult); removeActualResultPath = true; } catch (e) { let nonDiffError = isJustDiff ? "" : `${parseError(e).message}${os.EOL}`; - fs.writeFileSync(resultPathToWriteTo, resultsFullString, { flag: 'w' }); + writeToResultsFile(resultPathToWriteTo, resultsString, shouldCompareFullScope, resultsFullString); if (OVERWRITE) { removeActualResultPath = true; // tslint:disable-next-line: max-line-length throw new Error(`${nonDiffError}*** MODIFIED THE RESULTS FILE (${resultPathToWriteTo}). VERIFY THE CHANGES BEFORE CHECKING IN!`); } else { - fs.writeFileSync(resultPathToWriteTo, resultsFullString, { flag: 'w' }); + fs.writeFileSync(resultPathToWriteTo, resultsString); throw new Error(`${nonDiffError}*** ACTUAL RESULTS ARE IN (${resultPathToWriteTo}).`); } } } else { - fs.writeFileSync(resultPathToWriteTo, resultsFullString); + writeToResultsFile(resultPathToWriteTo, resultsString, shouldCompareFullScope, resultsFullString); removeActualResultPath = true; throw new Error(`*** NEW RESULTS FILE ${resultPathToWriteTo}`); } @@ -235,6 +243,13 @@ async function assertUnchangedTokens(testPath: string, resultPath: string): Prom longestTestDuration = duration; } } + + function writeToResultsFile(resultPathToWriteTo: string, resultsString: string, shouldCompareFullScope: boolean, resultsFullString: string): void { + fs.writeFileSync(resultPathToWriteTo, resultsString); + if (!shouldCompareFullScope) { + fs.writeFileSync(`${resultPathToWriteTo}.full-scope-result.txt`, resultsFullString); + } + } } function getDictionaryNestingLevel(scopes: string): number { @@ -246,29 +261,43 @@ function normalize(s: string): string { return s.replace(/(\r\n)|\r/g, os.EOL); } -function getTestcaseResults(testCases: ITestcase[]): { text: string; results: string[]; fullString: string } { - let results = testCases.map((testcase: ITestcase) => { +function getTestcaseResults(testCases: ITestcase[]): { text: string; results: string[]; fullScopeString: string; shortScopeString: string } { + let results = testCases.map((testcase: ITestcase): { short: string; full: string } => { let prefix = testcase.testString ? `${testcase.testString}${os.EOL}` : ""; - let testCaseString = testcase.data.map(td => { - let theText = td.text.trim(); - let padding = tabSize - theText.length; - let scopes = unpreprocessScopes(td.scopes); - if (padding > 0) { - return `${theText}${" ".repeat(padding)}${scopes}`; - } else { - return `${theText}${os.EOL}${" ".repeat(tabSize)}${scopes}`; - } - }).join(os.EOL); - return prefix + testCaseString; + function getLastScope(scopes: string): string { + let lastSpaceIndex = scopes.lastIndexOf(" "); + return lastSpaceIndex > 0 ? scopes.slice(lastSpaceIndex + 1) : scopes; + } + + function getTestCaseString(full: boolean): string { + return testcase.data.map(td => { + let theText = td.text.trim(); + let padding = tabSize - theText.length; + let scopes = unpreprocessScopes(full ? td.scopes : getLastScope(td.scopes)); + if (padding > 0) { + return `${theText}${" ".repeat(padding)}${scopes}`; + } else { + return `${theText}${os.EOL}${" ".repeat(tabSize)}${scopes}`; + } + }).join(os.EOL); + } + + let fullTestCaseString = getTestCaseString(true); + let shortTestCaseString = getTestCaseString(false); + + return { short: prefix + shortTestCaseString, full: prefix + fullTestCaseString }; }); - let fullString = results.join(`${os.EOL}${os.EOL}`); - fullString = normalize(`${fullString.trim()}${os.EOL}`); + let fullScopeString = results.map(r => r.full).join(`${os.EOL}${os.EOL}`); + fullScopeString = normalize(fullScopeString.trim()); + + let shortScopeString = results.map(r => r.short).join(`${os.EOL}${os.EOL}`); + shortScopeString = normalize(shortScopeString.trim()); let text = normalize(testCases.map(tc => tc.data).map((tis: ITokenInfo[]) => tis.map(ti => ti.text).join('')).join('')); - return { text, results, fullString }; + return { text, results: results.map(r => r.full), fullScopeString, shortScopeString }; } suite('TLE colorization', function (this: ISuiteCallbackContext): void { @@ -292,7 +321,7 @@ suite('TLE colorization', function (this: ISuiteCallbackContext): void { resultFiles = fs.readdirSync(resultsFolder); for (let resultFile of resultFiles) { - if (resultFile.endsWith('.actual')) { + if (resultFile.endsWith('.actual') || resultFile.endsWith('.full-scope.txt')) { fs.unlinkSync(path.join(resultsFolder, resultFile)); } }