Skip to content

Commit b213e90

Browse files
Merge pull request #963 from gjsjohnmurray/pre-sync-1.8.1
Pre sync 1.8.1
2 parents d2693eb + d9b56d0 commit b213e90

File tree

14 files changed

+285
-159
lines changed

14 files changed

+285
-159
lines changed

CHANGELOG.md

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

3+
## [1.9.2022072501] 25-Jul-2022 pre-release
4+
Add 1.8.1 changes.
5+
36
## [1.9.2022042001] 20-Apr-2022 pre-release
47
Add 1.8.0 changes.
58

@@ -26,6 +29,16 @@ Add 1.4.1 changes.
2629

2730
## [1.5.2022011401] 14-Jan-2022 pre-release
2831
Add 1.4.0 changes.
32+
## [1.8.1] 25-Jul-2022
33+
- Fixes
34+
- New class should ignore `objectscript.export.folder` setting (#938)
35+
- Get correct host port number for connection to docker-compose with multiple services (#941)
36+
- Don't split dots in names of 'other' files into folders on export (#536, #866, #930)
37+
- Fix issue with copying class file overwriting inheritance (contributed by @yannip1234) (#954)
38+
- Show correct tag+offset^routine in status bar when in procedure block code (#957)
39+
- Use correct isfs connection when attaching to a process for debugging (#958)
40+
- Fix uncaught errors reported in VS Code extension view UI (#937)
41+
- Upgrade vulnerable dependencies.
2942

3043
## [1.8.0] 20-Apr-2022
3144
- Enhancements

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ To unlock these features (optional):
6464

6565
1. Download and install a beta version from GitHub. This is necessary because Marketplace does not allow publication of extensions that use proposed APIs.
6666
- Go to https://github.com/intersystems-community/vscode-objectscript/releases
67-
- Locate the beta immediately above the release you installed from Marketplace. For instance, if you installed `1.8.0`, look for `1.8.1-beta.1`. This will be functionally identical to the Marketplace version apart from being able to use proposed APIs.
68-
- Download the VSIX file (for example `vscode-objectscript-1.8.1-beta.1.vsix`) and install it. One way to install a VSIX is to drag it from your download folder and drop it onto the list of extensions in the Extensions view of VS Code.
67+
- Locate the beta immediately above the release you installed from Marketplace. For instance, if you installed `1.8.1`, look for `1.8.2-beta.1`. This will be functionally identical to the Marketplace version apart from being able to use proposed APIs.
68+
- Download the VSIX file (for example `vscode-objectscript-1.8.2-beta.1.vsix`) and install it. One way to install a VSIX is to drag it from your download folder and drop it onto the list of extensions in the Extensions view of VS Code.
6969

7070
2. From [Command Palette](https://code.visualstudio.com/docs/getstarted/tips-and-tricks#_command-palette) choose `Preferences: Configure Runtime Arguments`.
7171
3. In the argv.json file that opens, add this line (required for both Stable and Insiders versions of VS Code):

docs/Gemfile.lock

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.0.4.7)
4+
activesupport (6.0.5)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 0.7, < 2)
77
minitest (~> 5.1)
@@ -15,7 +15,7 @@ GEM
1515
coffee-script-source (1.11.1)
1616
colorator (1.1.0)
1717
commonmarker (0.23.4)
18-
concurrent-ruby (1.1.9)
18+
concurrent-ruby (1.1.10)
1919
dnsruby (1.61.9)
2020
simpleidn (~> 0.1)
2121
em-websocket (0.5.3)
@@ -53,9 +53,9 @@ GEM
5353
ffi (1.15.5-x64-mingw32)
5454
forwardable-extended (2.6.0)
5555
gemoji (3.0.1)
56-
github-pages (225)
56+
github-pages (226)
5757
github-pages-health-check (= 1.17.9)
58-
jekyll (= 3.9.0)
58+
jekyll (= 3.9.2)
5959
jekyll-avatar (= 0.7.0)
6060
jekyll-coffeescript (= 1.1.1)
6161
jekyll-commonmark-ghpages (= 0.2.0)
@@ -90,12 +90,12 @@ GEM
9090
jekyll-theme-time-machine (= 0.2.0)
9191
jekyll-titles-from-headings (= 0.5.3)
9292
jemoji (= 0.12.0)
93-
kramdown (= 2.3.1)
93+
kramdown (= 2.3.2)
9494
kramdown-parser-gfm (= 1.1.0)
9595
liquid (= 4.0.3)
9696
mercenary (~> 0.3)
9797
minima (= 2.5.1)
98-
nokogiri (>= 1.12.5, < 2.0)
98+
nokogiri (>= 1.13.4, < 2.0)
9999
rouge (= 3.26.0)
100100
terminal-table (~> 1.4)
101101
github-pages-health-check (1.17.9)
@@ -104,13 +104,13 @@ GEM
104104
octokit (~> 4.0)
105105
public_suffix (>= 3.0, < 5.0)
106106
typhoeus (~> 1.3)
107-
html-pipeline (2.14.0)
107+
html-pipeline (2.14.1)
108108
activesupport (>= 2)
109109
nokogiri (>= 1.4)
110110
http_parser.rb (0.8.0)
111111
i18n (0.9.5)
112112
concurrent-ruby (~> 1.0)
113-
jekyll (3.9.0)
113+
jekyll (3.9.2)
114114
addressable (~> 2.4)
115115
colorator (~> 1.0)
116116
em-websocket (~> 0.5)
@@ -218,7 +218,7 @@ GEM
218218
gemoji (~> 3.0)
219219
html-pipeline (~> 2.2)
220220
jekyll (>= 3.0, < 5.0)
221-
kramdown (2.3.1)
221+
kramdown (2.3.2)
222222
rexml
223223
kramdown-parser-gfm (1.1.0)
224224
kramdown (~> 2.0)
@@ -234,17 +234,17 @@ GEM
234234
jekyll-seo-tag (~> 2.1)
235235
minitest (5.15.0)
236236
multipart-post (2.1.1)
237-
nokogiri (1.13.4)
237+
nokogiri (1.13.6)
238238
mini_portile2 (~> 2.8.0)
239239
racc (~> 1.4)
240-
nokogiri (1.13.4-x64-mingw32)
240+
nokogiri (1.13.6-x64-mingw32)
241241
racc (~> 1.4)
242242
octokit (4.22.0)
243243
faraday (>= 0.9)
244244
sawyer (~> 0.8.0, >= 0.5.3)
245245
pathutil (0.16.2)
246246
forwardable-extended (~> 2.6)
247-
public_suffix (4.0.6)
247+
public_suffix (4.0.7)
248248
racc (1.6.0)
249249
rb-fsevent (0.11.1)
250250
rb-inotify (0.10.1)
@@ -269,14 +269,14 @@ GEM
269269
thread_safe (0.3.6)
270270
typhoeus (1.4.0)
271271
ethon (>= 0.9.0)
272-
tzinfo (1.2.9)
272+
tzinfo (1.2.10)
273273
thread_safe (~> 0.1)
274274
tzinfo-data (1.2021.5)
275275
tzinfo (>= 1.0.0)
276276
unf (0.1.4)
277277
unf_ext
278-
unf_ext (0.0.8)
279-
unf_ext (0.0.8-x64-mingw32)
278+
unf_ext (0.0.8.1)
279+
unf_ext (0.0.8.1-x64-mingw32)
280280
unicode-display_width (1.8.0)
281281
wdm (0.1.1)
282282
webrick (1.7.0)

docs/RunDebug.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ You can select a debug configuration from the list VS Code provides in the Run a
108108

109109
Clicking on the green arrow runs the currently selected debug configuration.
110110

111-
When starting **objectscript launch** debug session, make sure that the file containing the **program** that you are debugging is open in your editor and is the active tab. VS Code will start a debug session with the server of the file in the active editor (the tab that the user is focused on).
111+
When starting **objectscript launch** debug session, make sure that the file containing the **program** that you are debugging is open in your editor and is the active tab. VS Code will start a debug session with the server of the file in the active editor (the tab that the user is focused on). This also applies to **objectscript attach** debug sessions.
112112

113113
This extension uses WebSockets to communicate with the InterSystems server during debugging. If you are experiencing issues when trying to start a debugging session, check that the InterSystems server's web server allows WebSocket connections.
114114

docs/SettingsReference.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ The extensions in the InterSystems ObjectScript Extension Pack provide many sett
2020
| `"intersystems.language-server.diagnostics.routines"` | Controls whether error diagnostics are provided when a routine or include file that is being referred to doesn't exist in the database. | `boolean` | `false` | |
2121
| `"intersystems.language-server.formatting.commands.case"` | Controls the case that ObjectScript commands will be changed to during a document formatting request. | `"upper"`, `"lower"` or `"word"` | `"word"` | |
2222
| `"intersystems.language-server.formatting.commands.length"` | Controls the length that ObjectScript commands will be changed to during a document formatting request. | `"short"` or `"long"` | `"long"` | |
23+
| `"intersystems.language-server.formatting.expandClassNames"` | Controls whether short class names will be expanded to include a package during a document formatting request. | `boolean` | `false` | |
2324
| `"intersystems.language-server.formatting.system.case"` | Controls the case that ObjectScript system functions and variables will be changed to during a document formatting request. | `"upper"`, `"lower"` or `"word"` | `"upper"` | |
2425
| `"intersystems.language-server.formatting.system.length"` | Controls the length that ObjectScript system functions and variables will be changed to during a document formatting request. | `"short"` or `"long"` | `"long"` | |
2526
| `"intersystems.language-server.hover.commands"` | Controls whether hover information is provided for ObjectScript commands. | `boolean` | `true` | |
@@ -40,10 +41,18 @@ The extensions in the InterSystems ObjectScript Extension Pack provide many sett
4041
| `"objectscript.compileFlags"` | Compilation flags. | `string` | `"cuk"` | Common compilation flags are ***b*** (compile dependent classes), ***k*** (keep generated source code) and ***u*** (skip related up-to-date documents). For descriptions of all available flags and qualifiers, click [here](https://docs.intersystems.com/irislatest/csp/docbook/Doc.View.cls?KEY=RCOS_vsystem#RCOS_vsystem_flags_qualifiers). |
4142
| `"objectscript.compileOnSave"` | Automatically compile an InterSystems file when saved in the editor. | `boolean` | `true` | |
4243
| `"objectscript.conn"` | Configures the active server connection. | `object` | `undefined` | See the [Configuration page](../configuration/#config-server-conn) for more details on configuring server connections. |
44+
| `"objectscript.conn.ns"` | InterSystems server's namespace to use. | `string` | `undefined` | |
45+
| `"objectscript.conn.active"` | Should the connection be active on startup. | `boolean` | `false` | |
46+
| `"objectscript.conn.username"` | InterSystems server's user name. | `string` | `undefined` | |
47+
| `"objectscript.conn.password"` | InterSystems server's password. | `string` | `undefined` | It's not recommended to specify your password in a config file except when you are using the default password |
48+
| `"objectscript.conn.server"` | InterSystems server's name in Server Manager settings from which to get connection info. | `string` | `undefined` | Specify only `ns` and `active` when using this setting. See the [Server Manager README](https://github.com/intersystems-community/intersystems-servermanager) for more details. |
49+
| `"objectscript.conn.docker-compose"` | Configures the active server port using information from a file which must be named `docker-compose.yml` in the project's root directory. | `object` | `undefined` | |
50+
| `"objectscript.conn.docker-compose.service"` | InterSystems service's name in `docker-compose.yml`. | `string` | `undefined` | |
51+
| `"objectscript.conn.docker-compose .internalPort"` | InterSystems service's internal port in `docker-compose.yml`. | `object` | `undefined` | This should almost always be 52773 unless your IRIS server is configured in a non-standard way|
4352
| `"objectscript.debug.debugThisMethod"` | Show inline `Debug this method` CodeLens action for ClassMethods. | `boolean` | `true` | |
44-
| `"objectscript.explorer.alwaysShowServerCopy"` | Always show the server copy of a document in the ObjectScript Explorer. | `boolean` | `false` | |
53+
| `"objectscript.explorer .alwaysShowServerCopy"` | Always show the server copy of a document in the ObjectScript Explorer. | `boolean` | `false` | |
4554
| `"objectscript.export.addCategory"` | Add a category folder to the beginning of the export path. | `boolean` or `object` | `false` | |
46-
| `"objectscript.export.atelier"` | Export source code as Atelier did it, with packages as subfolders. | `boolean` | `true` | |
55+
| `"objectscript.export.atelier"` | Export source code as Atelier did it, with packages as subfolders. | `boolean` | `true` | This setting only affects classes, routines, include files and DFI files. |
4756
| `"objectscript.export.category"` | Category of source code to export: `CLS` = classes; `RTN` = routines; `CSP` = csp files; `OTH` = other. Default is `*` = all. | `string` or `object` | `"*"` | |
4857
| `"objectscript.export.dontExportIfNoChanges"` | Do not rewrite the local file if the content is identical to what came from the server. | `boolean` | `false` | |
4958
| `"objectscript.export.exactFilter"` | SQL filter to limit what to export. | `string` | `""` | The filter is applied to document names using the [LIKE predicate](https://irisdocs.intersystems.com/irislatest/csp/docbook/DocBook.UI.Page.cls?KEY=RSQL_like) (i.e. `Name LIKE 'exactFilter'`). If provided, `objectscript.export.filter` is ignored. |
@@ -52,7 +61,7 @@ The extensions in the InterSystems ObjectScript Extension Pack provide many sett
5261
| `"objectscript.export.generated"` | Export generated source code files, such as INTs generated from classes. | `boolean` | `false` | |
5362
| `"objectscript.export.map"` | Map file names before export, with regexp pattern as a key and replacement as a value. | `object` | `{}` | For example, `{ \"%(.*)\": \"_$1\" }` to make % classes or routines use underscore prefix instead. |
5463
| `"objectscript.export.mapped"` | Export source code files mapped from a non-default database. | `boolean` | `true` | |
55-
| `"objectscript.export.maxConcurrentConnections"` | Maximum number of concurrent export connections. | `number` | `0` | 0 = unlimited |
64+
| `"objectscript.export .maxConcurrentConnections"` | Maximum number of concurrent export connections. | `number` | `0` | 0 = unlimited |
5665
| `"objectscript.export.noStorage"` | Strip the storage definition on export. | `boolean` | `false` | Can be useful when working across multiple systems. |
5766
| `"objectscript.format.commandCase"` | Case for commands. | `"upper"`, `"lower"` or `"word"` | `"word"` | Has no effect if the `InterSystems Language Server` extension is installed and enabled. |
5867
| `"objectscript.format.functionCase"` | Case for system functions and system variables. | `"upper"`, `"lower"` or `"word"` | `"word"` | Has no effect if the `InterSystems Language Server` extension is installed and enabled. |
@@ -62,7 +71,7 @@ The extensions in the InterSystems ObjectScript Extension Pack provide many sett
6271
| `"objectscript.overwriteServerChanges"` | Overwrite a changed server version without confirmation when importing the local file. | `boolean` | `false` | |
6372
| `"objectscript.projects.webAppFileExtensions"` | When browsing a virtual workspace folder that has a project query parameter, all files with these extensions will be automatically treated as web application files. Extensions added here will be appended to the default list and should **NOT** include a dot. | `string[]` | `[]` | Default extensions: `["csp","csr","ts","js","css","scss","sass","less","html","json","md","markdown","png","svg","jpeg","jpg","ico","xml","txt"]` |
6473
| `"objectscript.serverSideEditing"` | Allow editing code directly on the server after opening it from ObjectScript Explorer. | `boolean` | `false` | |
65-
| `"objectscript.serverSourceControl.disableOtherActionTriggers"` | Prevent server-side source control 'other action' triggers from firing. | `boolean` | `false` | |
74+
| `"objectscript.serverSourceControl .disableOtherActionTriggers"` | Prevent server-side source control 'other action' triggers from firing. | `boolean` | `false` | |
6675
| `"objectscript.showExplorer"` | Show the ObjectScript Explorer view. | `boolean` | `true` | |
6776
| `"objectscript.studioActionDebugOutput"` | Log in JSON format the action that VS Code should perform as requested by the server. | `boolean` | `false` | Actions will be logged to the `ObjectScript` Output channel. |
6877
| `"objectscript.suppressCompileErrorMessages"` | Suppress popup messages about errors during compile, but still focus on Output view. | `boolean` | `false` | |

docs/_sass/color_schemes/isc.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ $link-color: #333695;
55
}
66

77
.main {
8+
margin-left: 320px !important;
89
max-width: 1200px !important;
910
}

0 commit comments

Comments
 (0)