Skip to content

Commit

Permalink
Re-enable the positronResolveSymlinks proposed API for the Python e…
Browse files Browse the repository at this point in the history
…xtension (posit-dev#3751)

Addresses point 1 from posit-dev#3710.

Looks like it was accidentally removed in the last upstream merge,
so I've renamed it from `resolveSymlinks` to `positronResolveSymlinks`
and moved it to the top of the list (so we don't have to add a trailing
comma to upstream's last list item) to hopefully avoid that happening
again.
  • Loading branch information
seeM authored Jul 3, 2024
1 parent 3b64e74 commit 8378a70
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions extensions/positron-python/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
},
"publisher": "ms-python",
"enabledApiProposals": [
"positronResolveSymlinks",
"contribEditorContentMenu",
"quickPickSortByLabel",
"testObserver",
"quickPickItemTooltip",
"terminalDataWriteEvent",
"terminalExecuteCommandEvent",
"contribIssueReporter",
"terminalShellIntegration",
"resolveSymlinks"
"terminalShellIntegration"
],
"author": {
"name": "Posit Software, PBC",
Expand Down
2 changes: 1 addition & 1 deletion extensions/positron-python/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"typings/vscode-proposed/*.d.ts",
"types/*.d.ts",
"types/src/vscode-dts/*.d.ts",
"../../src/vscode-dts/vscode.proposed.resolveSymlinks.d.ts",
"../../src/vscode-dts/vscode.proposed.positronResolveSymlinks.d.ts",
"../../src/positron-dts/positron.d.ts",
"../../src/positron-dts/ui-comm.d.ts"
]
Expand Down
1 change: 1 addition & 0 deletions product.json
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@
"resolvers"
],
"ms-python.python": [
"positronResolveSymlinks",
"contribEditorContentMenu",
"quickPickSortByLabel",
"portsAttributes",
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/api/common/extHostDialogs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class ExtHostDialogs {
}
// --- Start Positron ---
if (typeof options?.resolveSymlinks === 'boolean') {
checkProposedApiEnabled(extension, 'resolveSymlinks');
checkProposedApiEnabled(extension, 'positronResolveSymlinks');
}
// --- End Positron ---
return this._proxy.$showOpenDialog(options).then(filepaths => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ export const allApiProposals = Object.freeze({
notebookMime: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookMime.d.ts',
notebookVariableProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookVariableProvider.d.ts',
portsAttributes: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.portsAttributes.d.ts',
positronResolveSymlinks: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.positronResolveSymlinks.d.ts',
profileContentHandlers: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.profileContentHandlers.d.ts',
quickDiffProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickDiffProvider.d.ts',
quickPickItemTooltip: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickItemTooltip.d.ts',
quickPickSortByLabel: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickSortByLabel.d.ts',
resolveSymlinks: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.resolveSymlinks.d.ts',
resolvers: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.resolvers.d.ts',
scmActionButton: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmActionButton.d.ts',
scmHistoryProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts',
Expand Down

0 comments on commit 8378a70

Please sign in to comment.