Skip to content

Commit

Permalink
v2.1.3 Release (#165)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
6 people authored Jan 27, 2022
1 parent ead834d commit 39e5da0
Show file tree
Hide file tree
Showing 18 changed files with 6,614 additions and 1,789 deletions.
42 changes: 31 additions & 11 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,37 @@
// ],
// "outFiles": ["${workspaceFolder}/client/out/test/**/*.js"]
// }
,
{
"name": "FTSERVER Test",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}",
"C:/projects/mvbasic/accuterm-mvsvr-restfs/sample.code-workspace"
],
"outFiles": ["${workspaceFolder}/client/out/test/**/*.js"]
//
//
// The FTSERVER launch configuration is used for debugging the extension
// when using AccuTerm FTSERVER and atsocksvr as the RestFS server.
// AccuTerm normally creates the VSCode workspace dynamically, and
// automatically closes the server session when the extension is unloaded
// (logout called from extension deactivate event). To disable this behavior
// (useful for debugging):
//
// - use this FTSERVER launch configuration for launching the debug enviornment
// - run atsocksvr.exe from a command prompt, using -d1 or -d2 command line option
// - start FTSERVER with session ID '@VSCODE' (just append the ID to the FTSERVER command)
//
// You may need to tweak the ftserver.code-workspace in the tests directory,
// adjusting the language type, account name, or other settings that are
// unique to your environment.
//
// Older versions of FTSERVER to not recognize the '@' prefix for session ID,
// Be sure AccuTerm host programs are version 8.0.14 or higher.
,
{
"name": "FTSERVER Test",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}",
"${workspaceFolder}/tests/ftserver/ftserver.code-workspace"
],
"outFiles": ["${workspaceFolder}/client/out/**/*.js"],
"preLaunchTask": "npm: watch"
}
,
{
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,9 @@
- Bug fixes and performance enhancements to the AccuTerm connector (#133)
- Package dependency updates
- Light refactoring to match latest Microsoft sample language server code

### 2.1.3

- Resolving issues from breaking changes in VS Code 1.62 (#162)
- Refactor RestFS to use Axios
- Bug fixes with jBASE syntax highlighting
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ This extension would not be possible without the hard work by Grant Hart, Perry
- [@MVDBMS-Solutions](https://github.com/MVDBMS-Solutions)
- [@kpowick](https://github.com/kpowick)
- [@brentlblair](https://github.com/brentlblair)
- [@stuboydl](https://github.com/stuboydl)

[code_of_conduct]: https://github.com/mvextensions/.github/blob/master/CODE_OF_CONDUCT.md
[contribution_guidelines]: https://github.com/mvextensions/.github/blob/master/CONTRIBUTING.md
Expand Down
92 changes: 46 additions & 46 deletions Syntaxes/jBASE.tmLanguage.json
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
{
"$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
"name": "jBASE PickBASIC",
"patterns": [
{
"match": "'.*?'|\".*?\"|\\\\.*?\\\\",
"name": "string.other.quoted-or-unquoted.jbase"
},
{
"match": "^\\s*([\\w.]+:(?!=)|[0-9.]+)",
"name": "string.other.quoted-or-unquoted.jbase"
},
{
"include": "#keywords"
}
],
"repository": {
"keywords": {
"patterns": [
{
"name": "keyword.control.jbase",
"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"
},
{
"name": "constant.language.jbase",
"match": "(?i)(\\s)(EQ|NE|GT|LT|GE|LE)|(@[a-zA-Z.]+)(\\s)"
},
{
"name": "support.class.jbase",
"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"
},
{
"name": "comment.line.asterisk.jbase",
"match": "(?i)(^|;)\\s*(\\*|!|REM\\s+?).*"
},
{
"name": "comment.line.asterisk.jbase",
"match": "(?<=[\\w]:|[0-9])\\s*(\\*|!|(?i)REM\\s+?).*"
},
{
"name": "constant.language.jbase",
"match": "(\\+|\\-|\\*|\\\\|=|:|#)"
}
]
}
},
"scopeName": "source.mvbasic"
"$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
"name": "jBASE PickBASIC",
"patterns": [{
"match": "'.*?'|\".*?\"|\\\\.*?\\\\",
"name": "string.other.quoted-or-unquoted.jbase"
},
{
"match": "^\\s*([\\w.]+:(?!=)|[0-9.]+)",
"name": "string.other.quoted-or-unquoted.jbase"
},
{
"include": "#keywords"
}
],
"repository": {
"keywords": {
"patterns": [{
"name": "keyword.control.jbase",
"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"
},
{
"name": "constant.language.jbase",
"match": "(?i)(\\s)(EQ|NE|GT|LT|GE|LE)|(@[a-zA-Z.]+)(\\s)"
},
{
"name": "support.class.jbase",
"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"
},
{
"comment": "start of line comment",
"name": "comment.line.asterisk.jbase",
"match": "^\\s*(\\!|\\*|(?i)REM\\s).*$"
},
{
"comment": "inline comment; after label or code",
"name": "comment.line.asterisk.jbase",
"match": "(?<=(;|^\\w+:|^\\d+))\\s*(\\!|\\*|(?i)REM\\s).*$"
},
{
"name": "constant.language.jbase",
"match": "(\\+|\\-|\\*|\\\\|=|:|#)"
}
]
}
},
"scopeName": "source.mvbasic"
}
4 changes: 2 additions & 2 deletions client/language-configuration.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"comments": {
"lineComment": "\\*",
"lineComment": "*",
"blockComment": [ "/*", "*/" ]
},
"brackets": [
Expand Down Expand Up @@ -62,4 +62,4 @@
}
}

}
}
Loading

0 comments on commit 39e5da0

Please sign in to comment.