fixed by nzeemin ( https://nzeemin.github.io/ ) comments #1

Author: kalininskiy

README.md

@@ -1,17 +1,17 @@
-# Vilnius BASIC 86 для VS Code
+# Vilnius BASIC для VS Code
 
-Подсветка синтаксиса, snippets и удобная работа с **Бейсик Вильнюс 86** (для семейства БК).
+Подсветка синтаксиса, snippets и удобная работа с **Бейсик Вильнюс** (для БК, УКНЦ и Немиги).
 
 ## Возможности
 
 - Подсветка синтаксиса (команды, функции, операторы, строковые переменные)
 - Базовые snippets (FOR-NEXT, IF-THEN-ELSE, LINE, CIRCLE и др.)
-- Поддерживаемые расширения файлов: `.bas`, `.bvk`, `.vil`, `.bk`
+- Поддерживаемые расширения файлов: `.bas`, `.bvk`, `.vil`, `.bk`, `.asc`
 
 ## Установка
 
 1. Откройте **Extensions** (`Ctrl+Shift+X`)
-2. Найдите **"Vilnius BASIC 86"**
+2. Найдите **"Vilnius BASIC"**
 3. Нажмите **Install**
 
 ## Для БК-разработчиков

language-configuration.json

@@ -1,7 +1,6 @@
 {
   "comments": {
-    "lineComment": "REM",
-    "blockComment": null
+    "lineComment": ["REM", "'"]
   },
   "brackets": [
     ["{", "}"],
@@ -22,15 +21,9 @@
     ["\"", "\""],
     ["'", "'"]
   ],
-  "folding": {
-    "markers": {
-      "start": "^\\s*REM\\s+\\{\\{\\{",
-      "end": "^\\s*REM\\s+\\}\\}\\}"
-    }
-  },
-  "wordPattern": "\\b[A-Za-z][A-Za-z0-9]*¤?\\b",
+  "wordPattern": "(?i)\\b[A-Za-z][A-Za-z0-9]*[#!%¤]?\\b|\\b\\d+\\b",
   "indentationRules": {
-    "increaseIndentPattern": "^\\s*(FOR|IF|WHILE|DO|SUB|FUNCTION|REM\\s+\\{\\{\\{).*",
+    "increaseIndentPattern": "^\\s*(FOR|IF|WHILE|DO|SUB|FUNCTION|REM\\s+\\{\\{\\{|THEN).*",
     "decreaseIndentPattern": "^\\s*(NEXT|ELSE|ENDIF|WEND|LOOP|ENDSUB|ENDFUNCTION|REM\\s+\\}\\}\\}).*"
   }
 }

package.json

@@ -1,8 +1,8 @@
 {
   "name": "bkbasic",
-  "displayName": "Vilnius BASIC 86",
-  "description": "BK BASIC VILNIUS 86 syntax highlighting / Подсветка синтаксиса, автодополнение и поддержка Бейсик Вильнюс 86 (для БК-0010-01)",
-  "version": "0.0.1",
+  "displayName": "Vilnius BASIC",
+  "description": "BK BASIC VILNIUS syntax highlighting / Подсветка синтаксиса, автодополнение и поддержка Бейсик Вильнюс (для БК, УКНЦ и Немиги)",
+  "version": "0.0.2",
   "publisher": "kalininskiy",
   "repository": {
     "type": "git",
@@ -29,14 +29,14 @@
     "languages": [{
       "id": "bkbasic",
       "aliases": [
-          "Vilnius BASIC 86",
-          "BASIC-86",
+          "Vilnius BASIC",
+          "BASIC",
           "Vilnius Basic",
           "Бейсик",
-          "Вильнюс 86",
+          "Вильнюс",
           "BK BASIC"
         ],
-      "extensions": [".bas",".bkb",".bvk",".vil",".bk"],
+      "extensions": [".bas",".bkb",".bvk",".vil",".bk",".asc"],
       "configuration": "./language-configuration.json"
     }],
     "grammars": [{
@@ -51,12 +51,12 @@
       }
     ],
     "configuration": {
-      "title": "Vilnius BASIC 86",
+      "title": "Vilnius BASIC",
       "properties": {
         "bkbasic.enableSnippets": {
           "type": "boolean",
           "default": true,
-          "description": "Включить/выключить snippets для Бейсик Вильнюс 86"
+          "description": "Включить/выключить snippets для Бейсик Вильнюс"
         },
         "bkbasic.highlightStringVariables": {
           "type": "boolean",

syntaxes/bkbasic.tmLanguage.json

@@ -2,72 +2,56 @@
     "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
     "name": "Vilnius BASIC 86",
     "patterns": [
-        { "include": "#comments" },
-        { "include": "#keywords" },
-        { "include": "#functions" },
         { "include": "#strings" },
+        { "include": "#comments" },
+        { "include": "#lineNumber" },
         { "include": "#numbers" },
-        { "include": "#operators" }
+        { "include": "#logical" },
+        { "include": "#operators" },
+        { "include": "#keywords" },
+        { "include": "#functions" }
     ],
     "repository": {
+        "lineNumber": {
+            "name": "constant.numeric.line-number.vilniusbasic",
+            "match": "^\\s*\\d+"
+        },
         "comments": {
             "patterns": [
                 {
                     "name": "comment.line.rem.vilniusbasic",
-                    "match": "(?i:^\\s*(REM\\b|').*)"
-                }
-            ]
-        },
-        "keywords": {
-            "patterns": [
-                {
-                    "name": "keyword.control.statement.vilniusbasic",
-                    "match": "(?i:\\b(AUTO|BEEP|CLEAR|CLS|CONT|DATA|DELETE|DIM|END|ERASE|ERROR|FOR|NEXT|GOSUB|RETURN|GOTO|IF|THEN|ELSE|INPUT|LET|LIST|LLIST|LOAD|NEW|ON|OFF|OPEN|CLOSE|PRINT|LPRINT|READ|RESTORE|RESUME|RUN|SAVE|STOP|SWAP|WAIT|WIDTH)\\b)"
-                },
-                {
-                    "name": "keyword.control.graphics.vilniusbasic",
-                    "match": "(?i:\\b(CIRCLE|DRAW|LINE|PAINT|PSET|PRESET|SCREEN|COLOR)\\b)"
+                    "match": "(?i)\\bREM\\b.*"
                 },
                 {
-                    "name": "keyword.control.sound.vilniusbasic",
-                    "match": "(?i:\\b(BEEP|SOUND)\\b)"
-                }
-            ]
-        },
-        "functions": {
-            "patterns": [
-                {
-                    "name": "entity.name.function.vilniusbasic",
-                    "match": "(?i:\\b(ABS|ASC|ATN|BIN|CHR|COS|EXP|FIX|HEX|INKEY|INP|INSTR|INT|LEFT|LEN|LOG|MID|OCT|PEEK|POKE|POINT|POS|RIGHT|RND|SGN|SPC|STR|STRING|TAB|TAN|USR|VAL|VARPTR)\\b)"
+                    "name": "comment.line.apostrophe.vilniusbasic",
+                    "match": "(?<!\")'.*"
                 }
             ]
         },
         "strings": {
             "name": "string.quoted.double.vilniusbasic",
             "begin": "\"",
-            "end": "\"",
-            "patterns": [
-                {
-                    "name": "constant.character.escape.vilniusbasic",
-                    "match": "\\\\."
-                }
-            ]
+            "end": "\"|$"
         },
         "numbers": {
             "name": "constant.numeric.vilniusbasic",
-            "match": "-?\\b((([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f)?|(&H[0-9A-Fa-f]+)|(&O[0-7]+)|(&B[01]+)\\b"
+            "match": "(?i)[-+]?(?:\\d*\\.?\\d+)(?:[eE][+-]?\\d+)?[#!%]?|\\b\\d+[#!%]?|&[Hh][0-9A-Fa-f]+|&[Oo][0-7]+|&[Bb][01]+\\b"
+        },
+        "logical": {
+            "name": "keyword.operator.logical.vilniusbasic",
+            "match": "(?i)\\b(AND|NOT|OR|XOR|MOD|IMP|EQV)\\b"
         },
         "operators": {
-            "patterns": [
-                {
-                    "name": "keyword.operator.logical.vilniusbasic",
-                    "match": "(?i:\\b(AND|NOT|OR|XOR|MOD|IMP|EQV)\\b)"
-                },
-                {
-                    "name": "keyword.operator.arithmetic.vilniusbasic",
-                    "match": "[+\\-*/\\\\^=<>]|<=|>=|<>|&"
-                }
-            ]
+            "name": "keyword.operator.arithmetic.vilniusbasic",
+            "match": "[+*/\\\\^=<>]|<=|>=|<>|&"
+        },
+        "keywords": {
+            "name": "keyword.control.vilniusbasic",
+            "match": "(?i)\\b(AUTO|BEEP|CLEAR|CLS|CONT|DATA|DELETE|DIM|END|ERASE|ERROR|FOR|NEXT|GOSUB|RETURN|GOTO|IF|THEN|ELSE|INPUT|LET|LIST|LLIST|LOAD|NEW|ON|OFF|OPEN|CLOSE|PRINT|LPRINT|READ|RESTORE|RESUME|RUN|SAVE|STOP|SWAP|WAIT|WIDTH|CIRCLE|DRAW|LINE|PAINT|PSET|PRESET|SCREEN|COLOR|SOUND)\\b"
+        },
+        "functions": {
+            "name": "entity.name.function.vilniusbasic",
+            "match": "(?i)\\b(ABS|ASC|ATN|BIN|CHR|COS|EXP|FIX|HEX|INKEY|INP|INSTR|INT|LEFT|LEN|LOG|MID|OCT|PEEK|POKE|POINT|POS|RIGHT|RND|SGN|SPC|STR|STRING|TAB|TAN|USR|VAL|VARPTR|AT)\\b"
         }
     },
     "scopeName": "source.vilniusbasic"