ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix for findSubstr not doing URI.file(<filename>).fspath (#2441)

Browse Source
This commit is contained in:
Chris LaFreniere
2018-09-06 15:04:16 -07:00
committed by GitHub
parent 401fc8161a
commit 7cf9217158
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/workbench/api/node/sqlExtHost.api.impl.ts
View File

@@ -12,6 +12,7 @@ import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionS
import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions'; import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
import { realpath } from 'fs'; import { realpath } from 'fs';
import * as extHostTypes from 'vs/workbench/api/node/extHostTypes'; import * as extHostTypes from 'vs/workbench/api/node/extHostTypes';
import URI from 'vs/base/common/uri';
import * as sqlops from 'sqlops'; import * as sqlops from 'sqlops';
import * as vscode from 'vscode'; import * as vscode from 'vscode';
@@ -482,7 +483,7 @@ function defineAPI(factory: ISqlExtensionApiFactory, extensionPaths: TrieMap<IEx
setDefaultApiImpl: (defaultImpl: ApiImpl) => void, setDefaultApiImpl: (defaultImpl: ApiImpl) => void,
parent: any): ApiImpl { parent: any): ApiImpl {
// get extension id from filename and api for extension // get extension id from filename and api for extension
const ext = extensionPaths.findSubstr(parent.filename); const ext = extensionPaths.findSubstr(URI.file(parent.filename).fsPath);
if (ext) { if (ext) {
let apiImpl = apiMap.get(ext.id); let apiImpl = apiMap.get(ext.id);
if (!apiImpl) { if (!apiImpl) {
@@ -494,6 +495,7 @@ function defineAPI(factory: ISqlExtensionApiFactory, extensionPaths: TrieMap<IEx
// fall back to a default implementation // fall back to a default implementation
if (!defaultImpl) { if (!defaultImpl) {
console.warn(`Could not identify extension for 'vscode' require call from ${parent.filename}`);
defaultImpl = createApi(nullExtensionDescription); defaultImpl = createApi(nullExtensionDescription);
setDefaultApiImpl(defaultImpl); setDefaultApiImpl(defaultImpl);
} }