Skip to content

Commit 39e5da0

Browse files
itsxallwaterTedChaandrewcole50Peter Schellenbachstuboydl
authored
v2.1.3 Release (#165)
* add dom to tsconfig for client * added to FormData.d.ts (reference to Blob) and fixed duplicate autocomplete for GO/GOSUB/GO TO/GOTO (#147) * Update language-configuration.json (#150) * RestFS and Package Updates (#164) * package updates + restfs switch to axios * Still not there but latest code for Pete * Update axios response for rest calls. * Prep work for 2.1.3 release * Added _response_object() function to check response body. Fixed some arguments for Axios calls. Updated REST documentation. * Latest package updates Co-authored-by: Peter Schellenbach <petes@zumasys.com> * Fix parsing of mult expression var * var (#161) Fix label must be start of line Fix highlight ";" not part of comment Co-authored-by: Stuart Boydell <stuart@codemaster.com.au> * Prep 2.1.3 release * Add new 'Auto Close' setting for RestFS * Fixes to rename, writeFile * Remove AutoClose setting for RestFS * Cleaned up RestFS handling of failure status codes (axios). Added FTSERVER launch config. Updated RestFS documentation. Co-authored-by: Ted <60014013+tcharts-boop@users.noreply.github.com> Co-authored-by: andrewcole50 <andrewcole50@users.noreply.github.com> Co-authored-by: Peter Schellenbach <petes@zumasys.com> Co-authored-by: stuboydl <19900402+stuboydl@users.noreply.github.com> Co-authored-by: Stuart Boydell <stuart@codemaster.com.au>
1 parent ead834d commit 39e5da0

18 files changed

+6614
-1789
lines changed

.vscode/launch.json

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,37 @@
4949
// ],
5050
// "outFiles": ["${workspaceFolder}/client/out/test/**/*.js"]
5151
// }
52-
,
53-
{
54-
"name": "FTSERVER Test",
55-
"type": "extensionHost",
56-
"request": "launch",
57-
"runtimeExecutable": "${execPath}",
58-
"args": [
59-
"--extensionDevelopmentPath=${workspaceFolder}",
60-
"C:/projects/mvbasic/accuterm-mvsvr-restfs/sample.code-workspace"
61-
],
62-
"outFiles": ["${workspaceFolder}/client/out/test/**/*.js"]
52+
//
53+
//
54+
// The FTSERVER launch configuration is used for debugging the extension
55+
// when using AccuTerm FTSERVER and atsocksvr as the RestFS server.
56+
// AccuTerm normally creates the VSCode workspace dynamically, and
57+
// automatically closes the server session when the extension is unloaded
58+
// (logout called from extension deactivate event). To disable this behavior
59+
// (useful for debugging):
60+
//
61+
// - use this FTSERVER launch configuration for launching the debug enviornment
62+
// - run atsocksvr.exe from a command prompt, using -d1 or -d2 command line option
63+
// - start FTSERVER with session ID '@VSCODE' (just append the ID to the FTSERVER command)
64+
//
65+
// You may need to tweak the ftserver.code-workspace in the tests directory,
66+
// adjusting the language type, account name, or other settings that are
67+
// unique to your environment.
68+
//
69+
// Older versions of FTSERVER to not recognize the '@' prefix for session ID,
70+
// Be sure AccuTerm host programs are version 8.0.14 or higher.
71+
,
72+
{
73+
"name": "FTSERVER Test",
74+
"type": "extensionHost",
75+
"request": "launch",
76+
"runtimeExecutable": "${execPath}",
77+
"args": [
78+
"--extensionDevelopmentPath=${workspaceFolder}",
79+
"${workspaceFolder}/tests/ftserver/ftserver.code-workspace"
80+
],
81+
"outFiles": ["${workspaceFolder}/client/out/**/*.js"],
82+
"preLaunchTask": "npm: watch"
6383
}
6484
,
6585
{

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,9 @@
8989
- Bug fixes and performance enhancements to the AccuTerm connector (#133)
9090
- Package dependency updates
9191
- Light refactoring to match latest Microsoft sample language server code
92+
93+
### 2.1.3
94+
95+
- Resolving issues from breaking changes in VS Code 1.62 (#162)
96+
- Refactor RestFS to use Axios
97+
- Bug fixes with jBASE syntax highlighting

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ This extension would not be possible without the hard work by Grant Hart, Perry
8181
- [@MVDBMS-Solutions](https://github.com/MVDBMS-Solutions)
8282
- [@kpowick](https://github.com/kpowick)
8383
- [@brentlblair](https://github.com/brentlblair)
84+
- [@stuboydl](https://github.com/stuboydl)
8485

8586
[code_of_conduct]: https://github.com/mvextensions/.github/blob/master/CODE_OF_CONDUCT.md
8687
[contribution_guidelines]: https://github.com/mvextensions/.github/blob/master/CONTRIBUTING.md

Syntaxes/jBASE.tmLanguage.json

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
{
2-
"$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
3-
"name": "jBASE PickBASIC",
4-
"patterns": [
5-
{
6-
"match": "'.*?'|\".*?\"|\\\\.*?\\\\",
7-
"name": "string.other.quoted-or-unquoted.jbase"
8-
},
9-
{
10-
"match": "^\\s*([\\w.]+:(?!=)|[0-9.]+)",
11-
"name": "string.other.quoted-or-unquoted.jbase"
12-
},
13-
{
14-
"include": "#keywords"
15-
}
16-
],
17-
"repository": {
18-
"keywords": {
19-
"patterns": [
20-
{
21-
"name": "keyword.control.jbase",
22-
"match": "(?i)(?<![\\w\\$\\.])(ABORT|AND|BEGIN CASE|BREAK|BSCAN|BY|CALL|CALLING|CAPTURING|CASE|CHAIN|CHANGE|CLEAR|CLEARCOMMON|CLEARDATA|CLEARFILE|CLEARINPUT|CLEARSELECT|CLOSE|CLOSESEQ|COM|COMMON|CONTINUE|CONVERT|CREATE|CRT|DATA|DEBUG|DEFC|DEFCE|DEFFUN|DEL|DELETE|DELETELIST|DELETESEQ|DELETEU|DIM|DIMENSION|DISPLAY|DO|ECHO|ELSE|END|END CASE|EQU|EQUATE|ERROR|EXECUTE|EXIT|FILELOCK|FILEUNLOCK|FIND|FINDSTR|FOOTING|FOR|FORMLIST|FROM|FUNCTION|GET|GETLIST|GO|GOSUB|GOTO|GROUPSTORE|HEADING|HEADINGE|HEADINGN|HUSH|IF|INCLUDE|\\$INCLUDE|INPUT|INPUTCLEAR|INPUTNULL|INS|ITYPE|LOCATE|LOCK|LOCKED|LOOP|MAT|MATBUILD|MATPARSE|MATREAD|MATREADU|MATWRITE|MATWRITEU|NEXT|NOBUF|NULL|OFF|OPEN|OPENDEV|OPENINDEX|OPENPATH|OPENSEQ|OPENSER|OR|OSBREAD|OSBWRITE|OSCLOSE|OSDELETE|OSOPEN|OSREAD|OSWRITE|OUT|PAGE|PASSLIST|PAUSE|PERFORM|PRECISION|PRINT|PRINTER|PRINTERR|PROCREAD|PROCWRITE|PROGRAM|PROMPT|READ|READBLK|READLIST|READNEXT|READNEXT KEY|READPREV KEY|READSEQ|READT|READU|READV|READVU|READXML|RELEASE|REMOVE|REPEAT|RESET|RETURN|RETURNING|REWIND|RQM|RTNDATA|RTNLIST|SEEK|SELECT |SELECTE|SELECTINDEX|SELECTN|SELECTV|SEND|SENDX|SETTING|SLEEP|SSELECT|STATUS|STEP|STOP|STOPE|STOPM|SUBR|SUBROUTINE|THEN|TO|TRANSABORT|TRANSEND|TRANSQUERY|TRANSSTART|UNLOCK|UNTIL|USING|WEOFSEQ|WHILE|WITH|WORK|WRITE|WRITEBLK|WRITELIST|WRITESEQ|WRITET|WRITEU|WRITEV|WRITEVU|WRITEXML)(?![\\.\\$])\\b"
23-
},
24-
{
25-
"name": "constant.language.jbase",
26-
"match": "(?i)(\\s)(EQ|NE|GT|LT|GE|LE)|(@[a-zA-Z.]+)(\\s)"
27-
},
28-
{
29-
"name": "support.class.jbase",
30-
"match": "(?I)(?<![\\w\\$\\.])(KEY|ABS|ABSS|ADDS|ALPHA|ANDS|ASCII|ASSIGNED|BITAND|BITCHANGE|bitcheck|BITLOAD|BITNOT|BITOR|BITRESET|BITSET|BITTEST|BITXOR|BYTELEN|CALLONEXIT|CATS|CHANGE|CHAR|CHARS|CHDIR|CHECKSUM|COL1|COL2|COMPARE|CONVERT|COUNT|COUNTS|DATE|DCOUNT|DECRYPT|DIR|DIV|DIVS|DOWNCASE|DQUOTE|DROUND|DTX|EBCDIC|ENCRYPT|EREPLACE|EXP|EXTRACT|EQS|FADD|FDIV|FIELD|FIELDS|FILEINFO|FILELOCK|FILEUNLOCK|FMT|FMTS|FMUL|FOLD|FSUB|GES|GETCWD|GETENV|GROUP|ICONV|ICONVS|IFS|INDEX|INDICES|INMAT|\\$INSERT|INSERT|INT|IOCTL|ISALPHA|ISALNUM|ISCNTRL|ISDIGIT|ISLOWER|ISPRINT|ISSPACE|ISUPPER|JBASECOREDUMP|KEYIN|LEFT|LEN|LENS|LENDP|LES|LN|LOCALDATE|LOCALTIME|LOWCASE|LOWER|MAKETIMESTAMP|MAXIMUM|MATCH|MATCHES|MATCHFIELD|MINIMUM|MOD|MODS|MSLEEP|MULS|NEG|NEGS|NES|NOT|NOTS|NUM|OCONV|OCONVS|ORS|PUTENV|PWR|QUOTE|RAISE|RECORDLOCKED|REGEXP|REMOVE|REPLACE|REM|REMOVE|RIGHT|RND|REUSE|SADD|SDIV|SENTENCE|SEQ|SEQS|SIN|SMUL|SORT|SOUNDEX|SPACE|SPACES|SPLICE|SQRT|SQUOTE|SSUB|STATUS|STR|STRS|SUBR|SUBS|SUBSTRINGS|SUM|SUMMATION|SWAP|SYSTEM|TIME|TIMEDATE|TIMEDIFF|TIMEOUT|TIMESTAMP|TRANS|TRIM|TRIMB|TRIMBS|TRIMF|TRIMFS|TRIMS|UNASSIGNED|UNIQUEKEY|UPCASE|UTF8|XTD)(?![\\.\\$])\\b"
31-
},
32-
{
33-
"name": "comment.line.asterisk.jbase",
34-
"match": "(?i)(^|;)\\s*(\\*|!|REM\\s+?).*"
35-
},
36-
{
37-
"name": "comment.line.asterisk.jbase",
38-
"match": "(?<=[\\w]:|[0-9])\\s*(\\*|!|(?i)REM\\s+?).*"
39-
},
40-
{
41-
"name": "constant.language.jbase",
42-
"match": "(\\+|\\-|\\*|\\\\|=|:|#)"
43-
}
44-
]
45-
}
46-
},
47-
"scopeName": "source.mvbasic"
2+
"$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
3+
"name": "jBASE PickBASIC",
4+
"patterns": [{
5+
"match": "'.*?'|\".*?\"|\\\\.*?\\\\",
6+
"name": "string.other.quoted-or-unquoted.jbase"
7+
},
8+
{
9+
"match": "^\\s*([\\w.]+:(?!=)|[0-9.]+)",
10+
"name": "string.other.quoted-or-unquoted.jbase"
11+
},
12+
{
13+
"include": "#keywords"
14+
}
15+
],
16+
"repository": {
17+
"keywords": {
18+
"patterns": [{
19+
"name": "keyword.control.jbase",
20+
"match": "(?i)(?<![\\w\\$\\.])(ABORT|AND|BEGIN CASE|BREAK|BSCAN|BY|CALL|CALLING|CAPTURING|CASE|CHAIN|CHANGE|CLEAR|CLEARCOMMON|CLEARDATA|CLEARFILE|CLEARINPUT|CLEARSELECT|CLOSE|CLOSESEQ|COM|COMMON|CONTINUE|CONVERT|CREATE|CRT|DATA|DEBUG|DEFC|DEFCE|DEFFUN|DEL|DELETE|DELETELIST|DELETESEQ|DELETEU|DIM|DIMENSION|DISPLAY|DO|ECHO|ELSE|END|END CASE|EQU|EQUATE|ERROR|EXECUTE|EXIT|FILELOCK|FILEUNLOCK|FIND|FINDSTR|FOOTING|FOR|FORMLIST|FROM|FUNCTION|GET|GETLIST|GO|GOSUB|GOTO|GROUPSTORE|HEADING|HEADINGE|HEADINGN|HUSH|IF|INCLUDE|\\$INCLUDE|INPUT|INPUTCLEAR|INPUTNULL|INS|ITYPE|LOCATE|LOCK|LOCKED|LOOP|MAT|MATBUILD|MATPARSE|MATREAD|MATREADU|MATWRITE|MATWRITEU|NEXT|NOBUF|NULL|OFF|OPEN|OPENDEV|OPENINDEX|OPENPATH|OPENSEQ|OPENSER|OR|OSBREAD|OSBWRITE|OSCLOSE|OSDELETE|OSOPEN|OSREAD|OSWRITE|OUT|PAGE|PASSLIST|PAUSE|PERFORM|PRECISION|PRINT|PRINTER|PRINTERR|PROCREAD|PROCWRITE|PROGRAM|PROMPT|READ|READBLK|READLIST|READNEXT|READNEXT KEY|READPREV KEY|READSEQ|READT|READU|READV|READVU|READXML|RELEASE|REMOVE|REPEAT|RESET|RETURN|RETURNING|REWIND|RQM|RTNDATA|RTNLIST|SEEK|SELECT |SELECTE|SELECTINDEX|SELECTN|SELECTV|SEND|SENDX|SETTING|SLEEP|SSELECT|STATUS|STEP|STOP|STOPE|STOPM|SUBR|SUBROUTINE|THEN|TO|TRANSABORT|TRANSEND|TRANSQUERY|TRANSSTART|UNLOCK|UNTIL|USING|WEOFSEQ|WHILE|WITH|WORK|WRITE|WRITEBLK|WRITELIST|WRITESEQ|WRITET|WRITEU|WRITEV|WRITEVU|WRITEXML)(?![\\.\\$])\\b"
21+
},
22+
{
23+
"name": "constant.language.jbase",
24+
"match": "(?i)(\\s)(EQ|NE|GT|LT|GE|LE)|(@[a-zA-Z.]+)(\\s)"
25+
},
26+
{
27+
"name": "support.class.jbase",
28+
"match": "(?I)(?<![\\w\\$\\.])(KEY|ABS|ABSS|ADDS|ALPHA|ANDS|ASCII|ASSIGNED|BITAND|BITCHANGE|bitcheck|BITLOAD|BITNOT|BITOR|BITRESET|BITSET|BITTEST|BITXOR|BYTELEN|CALLONEXIT|CATS|CHANGE|CHAR|CHARS|CHDIR|CHECKSUM|COL1|COL2|COMPARE|CONVERT|COUNT|COUNTS|DATE|DCOUNT|DECRYPT|DIR|DIV|DIVS|DOWNCASE|DQUOTE|DROUND|DTX|EBCDIC|ENCRYPT|EREPLACE|EXP|EXTRACT|EQS|FADD|FDIV|FIELD|FIELDS|FILEINFO|FILELOCK|FILEUNLOCK|FMT|FMTS|FMUL|FOLD|FSUB|GES|GETCWD|GETENV|GROUP|ICONV|ICONVS|IFS|INDEX|INDICES|INMAT|\\$INSERT|INSERT|INT|IOCTL|ISALPHA|ISALNUM|ISCNTRL|ISDIGIT|ISLOWER|ISPRINT|ISSPACE|ISUPPER|JBASECOREDUMP|KEYIN|LEFT|LEN|LENS|LENDP|LES|LN|LOCALDATE|LOCALTIME|LOWCASE|LOWER|MAKETIMESTAMP|MAXIMUM|MATCH|MATCHES|MATCHFIELD|MINIMUM|MOD|MODS|MSLEEP|MULS|NEG|NEGS|NES|NOT|NOTS|NUM|OCONV|OCONVS|ORS|PUTENV|PWR|QUOTE|RAISE|RECORDLOCKED|REGEXP|REMOVE|REPLACE|REM|REMOVE|RIGHT|RND|REUSE|SADD|SDIV|SENTENCE|SEQ|SEQS|SIN|SMUL|SORT|SOUNDEX|SPACE|SPACES|SPLICE|SQRT|SQUOTE|SSUB|STATUS|STR|STRS|SUBR|SUBS|SUBSTRINGS|SUM|SUMMATION|SWAP|SYSTEM|TIME|TIMEDATE|TIMEDIFF|TIMEOUT|TIMESTAMP|TRANS|TRIM|TRIMB|TRIMBS|TRIMF|TRIMFS|TRIMS|UNASSIGNED|UNIQUEKEY|UPCASE|UTF8|XTD)(?![\\.\\$])\\b"
29+
},
30+
{
31+
"comment": "start of line comment",
32+
"name": "comment.line.asterisk.jbase",
33+
"match": "^\\s*(\\!|\\*|(?i)REM\\s).*$"
34+
},
35+
{
36+
"comment": "inline comment; after label or code",
37+
"name": "comment.line.asterisk.jbase",
38+
"match": "(?<=(;|^\\w+:|^\\d+))\\s*(\\!|\\*|(?i)REM\\s).*$"
39+
},
40+
{
41+
"name": "constant.language.jbase",
42+
"match": "(\\+|\\-|\\*|\\\\|=|:|#)"
43+
}
44+
]
45+
}
46+
},
47+
"scopeName": "source.mvbasic"
4848
}

client/language-configuration.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"comments": {
3-
"lineComment": "\\*",
3+
"lineComment": "*",
44
"blockComment": [ "/*", "*/" ]
55
},
66
"brackets": [
@@ -62,4 +62,4 @@
6262
}
6363
}
6464

65-
}
65+
}

0 commit comments

Comments
 (0)