Skip to content

Commit f5cc089

Browse files
authored
Merge pull request #1 from intersystems-community/master
Merging from main repo - bringing my fork up to date
2 parents a11a8b0 + 8fab5ba commit f5cc089

14 files changed

+398
-193
lines changed

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
# Change Log
22

3+
## [1.0.8] 15-Jan-2021
4+
- Implement `isfs://server:namespace/` syntax as an alternative to the `ns=NAMESPACE` query parameter (#450)
5+
- Use new isfs notation in entries created by 'Add Server Namespace to Workspace' (#554)
6+
- Load server-side (isfs) folder-specific snippets (#552)
7+
- Improve snippets:
8+
- Add a ///-comment tabstop at the start of all snippets used in class definitions.
9+
- Add descriptive default text to more tabstops.
10+
- Add third superclass to multi-superclass snippet.
11+
- Uniformly use Capitalized command names and UPPERCASE function names in ObjectScript.
12+
- Standardize body layout in definitions to reflect layout of result.
13+
- Tidy how duplicate tabstops are used.
14+
- Support searching all Studio document types when using symbol search (Cmd/Ctrl + T).
15+
- Upgrade vulnerable dependency.
16+
17+
## [1.0.7] 4-Jan-2021
18+
- Fix issue affecting use with Docker on Windows (#516)
19+
- Resolve problem debugging in a multi-root workspace using isfs (#387)
20+
- Allow 'View other' from custom Studio documents.
21+
- Fix issue that prevented saving of custom Studio documents.
22+
- Add code snippets for Request, Response and multi-superclass class definitions, Projection, XData, Try Catch, $$$ThrowOnError macro.
23+
- Upgrade vulnerable dependency.
24+
325
## [1.0.6] 13-Nov-2020
426
- Target current class when opening documentation from Server Actions quickpick, launched by click on ObjectScript panel in status bar (#490)
527
- Improve code snippets (#493)

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,10 @@ Server-side development is best done using `isfs` folders. The read-only variant
163163

164164
To modify how your folder behaves, edit the JSON of your workspace definition (_XYZ.code-workspace_ file). Get there by running the 'Preferences: Open Workspace Settings (JSON)' command. Edit your `uri` property.
165165

166-
- The `csp` query parameter indicates web application files are to be shown. The uri path optionally specifies which application. The `ns` parameter must specify the same namespace the application is configured to use. In the following example the first folder is for the `/csp/user` web application in the USER namespace of the server named 'local' and the second gives read-only access to all web applications that reside in the %SYS namespace. The second folder also uses the optional `name` property:
166+
- The `csp` query parameter indicates web application files are to be shown. The uri path optionally specifies which application. The namespace suffix on the server name (preferred syntax) or the `ns` query parameter (deprecated) must specify the same namespace the application is configured to use. In the following example the first folder is for the `/csp/user` web application in the USER namespace of the server named 'local' and the second gives read-only access to all web applications that reside in the %SYS namespace. The second folder also uses the optional `name` property:
167167
```json
168168
{
169-
"uri": "isfs://local/csp/user?ns=USER&csp"
169+
"uri": "isfs://local:user/csp/user?csp"
170170
},
171171
{
172172
"name": "local:%SYS web files (read-only)",
@@ -178,7 +178,7 @@ To modify how your folder behaves, edit the JSON of your workspace definition (_
178178

179179
```json
180180
{
181-
"uri": "isfs://local/Xxx/Yyy?ns=USER&type=cls"
181+
"uri": "isfs://local:user/Xxx/Yyy?type=cls"
182182
}
183183
```
184184

docs/Gemfile.lock

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,23 +203,25 @@ GEM
203203
rb-fsevent (~> 0.10, >= 0.10.3)
204204
rb-inotify (~> 0.9, >= 0.9.10)
205205
mercenary (0.3.6)
206-
mini_portile2 (2.4.0)
206+
mini_portile2 (2.5.0)
207207
minima (2.5.1)
208208
jekyll (>= 3.5, < 5.0)
209209
jekyll-feed (~> 0.9)
210210
jekyll-seo-tag (~> 2.1)
211211
minitest (5.14.1)
212212
multipart-post (2.1.1)
213-
nokogiri (1.10.10)
214-
mini_portile2 (~> 2.4.0)
215-
nokogiri (1.10.10-x64-mingw32)
216-
mini_portile2 (~> 2.4.0)
213+
nokogiri (1.11.0)
214+
mini_portile2 (~> 2.5.0)
215+
racc (~> 1.4)
216+
nokogiri (1.11.0-x64-mingw32)
217+
racc (~> 1.4)
217218
octokit (4.18.0)
218219
faraday (>= 0.9)
219220
sawyer (~> 0.8.0, >= 0.5.3)
220221
pathutil (0.16.2)
221222
forwardable-extended (~> 2.6)
222223
public_suffix (3.1.1)
224+
racc (1.5.2)
223225
rb-fsevent (0.10.4)
224226
rb-inotify (0.10.1)
225227
ffi (~> 1.0)

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vscode-objectscript",
33
"displayName": "InterSystems ObjectScript",
44
"description": "InterSystems ObjectScript language support for Visual Studio Code",
5-
"version": "1.0.7-SNAPSHOT",
5+
"version": "1.0.9-SNAPSHOT",
66
"icon": "images/logo.png",
77
"aiKey": "9cd75d51-697c-406c-a929-2bcf46e97c64",
88
"categories": [
@@ -42,7 +42,7 @@
4242
}
4343
],
4444
"engines": {
45-
"vscode": "^1.46.0"
45+
"vscode": "^1.43.0"
4646
},
4747
"enableProposedApi": true,
4848
"activationEvents": [
@@ -113,7 +113,7 @@
113113
},
114114
{
115115
"command": "vscode-objectscript.viewOthers",
116-
"when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive"
116+
"when": "vscode-objectscript.connectActive"
117117
},
118118
{
119119
"command": "vscode-objectscript.subclass",
@@ -274,7 +274,7 @@
274274
"editor/context": [
275275
{
276276
"command": "vscode-objectscript.viewOthers",
277-
"when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive",
277+
"when": "vscode-objectscript.connectActive",
278278
"group": "objectscript@1"
279279
},
280280
{
@@ -319,7 +319,7 @@
319319
{
320320
"command": "vscode-objectscript.touchBar.viewOthers",
321321
"group": "objectscript.viewOthers",
322-
"when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive"
322+
"when": "vscode-objectscript.connectActive"
323323
}
324324
],
325325
"explorer/context": [
@@ -833,6 +833,11 @@
833833
"default": "cuk",
834834
"description": "Compilation flags."
835835
},
836+
"objectscript.searchAllDocTypes": {
837+
"type": "boolean",
838+
"default": false,
839+
"markdownDescription": "Whether [Quick Open](https://code.visualstudio.com/docs/getstarted/tips-and-tricks#_quick-open) should search across all Studio Document types. Default is to only search classes, routines and include files."
840+
},
836841
"objectscript.overwriteServerChanges": {
837842
"type": "boolean",
838843
"default": false,

0 commit comments

Comments
 (0)