Skip to content

Fix proposed API registration #814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 27, 2021
Merged

Fix proposed API registration #814

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f80c90a
Fix proposed API registration
isc-bsaviano Dec 27, 2021
bc01d09
Remove enableProposedApi checks
isc-bsaviano Dec 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,18 +634,22 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {

const diagnosticProvider = new ObjectScriptDiagnosticProvider();

// Gather the proposed APIs we will register to use when building with enableProposedApi = true
// Gather the proposed APIs we will register to use when building with enabledApiProposals != []
const proposed = [
packageJson.enableProposedApi && typeof vscode.workspace.registerFileSearchProvider === "function"
packageJson.enabledApiProposals.includes("fileSearchProvider") &&
typeof vscode.workspace.registerFileSearchProvider === "function"
? vscode.workspace.registerFileSearchProvider(FILESYSTEM_SCHEMA, new FileSearchProvider())
: null,
packageJson.enableProposedApi && typeof vscode.workspace.registerFileSearchProvider === "function"
packageJson.enabledApiProposals.includes("fileSearchProvider") &&
typeof vscode.workspace.registerFileSearchProvider === "function"
? vscode.workspace.registerFileSearchProvider(FILESYSTEM_READONLY_SCHEMA, new FileSearchProvider())
: null,
packageJson.enableProposedApi && typeof vscode.workspace.registerTextSearchProvider === "function"
packageJson.enabledApiProposals.includes("textSearchProvider") &&
typeof vscode.workspace.registerTextSearchProvider === "function"
? vscode.workspace.registerTextSearchProvider(FILESYSTEM_SCHEMA, new TextSearchProvider())
: null,
packageJson.enableProposedApi && typeof vscode.workspace.registerTextSearchProvider === "function"
packageJson.enabledApiProposals.includes("textSearchProvider") &&
typeof vscode.workspace.registerTextSearchProvider === "function"
? vscode.workspace.registerTextSearchProvider(FILESYSTEM_READONLY_SCHEMA, new TextSearchProvider())
: null,
].filter(notNull);
Expand Down