diff --git a/CHANGELOG.md b/CHANGELOG.md index b10c34328db8..7523fed7f3d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file. - ESP32 shutter driver support up to 16 shutters (#18295) - Configuration backup and restore now backup and restore ``.xdrvsetXXX`` files too (#18295) - Berry extend `range(lower, upper, incr)` to arbitrary increment +- Berry updated syntax highlighting plugin for VSCode ### Fixed diff --git a/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/.vsixmanifest b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/.vsixmanifest similarity index 100% rename from lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/.vsixmanifest rename to lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/.vsixmanifest diff --git a/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/CHANGELOG.md b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/CHANGELOG.md similarity index 73% rename from lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/CHANGELOG.md rename to lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/CHANGELOG.md index 6f51bbccafba..2867fd3abd7e 100755 --- a/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/CHANGELOG.md +++ b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/CHANGELOG.md @@ -4,4 +4,5 @@ All notable changes to the "none" extension will be documented in this file. Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file. ## [Unreleased] -- Initial release \ No newline at end of file +- Initial release +- add support for f-strings, `_class` and indent on `do` diff --git a/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/README.md b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/README.md similarity index 100% rename from lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/README.md rename to lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/README.md diff --git a/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/berry-configuration.json b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/berry-configuration.json similarity index 93% rename from lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/berry-configuration.json rename to lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/berry-configuration.json index 4be01969f8f6..50dde1c39836 100755 --- a/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/berry-configuration.json +++ b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/berry-configuration.json @@ -26,7 +26,7 @@ ["'", "'"] ], "indentationRules": { - "increaseIndentPattern": "(^((\\s*(class|while|for|if|elif|else|try|except))|(.*\\bdef))\\b((?!\\b(end)\\b).)*)$", + "increaseIndentPattern": "(^((\\s*(class|while|for|if|elif|else|try|except|do))|(.*\\bdef))\\b((?!\\b(end)\\b).)*)$", "decreaseIndentPattern": "^\\s*((\\b(elif|else|except|end)\\b)|(\\)))" } } \ No newline at end of file diff --git a/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/berry-icon.png b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/berry-icon.png similarity index 100% rename from lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/berry-icon.png rename to lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/berry-icon.png diff --git a/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/package.json b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/package.json similarity index 98% rename from lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/package.json rename to lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/package.json index 1f206315b536..6837eb54e31f 100755 --- a/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/package.json +++ b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/package.json @@ -2,7 +2,7 @@ "name": "berry", "displayName": "Berry Script Language", "description": "A small embedded script language.", - "version": "0.1.0", + "version": "1.1.0", "publisher": "skiars", "engines": { "vscode": "^1.15.1" diff --git a/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/syntaxes/berry.json b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/syntaxes/berry.json similarity index 60% rename from lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/syntaxes/berry.json rename to lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/syntaxes/berry.json index 661d969a5440..29e90d5f81e8 100755 --- a/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/syntaxes/berry.json +++ b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/syntaxes/berry.json @@ -44,11 +44,55 @@ "patterns": [ { "name": "string.quoted.double.berry", - "match": "\"(\\\\.|[^\"])*\"" + "begin": "(\"|')", + "end": "\\1", + "patterns": [ + { + "name": "constant.character.escape.berry", + "match": "\\\\." + } + ] }, { - "name": "string.quoted.single.berry", - "match": "'(\\\\.|[^'])*'" + "name": "string.quoted.other.berry", + "begin": "f(\"|')", + "end": "\\1", + "patterns": [ + { + "name": "constant.character.escape.berry", + "match": "\\\\." + }, + { + "name": "string.quoted.other.berry", + "match": "\\{\\{[^\\}]*\\}\\}" + }, + { + "name": "keyword.other.unit.berry", + "begin": "\\{", + "end": "\\}", + "patterns": [ + { + "include": "#keywords" + }, + { + "include": "#numbers" + }, + { + "include": "#identifier" + }, + { + "include": "#operator" + }, + { + "include": "#member" + }, + { + "include": "#function" + } + ] + } + + ] } ] }, diff --git a/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/syntaxes/bytecode.json b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/syntaxes/bytecode.json similarity index 100% rename from lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/syntaxes/bytecode.json rename to lib/libesp32/berry/tools/plugins/vscode/skiars.berry-1.1.0/syntaxes/bytecode.json