From ceb36b85b7fcf73d94136bb5aabbbd0f9e076d5c Mon Sep 17 00:00:00 2001 From: goanpeca Date: Mon, 10 Aug 2020 17:30:55 -0500 Subject: [PATCH] Back to business --- examples/console/src/index.ts | 4 +-- examples/notebook/src/index.ts | 4 +-- packages/application-extension/tsconfig.json | 4 +-- packages/application/tsconfig.json | 4 +-- packages/application/tsconfig.test.json | 5 +-- packages/apputils-extension/src/palette.ts | 21 ++++--------- .../src/workspacesplugin.ts | 3 +- packages/apputils-extension/tsconfig.json | 4 +-- packages/apputils/src/sessioncontext.tsx | 9 ++++-- packages/apputils/src/tokens.ts | 2 +- packages/apputils/test/sessioncontext.spec.ts | 1 + packages/apputils/tsconfig.json | 4 +-- packages/apputils/tsconfig.test.json | 5 +-- packages/celltags/tsconfig.json | 4 +-- packages/codeeditor/src/tokens.ts | 6 ++-- packages/codeeditor/tsconfig.json | 4 +-- packages/codeeditor/tsconfig.test.json | 5 +-- packages/codemirror/src/index.ts | 20 ++++++++---- packages/codemirror/src/mimetype.ts | 7 ----- packages/console-extension/src/index.ts | 14 +++------ packages/console-extension/tsconfig.json | 4 +-- packages/console/test/utils.ts | 6 ++-- packages/console/tsconfig.json | 4 +-- packages/console/tsconfig.test.json | 5 +-- packages/debugger/src/factory.ts | 13 ++------ packages/debugger/src/panels/sources/body.ts | 10 +----- packages/debugger/test/debugger.spec.ts | 15 +++------ packages/debugger/tsconfig.json | 4 +-- packages/debugger/tsconfig.test.json | 5 +-- packages/docregistry/src/context.ts | 14 ++++++--- packages/docregistry/src/default.ts | 2 +- packages/docregistry/tsconfig.json | 4 +-- packages/docregistry/tsconfig.test.json | 5 +-- packages/documentsearch/tsconfig.json | 4 +-- .../extensionmanager-extension/tsconfig.json | 4 +-- packages/extensionmanager/tsconfig.json | 4 +-- packages/filebrowser-extension/tsconfig.json | 4 +-- packages/filebrowser/src/uploadstatus.tsx | 2 +- packages/filebrowser/tsconfig.json | 4 +-- packages/filebrowser/tsconfig.test.json | 5 +-- packages/fileeditor-extension/tsconfig.json | 4 +-- packages/fileeditor/src/widget.ts | 12 ++----- packages/fileeditor/tsconfig.json | 4 +-- packages/fileeditor/tsconfig.test.json | 5 +-- packages/help-extension/tsconfig.json | 4 +-- packages/htmlviewer-extension/tsconfig.json | 4 +-- packages/htmlviewer/tsconfig.json | 4 +-- packages/inspector-extension/tsconfig.json | 4 +-- packages/json-extension/tsconfig.json | 4 +-- packages/launcher-extension/tsconfig.json | 4 +-- packages/launcher/tsconfig.json | 4 +-- packages/logconsole-extension/tsconfig.json | 4 +-- packages/mainmenu-extension/tsconfig.json | 4 +-- packages/mainmenu/src/file.ts | 6 ---- packages/mainmenu/test/file.spec.ts | 5 ++- packages/mainmenu/test/kernel.spec.ts | 3 +- packages/mainmenu/test/run.spec.ts | 6 ++-- packages/notebook-extension/src/index.ts | 16 +++------- packages/notebook-extension/tsconfig.json | 4 +-- packages/notebook/src/notebooktools.ts | 31 ++++++++++++------- packages/notebook/src/truststatus.tsx | 2 +- packages/notebook/tsconfig.json | 4 +-- packages/notebook/tsconfig.test.json | 5 +-- packages/rendermime/src/renderers.ts | 2 +- packages/running-extension/tsconfig.json | 4 +-- packages/running/tsconfig.json | 4 +-- packages/settingeditor-extension/src/index.ts | 2 +- .../settingeditor-extension/tsconfig.json | 4 +-- packages/settingeditor/tsconfig.json | 4 +-- packages/statusbar/tsconfig.json | 4 +-- packages/statusbar/tsconfig.test.json | 5 +-- packages/tabmanager-extension/tsconfig.json | 4 +-- packages/terminal-extension/tsconfig.json | 8 ++--- packages/toc-extension/tsconfig.json | 4 +-- .../generators/markdown/toolbar_generator.tsx | 17 ++-------- .../generators/notebook/options_manager.ts | 2 +- .../generators/notebook/toolbar_generator.tsx | 4 +-- packages/toc/src/toc.tsx | 2 +- packages/toc/test/toc.spec.ts | 5 ++- packages/toc/tsconfig.json | 4 +-- packages/toc/tsconfig.test.json | 5 +-- packages/translation/test/base.spec.ts | 3 +- testutils/src/notebook-utils.ts | 6 ++-- 83 files changed, 160 insertions(+), 324 deletions(-) diff --git a/examples/console/src/index.ts b/examples/console/src/index.ts index be9d4b00f1d5..1751e0b16033 100644 --- a/examples/console/src/index.ts +++ b/examples/console/src/index.ts @@ -69,14 +69,14 @@ function startApp(path: string, manager: ServiceManager.IManager) { const rendermime = new RenderMimeRegistry({ initialFactories }); - const editorFactory = editorServices.getFactoryService().newInlineEditor; + const editorFactory = editorServices.factoryService.newInlineEditor; const contentFactory = new ConsolePanel.ContentFactory({ editorFactory }); const consolePanel = new ConsolePanel({ rendermime, manager, path, contentFactory, - mimeTypeService: editorServices.getMimeTypeService() + mimeTypeService: editorServices.mimeTypeService }); consolePanel.title.label = TITLE; diff --git a/examples/notebook/src/index.ts b/examples/notebook/src/index.ts index 1d1224e15a22..b017d319c956 100755 --- a/examples/notebook/src/index.ts +++ b/examples/notebook/src/index.ts @@ -89,7 +89,7 @@ function createApp(manager: ServiceManager.IManager): void { opener }); const mFactory = new NotebookModelFactory({}); - const editorFactory = editorServices.getFactoryService().newInlineEditor; + const editorFactory = editorServices.factoryService.newInlineEditor; const contentFactory = new NotebookPanel.ContentFactory({ editorFactory }); const wFactory = new NotebookWidgetFactory({ @@ -101,7 +101,7 @@ function createApp(manager: ServiceManager.IManager): void { canStartKernel: true, rendermime, contentFactory, - mimeTypeService: editorServices.getMimeTypeService() + mimeTypeService: editorServices.mimeTypeService }); docRegistry.addModelFactory(mFactory); docRegistry.addWidgetFactory(wFactory); diff --git a/packages/application-extension/tsconfig.json b/packages/application-extension/tsconfig.json index 45d621ba1ade..2ec4a9fcab98 100644 --- a/packages/application-extension/tsconfig.json +++ b/packages/application-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/application/tsconfig.json b/packages/application/tsconfig.json index 1f8e6cd0c1dd..df083849c1f2 100644 --- a/packages/application/tsconfig.json +++ b/packages/application/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../apputils" diff --git a/packages/application/tsconfig.test.json b/packages/application/tsconfig.test.json index 3e04ef055ac7..aae548fd1d46 100644 --- a/packages/application/tsconfig.test.json +++ b/packages/application/tsconfig.test.json @@ -1,9 +1,6 @@ { "extends": "../../tsconfigbase.test", - "include": [ - "src/*", - "test/*" - ], + "include": ["src/*", "test/*"], "references": [ { "path": "../apputils" diff --git a/packages/apputils-extension/src/palette.ts b/packages/apputils-extension/src/palette.ts index 078c39f097dd..ffcecc2503c2 100644 --- a/packages/apputils-extension/src/palette.ts +++ b/packages/apputils-extension/src/palette.ts @@ -10,11 +10,7 @@ import { CommandPalette } from '@lumino/widgets'; import { ILayoutRestorer, JupyterFrontEnd } from '@jupyterlab/application'; import { ICommandPalette, IPaletteItem } from '@jupyterlab/apputils'; -import { - nullTranslator, - ITranslator, - TranslationBundle -} from '@jupyterlab/translation'; +import { ITranslator } from '@jupyterlab/translation'; import { CommandPaletteSvg, paletteIcon } from '@jupyterlab/ui-components'; /** @@ -32,12 +28,11 @@ export class Palette implements ICommandPalette { /** * Create a palette instance. */ - constructor(palette: CommandPalette, translator?: ITranslator) { - this.translator = translator || nullTranslator; - this._trans = this.translator.load('jupyterlab'); + constructor(palette: CommandPalette, translator: ITranslator) { + const trans = translator.load('jupyterlab'); this._palette = palette; this._palette.title.label = ''; - this._palette.title.caption = this._trans.__('Command Palette'); + this._palette.title.caption = trans.__('Command Palette'); } /** @@ -71,8 +66,6 @@ export class Palette implements ICommandPalette { }); } - protected translator: ITranslator; - private _trans: TranslationBundle; private _palette: CommandPalette; } @@ -129,7 +122,7 @@ export namespace Palette { export function restore( app: JupyterFrontEnd, restorer: ILayoutRestorer, - translator?: ITranslator + translator: ITranslator ): void { const palette = Private.createPalette(app, translator); @@ -154,11 +147,9 @@ namespace Private { */ export function createPalette( app: JupyterFrontEnd, - translator?: ITranslator + translator: ITranslator ): CommandPalette { if (!palette) { - translator = translator || nullTranslator; - // use a renderer tweaked to use inline svg icons palette = new CommandPalette({ commands: app.commands, diff --git a/packages/apputils-extension/src/workspacesplugin.ts b/packages/apputils-extension/src/workspacesplugin.ts index 9ca8675e48e4..b239db71ada9 100644 --- a/packages/apputils-extension/src/workspacesplugin.ts +++ b/packages/apputils-extension/src/workspacesplugin.ts @@ -208,9 +208,8 @@ namespace Private { workspaces: WorkspaceManager, router: IRouter | null, state: IStateDB, - translator?: ITranslator + translator: ITranslator ) { - translator = translator || nullTranslator; const trans = translator.load('jupyterlab'); super({ name: trans.__('Workspace loader'), diff --git a/packages/apputils-extension/tsconfig.json b/packages/apputils-extension/tsconfig.json index ced980aaaf50..0321aadee6b4 100644 --- a/packages/apputils-extension/tsconfig.json +++ b/packages/apputils-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/apputils/src/sessioncontext.tsx b/packages/apputils/src/sessioncontext.tsx index 2581c76e44a9..ada9b5ac3de3 100644 --- a/packages/apputils/src/sessioncontext.tsx +++ b/packages/apputils/src/sessioncontext.tsx @@ -278,6 +278,7 @@ export namespace ISessionContext { } export type KernelDisplayStatus = string; + // FIXES: Use a map to map {[status: KernelDisplayStatus]: string} // export type KernelDisplayStatus = // | Kernel.Status // | Kernel.ConnectionStatus @@ -538,6 +539,8 @@ export class SessionContext implements ISessionContext { * the user. */ get kernelDisplayStatus(): string { + // FIXME: + // get kernelDisplayStatus(): ISessionContext.KernelDisplayStatus { const kernel = this.session?.kernel; if (this._isTerminating) { @@ -1305,7 +1308,7 @@ namespace Private { /** * Create a new kernel selector widget. */ - constructor(sessionContext: ISessionContext, translator?: ITranslator) { + constructor(sessionContext: ISessionContext, translator: ITranslator) { super({ node: createSelectorNode(sessionContext, translator) }); } @@ -1323,7 +1326,7 @@ namespace Private { */ function createSelectorNode( sessionContext: ISessionContext, - translator?: ITranslator + translator: ITranslator ) { translator = translator || nullTranslator; const trans = translator.load('jupyterlab'); @@ -1414,7 +1417,7 @@ namespace Private { export function populateKernelSelect( node: HTMLSelectElement, options: SessionContext.IKernelSearch, - translator?: ITranslator + translator: ITranslator ): void { translator = translator || nullTranslator; const trans = translator.load('jupyterlab'); diff --git a/packages/apputils/src/tokens.ts b/packages/apputils/src/tokens.ts index ae03494cd36a..58af4fa2ff1f 100644 --- a/packages/apputils/src/tokens.ts +++ b/packages/apputils/src/tokens.ts @@ -114,7 +114,7 @@ export namespace IThemeManager { /** * The display name of the theme. */ - displayName: string; + displayName?: string; /** * Whether the theme includes styling for the scrollbar. diff --git a/packages/apputils/test/sessioncontext.spec.ts b/packages/apputils/test/sessioncontext.spec.ts index ba23c43e9c1f..e318956aeba3 100644 --- a/packages/apputils/test/sessioncontext.spec.ts +++ b/packages/apputils/test/sessioncontext.spec.ts @@ -440,6 +440,7 @@ describe('@jupyterlab/apputils', () => { }); it('should handle an error during kernel change', async () => { + // FIXME: Test failing await sessionContext.initialize(); await sessionContext.session?.kernel?.info; let status = 'idle'; diff --git a/packages/apputils/tsconfig.json b/packages/apputils/tsconfig.json index ccd74f2159dc..4beda3db4a88 100644 --- a/packages/apputils/tsconfig.json +++ b/packages/apputils/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../coreutils" diff --git a/packages/apputils/tsconfig.test.json b/packages/apputils/tsconfig.test.json index 4fc0dbd72224..3074a70a8161 100644 --- a/packages/apputils/tsconfig.test.json +++ b/packages/apputils/tsconfig.test.json @@ -1,9 +1,6 @@ { "extends": "../../tsconfigbase.test", - "include": [ - "src/*", - "test/*" - ], + "include": ["src/*", "test/*"], "references": [ { "path": "../coreutils" diff --git a/packages/celltags/tsconfig.json b/packages/celltags/tsconfig.json index 6e6acb71fe61..b8703e691baf 100644 --- a/packages/celltags/tsconfig.json +++ b/packages/celltags/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/codeeditor/src/tokens.ts b/packages/codeeditor/src/tokens.ts index d04d38f48a88..083302829a18 100644 --- a/packages/codeeditor/src/tokens.ts +++ b/packages/codeeditor/src/tokens.ts @@ -1,8 +1,6 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. -import { ITranslator } from '@jupyterlab/translation'; - import { Token } from '@lumino/coreutils'; import { IEditorFactoryService } from './factory'; @@ -25,10 +23,10 @@ export interface IEditorServices { /** * The code editor factory. */ - getFactoryService(translator?: ITranslator): IEditorFactoryService; + readonly factoryService: IEditorFactoryService; /** * The editor mime type service. */ - getMimeTypeService(translator?: ITranslator): IEditorMimeTypeService; + readonly mimeTypeService: IEditorMimeTypeService; } diff --git a/packages/codeeditor/tsconfig.json b/packages/codeeditor/tsconfig.json index 2eee06399cc8..81a258eea6bc 100644 --- a/packages/codeeditor/tsconfig.json +++ b/packages/codeeditor/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../coreutils" diff --git a/packages/codeeditor/tsconfig.test.json b/packages/codeeditor/tsconfig.test.json index a4ff83152060..c4c932fbd34d 100644 --- a/packages/codeeditor/tsconfig.test.json +++ b/packages/codeeditor/tsconfig.test.json @@ -1,9 +1,6 @@ { "extends": "../../tsconfigbase.test", - "include": [ - "src/*", - "test/*" - ], + "include": ["src/*", "test/*"], "references": [ { "path": "../coreutils" diff --git a/packages/codemirror/src/index.ts b/packages/codemirror/src/index.ts index 7c1cdc5a1c05..624805f35266 100644 --- a/packages/codemirror/src/index.ts +++ b/packages/codemirror/src/index.ts @@ -3,8 +3,6 @@ import { IEditorServices } from '@jupyterlab/codeeditor'; -import { ITranslator } from '@jupyterlab/translation'; - import { CodeMirrorEditorFactory } from './factory'; import { CodeMirrorMimeTypeService } from './mimetype'; @@ -19,8 +17,18 @@ export * from './syntaxstatus'; * The default editor services. */ export const editorServices: IEditorServices = { - getFactoryService: (translator?: ITranslator) => - new CodeMirrorEditorFactory({}, translator), - getMimeTypeService: (translator?: ITranslator) => - new CodeMirrorMimeTypeService(translator) + factoryService: new CodeMirrorEditorFactory(), + mimeTypeService: new CodeMirrorMimeTypeService() }; + +/** + * FIXME: Maybe an option to be able to pass a translator to the factories? + * + +export function getEditorServices(translator: ITranslator): IEditorServices { + return { + factoryService: new CodeMirrorEditorFactory({}, translator), + mimeTypeService: new CodeMirrorMimeTypeService() + }; +} + */ diff --git a/packages/codemirror/src/mimetype.ts b/packages/codemirror/src/mimetype.ts index 8d30a153f9b6..f871c79110bf 100644 --- a/packages/codemirror/src/mimetype.ts +++ b/packages/codemirror/src/mimetype.ts @@ -7,8 +7,6 @@ import { PathExt } from '@jupyterlab/coreutils'; import * as nbformat from '@jupyterlab/nbformat'; -import { ITranslator, nullTranslator } from '@jupyterlab/translation'; - import { Mode } from './mode'; /** @@ -21,9 +19,6 @@ export class CodeMirrorMimeTypeService implements IEditorMimeTypeService { * #### Notes * If a mime type cannot be found returns the defaul mime type `text/plain`, never `null`. */ - constructor(translator?: ITranslator) { - this.translator = translator || nullTranslator; - } getMimeTypeByLanguage(info: nbformat.ILanguageInfoMetadata): string { const ext = info.file_extension || ''; return Mode.findBest( @@ -51,6 +46,4 @@ export class CodeMirrorMimeTypeService implements IEditorMimeTypeService { const mode = Mode.findByFileName(path) || Mode.findBest(''); return mode.mime; } - - protected translator: ITranslator; } diff --git a/packages/console-extension/src/index.ts b/packages/console-extension/src/index.ts index 39fa743f4fd6..a9f000a2e558 100644 --- a/packages/console-extension/src/index.ts +++ b/packages/console-extension/src/index.ts @@ -128,15 +128,10 @@ const tracker: JupyterFrontEndPlugin = { const factory: JupyterFrontEndPlugin = { id: '@jupyterlab/console-extension:factory', provides: ConsolePanel.IContentFactory, - requires: [IEditorServices, ITranslator], + requires: [IEditorServices], autoStart: true, - activate: ( - app: JupyterFrontEnd, - editorServices: IEditorServices, - translator: ITranslator - ) => { - const editorFactory = editorServices.getFactoryService(translator) - .newInlineEditor; + activate: (app: JupyterFrontEnd, editorServices: IEditorServices) => { + const editorFactory = editorServices.factoryService.newInlineEditor; return new ConsolePanel.ContentFactory({ editorFactory }); } }; @@ -264,12 +259,13 @@ async function activateConsole( * Create a console for a given path. */ async function createConsole(options: ICreateOptions): Promise { + console.log('async function createConsole(', translator); await manager.ready; const panel = new ConsolePanel({ manager, contentFactory, - mimeTypeService: editorServices.getMimeTypeService(translator), + mimeTypeService: editorServices.mimeTypeService, rendermime, translator, setBusy: (status && (() => status.setBusy())) ?? undefined, diff --git a/packages/console-extension/tsconfig.json b/packages/console-extension/tsconfig.json index d4bbaccfda5e..970811095722 100644 --- a/packages/console-extension/tsconfig.json +++ b/packages/console-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/console/test/utils.ts b/packages/console/test/utils.ts index 9eda0f74d35a..eaa5a8e2da48 100644 --- a/packages/console/test/utils.ts +++ b/packages/console/test/utils.ts @@ -7,11 +7,11 @@ import { defaultRenderMime } from '@jupyterlab/testutils'; import { CodeConsole, ConsolePanel } from '../src'; -export const editorFactory = editorServices.getFactoryService().newInlineEditor.bind( - editorServices.getFactoryService() +export const editorFactory = editorServices.factoryService.newInlineEditor.bind( + editorServices.factoryService ); -export const mimeTypeService = editorServices.getMimeTypeService(); +export const mimeTypeService = editorServices.mimeTypeService; export const rendermime = defaultRenderMime(); diff --git a/packages/console/tsconfig.json b/packages/console/tsconfig.json index a762bf7cd7f6..83d80c58876f 100644 --- a/packages/console/tsconfig.json +++ b/packages/console/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../apputils" diff --git a/packages/console/tsconfig.test.json b/packages/console/tsconfig.test.json index f495edf5543b..5642011a4c4e 100644 --- a/packages/console/tsconfig.test.json +++ b/packages/console/tsconfig.test.json @@ -1,9 +1,6 @@ { "extends": "../../tsconfigbase.test", - "include": [ - "src/*", - "test/*" - ], + "include": ["src/*", "test/*"], "references": [ { "path": "../apputils" diff --git a/packages/debugger/src/factory.ts b/packages/debugger/src/factory.ts index 5e9e835ce72e..59cea43f52d2 100644 --- a/packages/debugger/src/factory.ts +++ b/packages/debugger/src/factory.ts @@ -8,7 +8,6 @@ import { } from '@jupyterlab/codeeditor'; import { IDebugger } from '.'; -import { ITranslator, nullTranslator } from '@jupyterlab/translation'; /** * A widget factory for read only editors. @@ -21,7 +20,6 @@ export class ReadOnlyEditorFactory { */ constructor(options: ReadOnlyEditorFactory.IOptions) { this._services = options.editorServices; - this.translator = options.translator || nullTranslator; } /** @@ -31,9 +29,8 @@ export class ReadOnlyEditorFactory { */ createNewEditor(source: IDebugger.Source): CodeEditorWrapper { const { content, mimeType, path } = source; - const factory = this._services.getFactoryService(this.translator) - .newInlineEditor; - const mimeTypeService = this._services.getMimeTypeService(this.translator); + const factory = this._services.factoryService.newInlineEditor; + const mimeTypeService = this._services.mimeTypeService; const editor = new CodeEditorWrapper({ model: new CodeEditor.Model({ value: content, @@ -49,7 +46,6 @@ export class ReadOnlyEditorFactory { return editor; } - protected translator: ITranslator; private _services: IEditorServices; } @@ -65,10 +61,5 @@ export namespace ReadOnlyEditorFactory { * The editor services used by the factory. */ editorServices: IEditorServices; - - /** - * The application language translator. - */ - translator?: ITranslator; } } diff --git a/packages/debugger/src/panels/sources/body.ts b/packages/debugger/src/panels/sources/body.ts index 511f0d318664..cf67d5201128 100644 --- a/packages/debugger/src/panels/sources/body.ts +++ b/packages/debugger/src/panels/sources/body.ts @@ -16,7 +16,6 @@ import { Debugger } from '../..'; import { EditorHandler } from '../../handlers/editor'; import { IDebugger } from '../../tokens'; -import { ITranslator } from '@jupyterlab/translation'; /** * The body for a Sources Panel. @@ -31,9 +30,7 @@ export class SourcesBody extends Widget { super(); this._model = options.model; this._debuggerService = options.service; - this._mimeTypeService = options.editorServices.getMimeTypeService( - options.translator - ); + this._mimeTypeService = options.editorServices.mimeTypeService; const factory = new Debugger.ReadOnlyEditorFactory({ editorServices: options.editorServices @@ -158,10 +155,5 @@ export namespace SourcesBody { * The editor services used to create new read-only editors. */ editorServices: IEditorServices; - - /** - * The application language translator. - */ - translator?: ITranslator; } } diff --git a/packages/debugger/test/debugger.spec.ts b/packages/debugger/test/debugger.spec.ts index fc7c76e8791a..f658a3c0c776 100644 --- a/packages/debugger/test/debugger.spec.ts +++ b/packages/debugger/test/debugger.spec.ts @@ -39,7 +39,6 @@ import { SourcesBody } from '../src/panels/sources/body'; import { SourcesHeader } from '../src/panels/sources/header'; import { IDebugger } from '../src/tokens'; -import { ITranslator } from '@jupyterlab/translation'; /** * A test sidebar. @@ -62,14 +61,8 @@ describe('Debugger', () => { const config = new Debugger.Config(); const service = new DebuggerService({ specsManager, config }); const registry = new CommandRegistry(); - - function getFactoryService(translator?: ITranslator) { - return new CodeMirrorEditorFactory({}, translator); - } - function getMimeTypeService(translator?: ITranslator) { - return new CodeMirrorMimeTypeService(translator); - } - + const factoryService = new CodeMirrorEditorFactory(); + const mimeTypeService = new CodeMirrorMimeTypeService(); const lines = [3, 5]; const code = [ 'i = 0', @@ -108,8 +101,8 @@ describe('Debugger', () => { stepOut: '' }, editorServices: { - getFactoryService, - getMimeTypeService + factoryService, + mimeTypeService } }); diff --git a/packages/debugger/tsconfig.json b/packages/debugger/tsconfig.json index 8227b2c6effa..bf19d13caeb0 100644 --- a/packages/debugger/tsconfig.json +++ b/packages/debugger/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/**/*" - ], + "include": ["src/**/*"], "references": [ { "path": "../application" diff --git a/packages/debugger/tsconfig.test.json b/packages/debugger/tsconfig.test.json index 63be88a07228..aa25ac5508c0 100644 --- a/packages/debugger/tsconfig.test.json +++ b/packages/debugger/tsconfig.test.json @@ -1,9 +1,6 @@ { "extends": "../../tsconfigbase.test", - "include": [ - "src/*", - "test/*" - ], + "include": ["src/*", "test/*"], "references": [ { "path": "../application" diff --git a/packages/docregistry/src/context.ts b/packages/docregistry/src/context.ts index a4716d4b1d39..be7932689506 100644 --- a/packages/docregistry/src/context.ts +++ b/packages/docregistry/src/context.ts @@ -869,15 +869,21 @@ namespace Private { /** * Get a new file path from the user. */ - export function getSavePath(path: string): Promise { - const saveBtn = Dialog.okButton({ label: this._trans.__('Save') }); + export function getSavePath( + path: string, + translator?: ITranslator + ): Promise { + translator = translator || nullTranslator; + const trans = translator.load('jupyterlab'); + + const saveBtn = Dialog.okButton({ label: trans.__('Save') }); return showDialog({ - title: this._trans.__('Save File As..'), + title: trans.__('Save File As..'), body: new SaveWidget(path), buttons: [Dialog.cancelButton(), saveBtn] }).then(result => { // FIXME: Is this safe? Why not use id or other? - if (result.button.label === this._trans.__('Save')) { + if (result.button.label === trans.__('Save')) { return result.value ?? undefined; } return; diff --git a/packages/docregistry/src/default.ts b/packages/docregistry/src/default.ts index 81a9580164f7..c839f4f4d366 100644 --- a/packages/docregistry/src/default.ts +++ b/packages/docregistry/src/default.ts @@ -436,11 +436,11 @@ export abstract class ABCWidgetFactory< return []; } - protected _translator: ITranslator; private _toolbarFactory: | ((widget: T) => DocumentRegistry.IToolbarItem[]) | undefined; private _isDisposed = false; + private _translator: ITranslator; private _name: string; private _readOnly: boolean; private _canStartKernel: boolean; diff --git a/packages/docregistry/tsconfig.json b/packages/docregistry/tsconfig.json index 179f14f8cb25..c4f96772d4db 100644 --- a/packages/docregistry/tsconfig.json +++ b/packages/docregistry/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../apputils" diff --git a/packages/docregistry/tsconfig.test.json b/packages/docregistry/tsconfig.test.json index cd0259b486f0..dfc98872d975 100644 --- a/packages/docregistry/tsconfig.test.json +++ b/packages/docregistry/tsconfig.test.json @@ -1,9 +1,6 @@ { "extends": "../../tsconfigbase.test", - "include": [ - "src/*", - "test/*" - ], + "include": ["src/*", "test/*"], "references": [ { "path": "../apputils" diff --git a/packages/documentsearch/tsconfig.json b/packages/documentsearch/tsconfig.json index 5a0d6e8af173..f57ca7471d20 100644 --- a/packages/documentsearch/tsconfig.json +++ b/packages/documentsearch/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/**/*" - ], + "include": ["src/**/*"], "references": [ { "path": "../apputils" diff --git a/packages/extensionmanager-extension/tsconfig.json b/packages/extensionmanager-extension/tsconfig.json index d0a5342502e3..d9e7ec59172e 100644 --- a/packages/extensionmanager-extension/tsconfig.json +++ b/packages/extensionmanager-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/extensionmanager/tsconfig.json b/packages/extensionmanager/tsconfig.json index 4552dba184b3..fefc51884b5a 100644 --- a/packages/extensionmanager/tsconfig.json +++ b/packages/extensionmanager/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/filebrowser-extension/tsconfig.json b/packages/filebrowser-extension/tsconfig.json index 2098a82ec93b..d3bbfbeb16dd 100644 --- a/packages/filebrowser-extension/tsconfig.json +++ b/packages/filebrowser-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/filebrowser/src/uploadstatus.tsx b/packages/filebrowser/src/uploadstatus.tsx index c637af97e856..2fb77966888d 100644 --- a/packages/filebrowser/src/uploadstatus.tsx +++ b/packages/filebrowser/src/uploadstatus.tsx @@ -127,7 +127,7 @@ export class FileUploadStatus extends VDomRenderer { } }; - protected translator: ITranslator; + private readonly translator: ITranslator; private _trans: TranslationBundle; private _tracker: WidgetTracker; } diff --git a/packages/filebrowser/tsconfig.json b/packages/filebrowser/tsconfig.json index 91d47e14c5dc..30f4e88c4bd9 100644 --- a/packages/filebrowser/tsconfig.json +++ b/packages/filebrowser/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../apputils" diff --git a/packages/filebrowser/tsconfig.test.json b/packages/filebrowser/tsconfig.test.json index 6cef603d10c3..8e2fb2719ef6 100644 --- a/packages/filebrowser/tsconfig.test.json +++ b/packages/filebrowser/tsconfig.test.json @@ -1,9 +1,6 @@ { "extends": "../../tsconfigbase.test", - "include": [ - "src/*", - "test/*" - ], + "include": ["src/*", "test/*"], "references": [ { "path": "../apputils" diff --git a/packages/fileeditor-extension/tsconfig.json b/packages/fileeditor-extension/tsconfig.json index 03139c5accf8..d4d49f60c851 100644 --- a/packages/fileeditor-extension/tsconfig.json +++ b/packages/fileeditor-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/fileeditor/src/widget.ts b/packages/fileeditor/src/widget.ts index e03d31223c2a..932193301bf7 100644 --- a/packages/fileeditor/src/widget.ts +++ b/packages/fileeditor/src/widget.ts @@ -22,7 +22,6 @@ import { PromiseDelegate } from '@lumino/coreutils'; import { Message } from '@lumino/messaging'; import { StackedLayout, Widget } from '@lumino/widgets'; -import { ITranslator } from '@jupyterlab/translation'; /** * The data attribute added to a widget that can run code. @@ -310,6 +309,7 @@ export class FileEditorFactory extends ABCWidgetFactory< */ constructor(options: FileEditorFactory.IOptions) { super(options.factoryOptions); + this._services = options.editorServices; } /** @@ -318,15 +318,14 @@ export class FileEditorFactory extends ABCWidgetFactory< protected createNewWidget( context: DocumentRegistry.CodeContext ): IDocumentWidget { - const func = this._services.getFactoryService(this._translator) - .newDocumentEditor; + const func = this._services.factoryService.newDocumentEditor; const factory: CodeEditor.Factory = options => { return func(options); }; const content = new FileEditor({ factory, context, - mimeTypeService: this._services.getMimeTypeService(this._translator) + mimeTypeService: this._services.mimeTypeService }); content.title.icon = textEditorIcon; @@ -357,10 +356,5 @@ export namespace FileEditorFactory { factoryOptions: DocumentRegistry.IWidgetFactoryOptions< IDocumentWidget >; - - /** - * The application language translator - */ - translator?: ITranslator; } } diff --git a/packages/fileeditor/tsconfig.json b/packages/fileeditor/tsconfig.json index f80d30fe3da5..decd92cca2e3 100644 --- a/packages/fileeditor/tsconfig.json +++ b/packages/fileeditor/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../apputils" diff --git a/packages/fileeditor/tsconfig.test.json b/packages/fileeditor/tsconfig.test.json index 62d6eeac0c3f..26d0ca5c1eba 100644 --- a/packages/fileeditor/tsconfig.test.json +++ b/packages/fileeditor/tsconfig.test.json @@ -1,9 +1,6 @@ { "extends": "../../tsconfigbase.test", - "include": [ - "src/*", - "test/*" - ], + "include": ["src/*", "test/*"], "references": [ { "path": "../apputils" diff --git a/packages/help-extension/tsconfig.json b/packages/help-extension/tsconfig.json index b6fcc10a9969..608e69a17c35 100644 --- a/packages/help-extension/tsconfig.json +++ b/packages/help-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/htmlviewer-extension/tsconfig.json b/packages/htmlviewer-extension/tsconfig.json index c7fd89837821..dcdf5f091711 100644 --- a/packages/htmlviewer-extension/tsconfig.json +++ b/packages/htmlviewer-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/htmlviewer/tsconfig.json b/packages/htmlviewer/tsconfig.json index 7472fb59b602..0d52984a5c2a 100644 --- a/packages/htmlviewer/tsconfig.json +++ b/packages/htmlviewer/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../apputils" diff --git a/packages/inspector-extension/tsconfig.json b/packages/inspector-extension/tsconfig.json index dd79e521d77c..812e1c408965 100644 --- a/packages/inspector-extension/tsconfig.json +++ b/packages/inspector-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/json-extension/tsconfig.json b/packages/json-extension/tsconfig.json index 2e8ec7a2ef3b..76e7adc4ceb9 100644 --- a/packages/json-extension/tsconfig.json +++ b/packages/json-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../apputils" diff --git a/packages/launcher-extension/tsconfig.json b/packages/launcher-extension/tsconfig.json index e969fe4e42f6..eb38dfd4ae55 100644 --- a/packages/launcher-extension/tsconfig.json +++ b/packages/launcher-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/launcher/tsconfig.json b/packages/launcher/tsconfig.json index aed735dfc89e..d8fe0d18d3ff 100644 --- a/packages/launcher/tsconfig.json +++ b/packages/launcher/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../apputils" diff --git a/packages/logconsole-extension/tsconfig.json b/packages/logconsole-extension/tsconfig.json index db143dfa163f..42082ea2c17c 100644 --- a/packages/logconsole-extension/tsconfig.json +++ b/packages/logconsole-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/mainmenu-extension/tsconfig.json b/packages/mainmenu-extension/tsconfig.json index 48cab7c28b20..fb3ad5e80f2a 100644 --- a/packages/mainmenu-extension/tsconfig.json +++ b/packages/mainmenu-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/mainmenu/src/file.ts b/packages/mainmenu/src/file.ts index ee0016ead2aa..95d61a439520 100644 --- a/packages/mainmenu/src/file.ts +++ b/packages/mainmenu/src/file.ts @@ -107,11 +107,5 @@ export namespace IFileMenu { * The function to create the console. */ createConsole: (widget: T) => Promise; - - /** - * DEPRECATED. Use createConsoleLabel. - * A label to use for the activity for which a console is being created. - */ - name?: string; } } diff --git a/packages/mainmenu/test/file.spec.ts b/packages/mainmenu/test/file.spec.ts index 8a0cad01d13c..503fc4910e98 100644 --- a/packages/mainmenu/test/file.spec.ts +++ b/packages/mainmenu/test/file.spec.ts @@ -60,7 +60,7 @@ describe('@jupyterlab/mainmenu', () => { it('should allow setting of an ICloseAndCleaner', () => { const cleaner: IFileMenu.ICloseAndCleaner = { tracker, - closeAndCleanupLabel: (n: number) => 'Close and cleanup widget label', + closeAndCleanupLabel: (n: number) => 'closeAndCleanupLabel', closeAndCleanup: widget => { widget.state = 'clean'; return Promise.resolve(void 0); @@ -76,8 +76,7 @@ describe('@jupyterlab/mainmenu', () => { it('should allow setting of an IConsoleCreator', () => { const creator: IFileMenu.IConsoleCreator = { tracker, - name: 'Wodget', - createConsoleLabel: (n: number) => 'Create console label', + createConsoleLabel: (n: number) => 'createConsoleLabel', createConsole: widget => { widget.state = 'create'; return Promise.resolve(void 0); diff --git a/packages/mainmenu/test/kernel.spec.ts b/packages/mainmenu/test/kernel.spec.ts index 733e6179ba03..be8d74526c2f 100644 --- a/packages/mainmenu/test/kernel.spec.ts +++ b/packages/mainmenu/test/kernel.spec.ts @@ -53,7 +53,8 @@ describe('@jupyterlab/mainmenu', () => { it('should allow setting of an IKernelUser', () => { const user: IKernelMenu.IKernelUser = { tracker, - restartKernelAndClearLabel: (n: number) => 'Restart ', + restartKernelAndClearLabel: (n: number) => + 'restartKernelAndClearLabel', interruptKernel: widget => { widget.state = 'interrupt'; return Promise.resolve(void 0); diff --git a/packages/mainmenu/test/run.spec.ts b/packages/mainmenu/test/run.spec.ts index bd8c559597cf..fc6fd20f59ee 100644 --- a/packages/mainmenu/test/run.spec.ts +++ b/packages/mainmenu/test/run.spec.ts @@ -53,9 +53,9 @@ describe('@jupyterlab/mainmenu', () => { it('should allow setting of an ICodeRunner', () => { const runner: IRunMenu.ICodeRunner = { tracker, - runLabel: (n: number) => 'Run noun label', - runAllLabel: (n: number) => 'Run all noun label', - restartAndRunAllLabel: (n: number) => 'Restart and run noun label', + runLabel: (n: number) => 'Run label', + runAllLabel: (n: number) => 'Run all label', + restartAndRunAllLabel: n => 'Restart and run all', run: widget => { widget.state = 'run'; return Promise.resolve(void 0); diff --git a/packages/notebook-extension/src/index.ts b/packages/notebook-extension/src/index.ts index 2a3fa96b8d32..3316e3bbe643 100644 --- a/packages/notebook-extension/src/index.ts +++ b/packages/notebook-extension/src/index.ts @@ -290,15 +290,10 @@ const trackerPlugin: JupyterFrontEndPlugin = { const factory: JupyterFrontEndPlugin = { id: '@jupyterlab/notebook-extension:factory', provides: NotebookPanel.IContentFactory, - requires: [IEditorServices, ITranslator], + requires: [IEditorServices], autoStart: true, - activate: ( - app: JupyterFrontEnd, - editorServices: IEditorServices, - translator: ITranslator - ) => { - const editorFactory = editorServices.getFactoryService(translator) - .newInlineEditor; + activate: (app: JupyterFrontEnd, editorServices: IEditorServices) => { + const editorFactory = editorServices.factoryService.newInlineEditor; return new NotebookPanel.ContentFactory({ editorFactory }); } }; @@ -442,8 +437,7 @@ function activateNotebookTools( const notebookTools = new NotebookTools({ tracker, translator }); const activeCellTool = new NotebookTools.ActiveCellTool(); const slideShow = NotebookTools.createSlideShowSelector(translator); - const editorFactory = editorServices.getFactoryService(translator) - .newInlineEditor; + const editorFactory = editorServices.factoryService.newInlineEditor; const cellMetadataEditor = new NotebookTools.CellMetadataEditorTool({ editorFactory, collapsed: false, @@ -544,7 +538,7 @@ function activateWidgetFactory( contentFactory, editorConfig: StaticNotebook.defaultEditorConfig, notebookConfig: StaticNotebook.defaultNotebookConfig, - mimeTypeService: editorServices.getMimeTypeService(translator), + mimeTypeService: editorServices.mimeTypeService, sessionDialogs: sessionContextDialogs, translator: translator }); diff --git a/packages/notebook-extension/tsconfig.json b/packages/notebook-extension/tsconfig.json index 3996f78be5c6..bf44e947bf27 100644 --- a/packages/notebook-extension/tsconfig.json +++ b/packages/notebook-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/notebook/src/notebooktools.ts b/packages/notebook/src/notebooktools.ts index 972bcaac6a37..7b63004544a8 100644 --- a/packages/notebook/src/notebooktools.ts +++ b/packages/notebook/src/notebooktools.ts @@ -863,16 +863,21 @@ export namespace NotebookTools { ): KeySelector { translator = translator || nullTranslator; const trans = translator.load('jupyterlab'); + trans.__(''); + // FIXME: optionsMap needs to be reversed to have the id as the key + // not the translatable string. The name should change to reflect the + // breaking change othwerwise other extension devs might get unexected + // results const options: KeySelector.IOptions = { key: 'slideshow', - title: trans.__('Slide Type'), + title: 'Slide Type', optionsMap: { - null: '-', - slide: trans.__('Slide'), - subslide: trans.__('Sub-Slide'), - fragment: trans.__('Fragment'), - skip: trans.__('Skip'), - notes: trans.__('Notes') + '-': null, + Slide: 'slide', + 'Sub-Slide': 'subslide', + Fragment: 'fragment', + Skip: 'skip', + Notes: 'notes' }, getter: cell => { const value = cell.model.metadata.get('slideshow') as @@ -903,6 +908,10 @@ export namespace NotebookTools { * Create an nbconvert selector. */ export function createNBConvertSelector( + // FIXME: optionsMap needs to be reversed to have the id as the key + // not the translatable string. The name should change to reflect the + // breaking change othwerwise other extension devs might get unexected + // results optionsMap: ReadonlyPartialJSONObject, translator?: ITranslator ): KeySelector { @@ -952,11 +961,9 @@ namespace Private { const name = options.key; const title = options.title || name[0].toLocaleUpperCase() + name.slice(1); const optionNodes: VirtualNode[] = []; - for (const originalValue in options.optionsMap) { - const label = options.optionsMap[originalValue] as string; - optionNodes.push( - h.option({ value: JSON.stringify(originalValue) }, label) - ); + for (const label in options.optionsMap) { + const value = JSON.stringify(options.optionsMap[label]); + optionNodes.push(h.option({ value }, label)); } const node = VirtualDOM.realize( h.div({}, h.label(title, h.select({}, optionNodes))) diff --git a/packages/notebook/src/truststatus.tsx b/packages/notebook/src/truststatus.tsx index 3557526e50ca..228afb44ed30 100644 --- a/packages/notebook/src/truststatus.tsx +++ b/packages/notebook/src/truststatus.tsx @@ -107,7 +107,7 @@ export class NotebookTrustStatus extends VDomRenderer< /** * Construct a new status item. */ - constructor(translator?: ITranslator) { + constructor(translator: ITranslator) { super(new NotebookTrustStatus.Model()); this.translator = translator || nullTranslator; } diff --git a/packages/notebook/tsconfig.json b/packages/notebook/tsconfig.json index a71c186fb9a0..0c2809d83347 100644 --- a/packages/notebook/tsconfig.json +++ b/packages/notebook/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../apputils" diff --git a/packages/notebook/tsconfig.test.json b/packages/notebook/tsconfig.test.json index 2f38a87c45a7..a642a4485d9a 100644 --- a/packages/notebook/tsconfig.test.json +++ b/packages/notebook/tsconfig.test.json @@ -1,9 +1,6 @@ { "extends": "../../tsconfigbase.test", - "include": [ - "src/*", - "test/*" - ], + "include": ["src/*", "test/*"], "references": [ { "path": "../apputils" diff --git a/packages/rendermime/src/renderers.ts b/packages/rendermime/src/renderers.ts index 51fc4b552180..8d866f8809f5 100644 --- a/packages/rendermime/src/renderers.ts +++ b/packages/rendermime/src/renderers.ts @@ -484,7 +484,7 @@ export namespace renderSVG { /** * The application language translator. */ - translator?: ITranslator; + translator: ITranslator; } } diff --git a/packages/running-extension/tsconfig.json b/packages/running-extension/tsconfig.json index 5e07d5c8da40..b95f9e5a6572 100644 --- a/packages/running-extension/tsconfig.json +++ b/packages/running-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/running/tsconfig.json b/packages/running/tsconfig.json index aed735dfc89e..d8fe0d18d3ff 100644 --- a/packages/running/tsconfig.json +++ b/packages/running/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../apputils" diff --git a/packages/settingeditor-extension/src/index.ts b/packages/settingeditor-extension/src/index.ts index cf4e9ff3a36b..55ad3b224021 100644 --- a/packages/settingeditor-extension/src/index.ts +++ b/packages/settingeditor-extension/src/index.ts @@ -74,7 +74,7 @@ function activate( const trans = translator.load('jupyterlab'); const { commands, shell } = app; const namespace = 'setting-editor'; - const factoryService = editorServices.getFactoryService(translator); + const factoryService = editorServices.factoryService; const editorFactory = factoryService.newInlineEditor; const tracker = new WidgetTracker>({ namespace diff --git a/packages/settingeditor-extension/tsconfig.json b/packages/settingeditor-extension/tsconfig.json index c60d7ce80570..8eda15218e5e 100644 --- a/packages/settingeditor-extension/tsconfig.json +++ b/packages/settingeditor-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/settingeditor/tsconfig.json b/packages/settingeditor/tsconfig.json index 082191269014..736f5839e453 100644 --- a/packages/settingeditor/tsconfig.json +++ b/packages/settingeditor/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../apputils" diff --git a/packages/statusbar/tsconfig.json b/packages/statusbar/tsconfig.json index bc903d4b9b94..3ee76c0aed17 100644 --- a/packages/statusbar/tsconfig.json +++ b/packages/statusbar/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/**/*" - ], + "include": ["src/**/*"], "references": [ { "path": "../apputils" diff --git a/packages/statusbar/tsconfig.test.json b/packages/statusbar/tsconfig.test.json index 8681a4d752ca..5fc94e9e0ad1 100644 --- a/packages/statusbar/tsconfig.test.json +++ b/packages/statusbar/tsconfig.test.json @@ -1,9 +1,6 @@ { "extends": "../../tsconfigbase.test", - "include": [ - "src/*", - "test/*" - ], + "include": ["src/*", "test/*"], "references": [ { "path": "../apputils" diff --git a/packages/tabmanager-extension/tsconfig.json b/packages/tabmanager-extension/tsconfig.json index bb32f1d663b5..e8b84062c73a 100644 --- a/packages/tabmanager-extension/tsconfig.json +++ b/packages/tabmanager-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/terminal-extension/tsconfig.json b/packages/terminal-extension/tsconfig.json index 2bad88c06d91..1090adf5dd13 100644 --- a/packages/terminal-extension/tsconfig.json +++ b/packages/terminal-extension/tsconfig.json @@ -3,13 +3,9 @@ "compilerOptions": { "outDir": "lib", "rootDir": "src", - "types": [ - "webpack-env" - ] + "types": ["webpack-env"] }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/toc-extension/tsconfig.json b/packages/toc-extension/tsconfig.json index 5cb06c55f864..470b24f04990 100644 --- a/packages/toc-extension/tsconfig.json +++ b/packages/toc-extension/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/*" - ], + "include": ["src/*"], "references": [ { "path": "../application" diff --git a/packages/toc/src/generators/markdown/toolbar_generator.tsx b/packages/toc/src/generators/markdown/toolbar_generator.tsx index 00d6ea45974b..d7c9a8130937 100644 --- a/packages/toc/src/generators/markdown/toolbar_generator.tsx +++ b/packages/toc/src/generators/markdown/toolbar_generator.tsx @@ -4,23 +4,14 @@ import * as React from 'react'; import { OptionsManager } from './options_manager'; import { numberingIcon } from '@jupyterlab/ui-components'; -import { - nullTranslator, - ITranslator, - TranslationBundle -} from '@jupyterlab/translation'; +import { TranslationBundle } from '@jupyterlab/translation'; /** * Interface describing toolbar properties. * * @private */ -interface IProperties { - /** - * The application language translator. - */ - translator?: ITranslator; -} +interface IProperties {} /** * Interface describing toolbar state. @@ -51,10 +42,9 @@ function toolbar(options: OptionsManager) { */ constructor(props: IProperties) { super(props); - this.translator = props.translator || nullTranslator; this.state = { numbering: false }; options.initializeOptions(false); - this._trans = this.translator.load('jupyterlab'); + this._trans = options.translator.load('jupyterlab'); } /** @@ -89,7 +79,6 @@ function toolbar(options: OptionsManager) { ); } - translator: ITranslator; _trans: TranslationBundle; }; } diff --git a/packages/toc/src/generators/notebook/options_manager.ts b/packages/toc/src/generators/notebook/options_manager.ts index 1e5851ada36e..f0fa621060b5 100644 --- a/packages/toc/src/generators/notebook/options_manager.ts +++ b/packages/toc/src/generators/notebook/options_manager.ts @@ -227,8 +227,8 @@ class OptionsManager extends Registry.IOptionsManager { private _widget: TableOfContents; private _collapseChanged: Signal; private _tagTool: TagsToolComponent | null = null; + public translator: ITranslator; public storeTags: string[]; - translator: ITranslator; } /** diff --git a/packages/toc/src/generators/notebook/toolbar_generator.tsx b/packages/toc/src/generators/notebook/toolbar_generator.tsx index 3c84379f3156..9cad860f94de 100644 --- a/packages/toc/src/generators/notebook/toolbar_generator.tsx +++ b/packages/toc/src/generators/notebook/toolbar_generator.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import { INotebookTracker } from '@jupyterlab/notebook'; -import { TranslationBundle, ITranslator } from '@jupyterlab/translation'; +import { TranslationBundle } from '@jupyterlab/translation'; import { codeIcon, markdownIcon, @@ -47,8 +47,6 @@ interface IState { * Boolean indicating whether to show numbering. */ numbering: boolean; - - translator?: ITranslator; } /** diff --git a/packages/toc/src/toc.tsx b/packages/toc/src/toc.tsx index fa06ea63dce6..061b6d46e29c 100644 --- a/packages/toc/src/toc.tsx +++ b/packages/toc/src/toc.tsx @@ -162,7 +162,7 @@ export class TableOfContents extends Widget { this.update(); } - protected translator: ITranslator; + private readonly translator: ITranslator; private _trans: TranslationBundle; private _toolbar: any; private _rendermime: IRenderMimeRegistry; diff --git a/packages/toc/test/toc.spec.ts b/packages/toc/test/toc.spec.ts index 2777bea9701c..ad93ae32b690 100644 --- a/packages/toc/test/toc.spec.ts +++ b/packages/toc/test/toc.spec.ts @@ -32,7 +32,6 @@ import { MarkdownViewerFactory, MarkdownDocument } from '@jupyterlab/markdownviewer'; -import { ITranslator } from '@jupyterlab/translation'; let manager: DocumentManager; let tocWidget: ToC.TableOfContents; @@ -67,8 +66,8 @@ beforeAll(async () => { registry.addWidgetFactory( new FileEditorFactory({ editorServices: { - getFactoryService: (translator?: ITranslator) => new CodeMirrorEditorFactory({}, translator), - getMimeTypeService: (translator?: ITranslator) =>new CodeMirrorMimeTypeService(translator) + factoryService: new CodeMirrorEditorFactory(), + mimeTypeService: new CodeMirrorMimeTypeService() }, factoryOptions: { name: 'editor', diff --git a/packages/toc/tsconfig.json b/packages/toc/tsconfig.json index 08d2a1312c89..39ec99100f38 100644 --- a/packages/toc/tsconfig.json +++ b/packages/toc/tsconfig.json @@ -4,9 +4,7 @@ "outDir": "lib", "rootDir": "src" }, - "include": [ - "src/**/*" - ], + "include": ["src/**/*"], "references": [ { "path": "../apputils" diff --git a/packages/toc/tsconfig.test.json b/packages/toc/tsconfig.test.json index ead622a06ab2..12ecbe1a4944 100644 --- a/packages/toc/tsconfig.test.json +++ b/packages/toc/tsconfig.test.json @@ -1,9 +1,6 @@ { "extends": "../../tsconfigbase.test", - "include": [ - "src/*", - "test/*" - ], + "include": ["src/*", "test/*"], "references": [ { "path": "../apputils" diff --git a/packages/translation/test/base.spec.ts b/packages/translation/test/base.spec.ts index 18ee0bed524d..eea9064dd69a 100644 --- a/packages/translation/test/base.spec.ts +++ b/packages/translation/test/base.spec.ts @@ -6,8 +6,7 @@ import 'jest'; import { nullTranslator } from '@jupyterlab/translation'; describe('@jupyterlab/translation', () => { - const translator = nullTranslator; - const trans = translator.load('some-domain'); + const trans = nullTranslator.load('some-domain'); describe('BasicTranslator', () => { describe('#getInstance', () => { diff --git a/testutils/src/notebook-utils.ts b/testutils/src/notebook-utils.ts index 28b724674a4d..ad58e6ec08ac 100644 --- a/testutils/src/notebook-utils.ts +++ b/testutils/src/notebook-utils.ts @@ -78,11 +78,11 @@ export namespace NBTestUtils { export const defaultEditorConfig = { ...StaticNotebook.defaultEditorConfig }; - export const editorFactory = editorServices.getFactoryService().newInlineEditor.bind( - editorServices.getFactoryService() + export const editorFactory = editorServices.factoryService.newInlineEditor.bind( + editorServices.factoryService ); - export const mimeTypeService = editorServices.getMimeTypeService(); + export const mimeTypeService = editorServices.mimeTypeService; /** * Get a copy of the default rendermime instance.