Skip to content

Commit fcca8bf

Browse files
authored
Deprecate confusing objectscript.serverSideEditing setting (intersystems-community#1116)
1 parent ee83f5a commit fcca8bf

File tree

5 files changed

+5
-8
lines changed

5 files changed

+5
-8
lines changed

docs/ServerSide.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ Use **File > New File** to create a new file. Add content similar to the followi
178178
}
179179
],
180180
"settings": {
181-
"objectscript.serverSideEditing": true
182181
}
183182
}
184183
```
@@ -220,8 +219,7 @@ Example with connection to different namespaces on the same server.
220219
"password": "SYS",
221220
"ns": "MYAPP",
222221
"port": 52773,
223-
},
224-
"objectscript.serverSideEditing": true
222+
}
225223
}
226224
}
227225
```

docs/SettingsReference.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ The extensions in the InterSystems ObjectScript Extension Pack provide many sett
7373
| `"objectscript.openClassContracted"` | Automatically collapse all class member folding ranges when a class is opened for the first time. | `boolean` | `false` | |
7474
| `"objectscript.overwriteServerChanges"` | Overwrite a changed server version without confirmation when importing the local file. | `boolean` | `false` | |
7575
| `"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"]` |
76-
| `"objectscript.serverSideEditing"` | Allow editing code directly on the server after opening it from ObjectScript Explorer. | `boolean` | `false` | |
7776
| `"objectscript.serverSourceControl .disableOtherActionTriggers"` | Prevent server-side source control 'other action' triggers from firing. | `boolean` | `false` | |
7877
| `"objectscript.showExplorer"` | Show the ObjectScript Explorer view. | `boolean` | `true` | |
7978
| `"objectscript.showGeneratedFileDecorations"` | Controls whether a badge is shown in the file explorer and open editors view for generated files. | `boolean` | `true` | |

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1399,7 +1399,8 @@
13991399
"objectscript.serverSideEditing": {
14001400
"default": false,
14011401
"type": "boolean",
1402-
"description": "Allow editing code directly on the server after opening it from ObjectScript Explorer."
1402+
"description": "Allow editing code directly on the server after opening it from ObjectScript Explorer.",
1403+
"deprecationMessage": "This setting is deprecated and will be removed in the next release."
14031404
},
14041405
"objectscript.debug.debugThisMethod": {
14051406
"type": "boolean",

src/extension.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,8 +443,7 @@ export async function checkConnection(
443443
explorerProvider.refresh();
444444
projectsExplorerProvider.refresh();
445445
// Refreshing Files Explorer also switches to it, so only do this if the uri is part of the workspace,
446-
// otherwise files opened from ObjectScript Explorer (objectscript:// or isfs:// depending on the "objectscript.serverSideEditing" setting)
447-
// will cause an unwanted switch.
446+
// otherwise files opened from ObjectScript Explorer (objectscript://) will cause an unwanted switch.
448447
if (uri && schemas.includes(uri.scheme) && vscode.workspace.getWorkspaceFolder(uri)) {
449448
vscode.commands.executeCommand("workbench.files.action.refreshFilesExplorer");
450449
}

src/providers/DocumentContentProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ export class DocumentContentProvider implements vscode.TextDocumentContentProvid
198198
}
199199
const data = await api.getDoc(fileName);
200200
if (Buffer.isBuffer(data.result.content)) {
201-
return "\nThis is a binary file.\n\nTo access its contents, export it to the local file system.\nAlternatively, enable the 'objectscript.serverSideEditing' setting.";
201+
return "\nThis is a binary file.\n\nTo access its contents, export it to the local file system.";
202202
} else {
203203
return data.result.content.join("\n");
204204
}

0 commit comments

Comments
 (0)