ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use SQL kernel as default when opening a notebook with an unknown provider (#20828)

Browse Source
This commit is contained in:
Cory Rivera
2022-10-13 12:38:43 -07:00
committed by GitHub
parent 00800db506
commit 806580fe44
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts
View File

@@ -52,7 +52,7 @@ import { ImageMimeTypes, TextCellEditModes } from 'sql/workbench/services/notebo
import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { NotebookInput } from 'sql/workbench/contrib/notebook/browser/models/notebookInput'; import { NotebookInput } from 'sql/workbench/contrib/notebook/browser/models/notebookInput';
import { INotebookModel } from 'sql/workbench/services/notebook/browser/models/modelInterfaces'; import { INotebookModel } from 'sql/workbench/services/notebook/browser/models/modelInterfaces';
import { DEFAULT_NOTEBOOK_FILETYPE, IExecuteManager, SQL_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/browser/notebookService'; import { DefaultNotebookProviders, DEFAULT_NOTEBOOK_FILETYPE, IExecuteManager } from 'sql/workbench/services/notebook/browser/notebookService';
import { NotebookExplorerViewletViewsContribution } from 'sql/workbench/contrib/notebook/browser/notebookExplorer/notebookExplorerViewlet'; import { NotebookExplorerViewletViewsContribution } from 'sql/workbench/contrib/notebook/browser/notebookExplorer/notebookExplorerViewlet';
import { Disposable, DisposableStore } from 'vs/base/common/lifecycle'; import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
import { IEditorResolverService, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService'; import { IEditorResolverService, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
@@ -749,7 +749,7 @@ export class NotebookEditorOverrideContribution extends Disposable implements IW
this.registerEditorOverrides(); this.registerEditorOverrides();
}); });
notebookRegistry.onNewDescriptionRegistration(({ id, registration }) => { notebookRegistry.onNewDescriptionRegistration(({ id, registration }) => {
if (id !== JUPYTER_PROVIDER_ID && id !== SQL_NOTEBOOK_PROVIDER && registration?.fileExtensions?.length > 0) { if (!DefaultNotebookProviders.includes(id) && registration?.fileExtensions?.length > 0) {
let extensions = registration.fileExtensions let extensions = registration.fileExtensions
.filter(ext => ext?.length > 0 && ext.toLowerCase() !== DEFAULT_NOTEBOOK_FILETYPE); .filter(ext => ext?.length > 0 && ext.toLowerCase() !== DEFAULT_NOTEBOOK_FILETYPE);
this._newFileExtensions = this._newFileExtensions.concat(extensions); this._newFileExtensions = this._newFileExtensions.concat(extensions);

7
src/sql/workbench/services/notebook/browser/models/notebookModel.ts
View File

@@ -1083,12 +1083,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
if (provider && provider !== this._providerId) { if (provider && provider !== this._providerId) {
this._providerId = provider; this._providerId = provider;
} else if (!provider) { } else if (!provider) {
this.notebookOptions.executeManagers.forEach(m => { this._providerId = SQL_NOTEBOOK_PROVIDER;
if (m.providerId !== SQL_NOTEBOOK_PROVIDER) {
// We don't know which provider it is before that provider is chosen to query its specs. Choosing the "last" one registered.
this._providerId = m.providerId;
}
});
} }
this._defaultKernel = this._savedKernelInfo; this._defaultKernel = this._savedKernelInfo;
} else if (this._defaultKernel) { } else if (this._defaultKernel) {

3
src/sql/workbench/services/notebook/browser/notebookService.ts
View File

@@ -23,6 +23,7 @@ import { INotebookShowOptions } from 'sql/workbench/api/common/sqlExtHost.protoc
import { NotebookViewsExtension } from 'sql/workbench/services/notebook/browser/notebookViews/notebookViewsExtension'; import { NotebookViewsExtension } from 'sql/workbench/services/notebook/browser/notebookViews/notebookViewsExtension';
import { EditorInput } from 'vs/workbench/common/editor/editorInput'; import { EditorInput } from 'vs/workbench/common/editor/editorInput';
import { ICodeEditorViewState } from 'vs/editor/common/editorCommon'; import { ICodeEditorViewState } from 'vs/editor/common/editorCommon';
import { JUPYTER_PROVIDER_ID } from 'sql/workbench/common/constants';
import { IStandardKernelWithProvider } from 'sql/workbench/services/notebook/browser/models/notebookUtils'; import { IStandardKernelWithProvider } from 'sql/workbench/services/notebook/browser/models/notebookUtils';
export const SERVICE_ID = 'sqlNotebookService'; export const SERVICE_ID = 'sqlNotebookService';
@@ -33,6 +34,8 @@ export const DEFAULT_NOTEBOOK_FILETYPE = '.ipynb';
export const SQL_NOTEBOOK_PROVIDER = 'sql'; export const SQL_NOTEBOOK_PROVIDER = 'sql';
export const OVERRIDE_EDITOR_THEMING_SETTING = 'notebook.overrideEditorTheming'; export const OVERRIDE_EDITOR_THEMING_SETTING = 'notebook.overrideEditorTheming';
export const DefaultNotebookProviders = [SQL_NOTEBOOK_PROVIDER, JUPYTER_PROVIDER_ID];
export interface ILanguageMagic { export interface ILanguageMagic {
magic: string; magic: string;
language: string; language: string;

8
src/sql/workbench/services/notebook/browser/notebookServiceImpl.ts
View File

@@ -10,7 +10,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
import { import {
INotebookService, IExecuteManager, IExecuteProvider, INotebookService, IExecuteManager, IExecuteProvider,
DEFAULT_NOTEBOOK_FILETYPE, INotebookEditor, SQL_NOTEBOOK_PROVIDER, INavigationProvider, ILanguageMagic, NavigationProviders, unsavedBooksContextKey, ISerializationProvider, ISerializationManager DEFAULT_NOTEBOOK_FILETYPE, INotebookEditor, SQL_NOTEBOOK_PROVIDER, INavigationProvider, ILanguageMagic, NavigationProviders, unsavedBooksContextKey, ISerializationProvider, ISerializationManager, DefaultNotebookProviders
} from 'sql/workbench/services/notebook/browser/notebookService'; } from 'sql/workbench/services/notebook/browser/notebookService';
import { RenderMimeRegistry } from 'sql/workbench/services/notebook/browser/outputs/registry'; import { RenderMimeRegistry } from 'sql/workbench/services/notebook/browser/outputs/registry';
import { standardRendererFactories } from 'sql/workbench/services/notebook/browser/outputs/factories'; import { standardRendererFactories } from 'sql/workbench/services/notebook/browser/outputs/factories';
@@ -50,7 +50,7 @@ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editor
import { IEditorPane } from 'vs/workbench/common/editor'; import { IEditorPane } from 'vs/workbench/common/editor';
import { isINotebookInput } from 'sql/workbench/services/notebook/browser/interface'; import { isINotebookInput } from 'sql/workbench/services/notebook/browser/interface';
import { INotebookShowOptions } from 'sql/workbench/api/common/sqlExtHost.protocol'; import { INotebookShowOptions } from 'sql/workbench/api/common/sqlExtHost.protocol';
import { DEFAULT_NB_LANGUAGE_MODE, INTERACTIVE_LANGUAGE_MODE, INTERACTIVE_PROVIDER_ID, JUPYTER_PROVIDER_ID, NotebookLanguage } from 'sql/workbench/common/constants'; import { DEFAULT_NB_LANGUAGE_MODE, INTERACTIVE_LANGUAGE_MODE, INTERACTIVE_PROVIDER_ID, NotebookLanguage } from 'sql/workbench/common/constants';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { SqlSerializationProvider } from 'sql/workbench/services/notebook/browser/sql/sqlSerializationProvider'; import { SqlSerializationProvider } from 'sql/workbench/services/notebook/browser/sql/sqlSerializationProvider';
import { EditorInput } from 'vs/workbench/common/editor/editorInput'; import { EditorInput } from 'vs/workbench/common/editor/editorInput';
@@ -438,7 +438,7 @@ export class NotebookService extends Disposable implements INotebookService {
} }
// Emit activation event if the provider is not one of the default options // Emit activation event if the provider is not one of the default options
if (p.id !== SQL_NOTEBOOK_PROVIDER && p.id !== JUPYTER_PROVIDER_ID) { if (!DefaultNotebookProviders.includes(p.id)) {
this._extensionService.whenInstalledExtensionsRegistered() this._extensionService.whenInstalledExtensionsRegistered()
.then(() => this._extensionService.activateByEvent(`onNotebook:${p.id}`)) .then(() => this._extensionService.activateByEvent(`onNotebook:${p.id}`))
.then(() => this._extensionService.activateByEvent(`onNotebook:*`)) .then(() => this._extensionService.activateByEvent(`onNotebook:*`))
@@ -530,7 +530,7 @@ export class NotebookService extends Disposable implements INotebookService {
this._providerToStandardKernels.set(providerUpperCase, descriptor); this._providerToStandardKernels.set(providerUpperCase, descriptor);
// Emit update event if the provider is not one of the default options // Emit update event if the provider is not one of the default options
if (provider.provider !== SQL_NOTEBOOK_PROVIDER && provider.provider !== JUPYTER_PROVIDER_ID && standardKernels.length > 0) { if (!DefaultNotebookProviders.includes(provider.provider) && standardKernels.length > 0) {
this._onNotebookKernelsAdded.fire(standardKernels.map(kernel => { this._onNotebookKernelsAdded.fire(standardKernels.map(kernel => {
return { return {
name: kernel.name, name: kernel.name,