fixed issues #1 and #2

CHANGELOG.md

@@ -5,6 +5,9 @@ All notable changes to the ADOxx AdoScript extension are documented here.
 The format is (hopefully) based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project (hopefully) adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+* Fixed bug ([#1](https://git.boc-group.eu/adoxx/adoscript-vs-code-support/issues/1)) with LEO expressions not being identified in square brackets for assignment of array / map values.
+* Fixed bug ([#2](https://git.boc-group.eu/adoxx/adoscript-vs-code-support/issues/2)) where the `IN` LEO operator wasn't known by the syntax highlighting.
 
 ## [0.3.0] - 2019-05-10
 ### Added

package.json

@@ -41,7 +41,6 @@
         "Programming Languages",
         "Snippets"
     ],
-    "main": "./out/extension.js",
     "contributes": {
         "commands": [
             {

syntaxes/asc.tmLanguage.json

@@ -279,7 +279,7 @@
 					"contentName": "meta.embedded.leo-expression.leo",
 					"beginCaptures": { "1": { "name": "variable.other.assignment.asc" } },
 					"endCaptures": { "2": { "name": "invalid.illegal.asc" } },
-					"patterns": [{ "include": "source.leo" }]
+					"patterns": [{ "include": "source.leo#leo-expression" }]
 				}, {
 					"include": "source.leo#string"
 				}, {

syntaxes/leo.tmLanguage.json

@@ -239,7 +239,7 @@
 					"match": "\\b(ASC|CHR|CM|CMS|INT|PT|PTS|REAL|STR|VAL)\\b",
 					"name": "support.function.conversion.leo"
 				}, {
-					"match": "\\b(LEN|SUB)\\b",
+					"match": "\\b(LEN|SUB|IN)\\b",
 					"name": "support.function.sequence.leo"
 				}]
 		},

test-files/test.asc

@@ -8,6 +8,7 @@ CC "AdoScript" var:something IS_INCLUDED_IN_ACTIVE_VARIANT
 CC "AdoScript" var:SOME EVAL_AQL_EXPRESSION
 CC "DB" debug raw GET_ATTR_VAL_DB
 SETL reference:  (3)
+SETL something[well]:
 # can I put comments in between? nice
 someother: andreferencewhichshouldntwork    settingarray[3+4]:   "hello"
 CC