mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-13 19:11:36 -04:00
e3bce7172c
* Handle delayed Notebook provider registration - Fixes #3197 Notebooks: builtin provider always used on reopen with notebook file visible - Fixes #3414 Can't refresh kernel after connect to big data cluster There are 3 parts to this fix: - If no notebook provider other than the default is installed, we warn users and prompt to install the SQL2019 extension - We wait on the extension host registration to complete before determining which provider to use - We know that the extension registration of the provider instance will be after package.json is read, so if we wait after registration for 10 seconds to give this a chance to happen before returning a provider to the front end * Remove launch.json change that was added accidentally * Fix timeout not being the expected value * Removed console log left in during debugging * Remove unnecessary whitespace * Fix unit test failure * Name the registration better, and remove outdated comments
60 lines
2.1 KiB
TypeScript
60 lines
2.1 KiB
TypeScript
/*---------------------------------------------------------------------------------------------
|
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
|
*--------------------------------------------------------------------------------------------*/
|
|
|
|
'use strict';
|
|
|
|
import * as path from 'path';
|
|
import { nb } from 'sqlops';
|
|
import * as os from 'os';
|
|
import * as pfs from 'vs/base/node/pfs';
|
|
import { localize } from 'vs/nls';
|
|
import { IOutputChannel } from 'vs/workbench/parts/output/common/output';
|
|
import { DEFAULT_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_FILETYPE, INotebookService } from 'sql/services/notebook/notebookService';
|
|
|
|
|
|
/**
|
|
* Test whether an output is from a stream.
|
|
*/
|
|
export function isStream(output: nb.ICellOutput): output is nb.IStreamResult {
|
|
return output.output_type === 'stream';
|
|
}
|
|
|
|
export function getErrorMessage(error: Error | string): string {
|
|
return (error instanceof Error) ? error.message : error;
|
|
}
|
|
|
|
export function getUserHome(): string {
|
|
return process.env.HOME || process.env.USERPROFILE;
|
|
}
|
|
|
|
export async function mkDir(dirPath: string, outputChannel?: IOutputChannel): Promise<void> {
|
|
let exists = await pfs.dirExists(dirPath);
|
|
if (!exists) {
|
|
if (outputChannel) {
|
|
outputChannel.append(localize('mkdirOutputMsg', '... Creating {0}', dirPath) + os.EOL);
|
|
}
|
|
await pfs.mkdirp(dirPath);
|
|
}
|
|
}
|
|
|
|
export function getProviderForFileName(fileName: string, notebookService: INotebookService): string {
|
|
let fileExt = path.extname(fileName);
|
|
let provider: string;
|
|
// First try to get provider for actual file type
|
|
if (fileExt && fileExt.startsWith('.')) {
|
|
fileExt = fileExt.slice(1,fileExt.length);
|
|
provider = notebookService.getProviderForFileType(fileExt);
|
|
}
|
|
// Fallback to provider for default file type (assume this is a global handler)
|
|
if (!provider) {
|
|
provider = notebookService.getProviderForFileType(DEFAULT_NOTEBOOK_FILETYPE);
|
|
}
|
|
// Finally if all else fails, use the built-in handler
|
|
if (!provider) {
|
|
provider = DEFAULT_NOTEBOOK_PROVIDER;
|
|
}
|
|
return provider;
|
|
}
|