Skip to content

Commit

Permalink
v2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Nelson-numerical-software committed May 20, 2021
1 parent 2a8cd25 commit 1f7b671
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 42 deletions.
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
14.17.0
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// A launch configuration that launches the extension inside a new window
{
"version": "1.0.0",
"version": "2.0.0",
"configurations": [
{
"name": "Launch Extension",
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
## 2.0.0 (2021-05-20)

- Requires Nelson v0.5.5 as minimal version.
- default comment symbol is '%'.
- keywords (macro, builtin) updated for 0.5.5 version.
- fix some warnings with last VS code versions.

## 1.0.0 (2020-01-01)
* Initial public version

- Initial public version
2 changes: 1 addition & 1 deletion language-configuration.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"increaseIndentPattern": "^\\s*\\b(function|if|else|elseif|case|otherwise|for|while|try|catch)\\b"
},
"comments": {
"lineComment": "//",
"lineComment": "%",
},
"brackets": [
["{", "}"],
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "nelson",
"displayName": "Nelson",
"description": "Nelson support for Visual Studio Code",
"version": "1.0.0",
"version": "2.0.0",
"publisher": "Nelson-numerical-software",
"license": "GPL-2.0",
"engines": {
Expand Down
26 changes: 10 additions & 16 deletions snippets/nelson.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"disp": {
"prefix": "disp",
"body": "disp('${text}')",
"body": "disp('${1:text}')",
"description": "Displays text"
},
"case": {
Expand Down Expand Up @@ -47,15 +47,15 @@
"prefix": "else",
"body": [
"else",
" ${body}"
" ${1:body}"
],
"description": "else statement"
},
"elseif": {
"prefix": "elseif",
"body": [
"elseif ${condition}",
" ${body}"
"elseif ${1:condition}",
" ${2:body}"
],
"description": "elseif statement"
},
Expand All @@ -81,11 +81,11 @@
"prefix": "function",
"body": [
"function ${1:output} = ${2:myFun}(${3:input})",
"// $2 - ${4:Description}",
"//",
"// Syntax: $1 = $2($3)",
"//",
"// ${5:Long description}",
"% $2 - ${4:Description}",
"%",
"% Syntax: $1 = $2($3)",
"%",
"% ${5:Long description}",
" $0",
"endfunction"
],
Expand Down Expand Up @@ -134,12 +134,6 @@
"body": "set(${1:get(${2:handle}, '${3:PropertyName}')}, '${4:PropertyName}', ${5:PropertyValue});",
"description": "Set handle object properties"
},
"properties":{
"prefix": "properties",
"body": ["properties (${PropertyAttributes})",
" $0",
"end"]
},
"unix": {
"prefix": "unix",
"body": "[${1:status}, ${2:cmdout}] = unix('${3:command}');",
Expand All @@ -149,7 +143,7 @@
"prefix": "system",
"body": "[${1:status}, ${2:cmdout}] = system('${3:command}');",
"description": "Shell command execution"
},
},
"if else end": {
"prefix": "ifelse",
"body": [
Expand Down
4 changes: 2 additions & 2 deletions syntaxes/nelson.tmLanguage.in
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<dict>
<key>begin</key>
<string>(^[ \t]+)?(?=//)</string>
<string>(^[ \t]+)?(?=%)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
Expand All @@ -46,7 +46,7 @@
<array>
<dict>
<key>begin</key>
<string>//</string>
<string>%</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
Expand Down
38 changes: 19 additions & 19 deletions syntaxes/nelson_functions_list.nls
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
//==============================================================================
// Copyright (c) 2018-present Allan CORNET (Nelson)
//==============================================================================
// LICENCE_BLOCK_BEGIN
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
// LICENCE_BLOCK_END
//==============================================================================
%==============================================================================
% Copyright (c) 2018-present Allan CORNET (Nelson)
%==============================================================================
% LICENCE_BLOCK_BEGIN
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
% the Free Software Foundation, either version 2 of the License, or
% (at your option) any later version.
%
% This program is distributed in the hope that it will be useful,
% but WITHOUT ANY WARRANTY; without even the implied warranty of
% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
% GNU General Public License for more details.
%
% You should have received a copy of the GNU General Public License
% along with this program. If not, see <http:%www.gnu.org/licenses/>.
% LICENCE_BLOCK_END
%==============================================================================
[list_builtin, list_macro] = what();
list_builtin = sort(list_builtin);
list_macro = sort(list_macro);
Expand All @@ -34,4 +34,4 @@ content = fileread(src);
content = replace(content, '__MACROS__', macro_concat);
content = replace(content, '__BUILTIN__', builtin_concat);
filewrite(dst, content);
//==============================================================================
%==============================================================================

0 comments on commit 1f7b671

Please sign in to comment.