Skip to content

Commit 43353ed

Browse files
itsxallwaterKevin PowickianmcgowanPeter Schellenbachdependabot[bot]
authored
Develop (#124)
* RegEx fix for labels with leading spaces. * 98-Issue linting with multiple levels of quoting * RegEx improvement for quoted strings * Replace parenthesis and quoted strings with empty ones. - Removed repetitive Trim()s - Removed unnecessary RegEx tests - Simplified line split on semicolon due to above changes. - Results: Faster execution. Better coverage for split on semicolon * - Cleanup lines[] array at start so repeated test/replace not needed - Removed unnecessary trim()s - Removed boolean equality tests. if(x.test == true) vs if(x.test) - Fixed GOTO/GOSUB when followed by more than one space GOTO <s><s> 100 * RegEx fix-ups to support recent changes * Corrected comment * Linter RegEx cleanup * FOR/NEXT tracking improvements and updated error messages - Nested For/Next statements now validated - NEXT with no variable is now allowed - One line per error: Removed extraneous, repeated diagnostic messages - Reworded / Clarified some error messages for consistency * Minor code clean-up * Replace char-at-a-time split on ; with split(";") * Maintain original character spacing for Intellisense error markers - RegEx improvements and consistency between client and server - Improved getWord() function * Corrected indentation for ELSE END with trailing comment (issue #45) * Corrects Label error with GOTO/GOSUB. Issue #99 - Also now allows dotted numeric labels such as GOTO 100.5 * Revert "Corrects Label error with GOTO/GOSUB. Issue #99" This reverts commit 68b0166. * Inspect TM Scopes->Inspect Editor Token and Scopes * Fix error processing customWordPath when last line is blank. May relate to #24. * Changed GOTO/GOSUB scope jumping message from Error to Warning * Numerous updates related to For/Next and Label tracking - Issue #45: Alignment of If/Else - Issue #96: Allow periods in labels - Issue #99: Corrected Label error with GOTO/GOSUB. - Issue #104: Corrected For/Next with leading label - Issue #105: Changed GOTO scope jumping message from Error to Warning - RegEx: Label comments to include "REM, *, and !" - NEXT can be used without FOR variable. * Shipping 2.0.7 * Re-introduce accidentally deleted /doc files * Fixes issue 107: FOR/NEXT error when no whitespace after FOR variable. * Shipping 2.0.8 * Issue #110: Do not change indentation of comment lines * Issue #111: Added user setting to control indentation of comment lines. * Bump elliptic from 6.5.2 to 6.5.3 (#119) Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/indutny/elliptic/releases) - [Commits](indutny/elliptic@v6.5.2...v6.5.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update Extension Guide.md Updated AccuTerm connector and host program links. * Feature request 113 (#121) * Update package.json Added MVBasic.customFunctionPath * Update server.ts added functionality to Load CustomFunction definition * Add files via upload * Update Extension Guide.md added documentation for Custom functions and subroutines 6.8 * Update server.ts Removed `data: functions[i].index,` for now since Microsoft has not responded yet. It works without it, and it's no longer in the Microsoft API documentation. * - Fix issue with startLoop/endLoop in server code parser - Clean up unused variable in server - Expand docs on new customFunctions feature * Shipping 2.0.9 * Update server.ts It looks like I left the line `customFunctionPath = settings.MVBasic.customFunctionPath;` out of the merge. * Shipping v2.0.10 Co-authored-by: Kevin Powick <kpowick@gmail.com> Co-authored-by: Ian McGowan <ian.mcgowan@gmail.com> Co-authored-by: Peter Schellenbach <petes@zumasys.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brent Blair <bblair@encompass.com>
1 parent 3e911fa commit 43353ed

File tree

8 files changed

+12
-7
lines changed

8 files changed

+12
-7
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,8 @@
6262
- Fixed a bug with LOOP/REPEAT recognition and spacing (no issue)
6363
- Fixed a bug with formatting for comment lines (#110)
6464
- Added new indentComment setting to control comment indentation (#111)
65-
- Added new customFunctionPath setting to allow users to contribute custom functions/subroutines for IntelliSense and linting (#113)
65+
- Added new customFunctionPath setting to allow users to contribute custom functions/subroutines for IntelliSense and linting (#113)
66+
67+
### 2.0.10
68+
69+
- Fixed bug with customFunctionPath

client/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "mvbasic",
33
"displayName": "MV Basic",
44
"description": "MV Basic",
5-
"version": "2.0.9",
5+
"version": "2.0.10",
66
"publisher": "mvextensions",
77
"license": "MIT",
88
"icon": "../images/mvbasic-logo.png",

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "mvbasic",
33
"displayName": "MV Basic",
44
"description": "MV Basic",
5-
"version": "2.0.9",
5+
"version": "2.0.10",
66
"publisher": "mvextensions",
77
"license": "MIT",
88
"icon": "images/mvbasic-logo.png",

server/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "mvbasic",
33
"displayName": "MV Basic",
44
"description": "MV Basic",
5-
"version": "2.0.9",
5+
"version": "2.0.10",
66
"publisher": "mvextensions",
77
"license": "MIT",
88
"icon": "../images/mvbasic-logo.png",

server/src/server.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,7 @@ connection.onDidChangeConfiguration(change => {
628628
ignoreGotoScope = settings.MVBasic.ignoreGotoScope;
629629
customWordList = settings.MVBasic.customWords;
630630
customWordPath = settings.MVBasic.customWordPath;
631+
customFunctionPath = settings.MVBasic.customFunctionPath;
631632
languageType = settings.MVBasic.languageType;
632633
const _logLevel = <string>(settings.MVBasic.trace && settings.MVBasic.trace.server) || 'off';
633634
switch (_logLevel) {

0 commit comments

Comments
 (0)