diff --git a/extensions/vscode-notebook-tests/src/notebookTestMain.ts b/extensions/vscode-notebook-tests/src/notebookTestMain.ts index d77e0725f5a..c8ea3282c2c 100644 --- a/extensions/vscode-notebook-tests/src/notebookTestMain.ts +++ b/extensions/vscode-notebook-tests/src/notebookTestMain.ts @@ -63,7 +63,7 @@ export function activate(context: vscode.ExtensionContext): any { context.subscriptions.push(vscode.notebook.registerNotebookKernel('notebookKernelTest', ['*.vsctestnb'], { label: 'Notebook Test Kernel', executeAllCells: async (_document: vscode.NotebookDocument) => { - let cell = _document.cells[0]; + const cell = _document.cells[0]; cell.outputs = [{ outputKind: vscode.CellOutputKind.Rich, diff --git a/extensions/vscode-notebook-tests/src/utils.ts b/extensions/vscode-notebook-tests/src/utils.ts index 95dae41d5dc..0a8f20a1942 100644 --- a/extensions/vscode-notebook-tests/src/utils.ts +++ b/extensions/vscode-notebook-tests/src/utils.ts @@ -65,7 +65,7 @@ export class TestFS implements vscode.FileSystemProvider { readDirectory(uri: vscode.Uri): [string, vscode.FileType][] { const entry = this._lookupAsDirectory(uri, false); - let result: [string, vscode.FileType][] = []; + const result: [string, vscode.FileType][] = []; for (const [name, child] of entry.entries) { result.push([name, child.type]); } @@ -83,8 +83,8 @@ export class TestFS implements vscode.FileSystemProvider { } writeFile(uri: vscode.Uri, content: Uint8Array, options: { create: boolean, overwrite: boolean }): void { - let basename = path.posix.basename(uri.path); - let parent = this._lookupParentDirectory(uri); + const basename = path.posix.basename(uri.path); + const parent = this._lookupParentDirectory(uri); let entry = parent.entries.get(basename); if (entry instanceof Directory) { throw vscode.FileSystemError.FileIsADirectory(uri); @@ -115,11 +115,11 @@ export class TestFS implements vscode.FileSystemProvider { throw vscode.FileSystemError.FileExists(newUri); } - let entry = this._lookup(oldUri, false); - let oldParent = this._lookupParentDirectory(oldUri); + const entry = this._lookup(oldUri, false); + const oldParent = this._lookupParentDirectory(oldUri); - let newParent = this._lookupParentDirectory(newUri); - let newName = path.posix.basename(newUri.path); + const newParent = this._lookupParentDirectory(newUri); + const newName = path.posix.basename(newUri.path); oldParent.entries.delete(entry.name); entry.name = newName; @@ -132,9 +132,9 @@ export class TestFS implements vscode.FileSystemProvider { } delete(uri: vscode.Uri): void { - let dirname = uri.with({ path: path.posix.dirname(uri.path) }); - let basename = path.posix.basename(uri.path); - let parent = this._lookupAsDirectory(dirname, false); + const dirname = uri.with({ path: path.posix.dirname(uri.path) }); + const basename = path.posix.basename(uri.path); + const parent = this._lookupAsDirectory(dirname, false); if (!parent.entries.has(basename)) { throw vscode.FileSystemError.FileNotFound(uri); } @@ -145,11 +145,11 @@ export class TestFS implements vscode.FileSystemProvider { } createDirectory(uri: vscode.Uri): void { - let basename = path.posix.basename(uri.path); - let dirname = uri.with({ path: path.posix.dirname(uri.path) }); - let parent = this._lookupAsDirectory(dirname, false); + const basename = path.posix.basename(uri.path); + const dirname = uri.with({ path: path.posix.dirname(uri.path) }); + const parent = this._lookupAsDirectory(dirname, false); - let entry = new Directory(basename); + const entry = new Directory(basename); parent.entries.set(entry.name, entry); parent.mtime = Date.now(); parent.size += 1; @@ -161,7 +161,7 @@ export class TestFS implements vscode.FileSystemProvider { private _lookup(uri: vscode.Uri, silent: false): Entry; private _lookup(uri: vscode.Uri, silent: boolean): Entry | undefined; private _lookup(uri: vscode.Uri, silent: boolean): Entry | undefined { - let parts = uri.path.split('/'); + const parts = uri.path.split('/'); let entry: Entry = this.root; for (const part of parts) { const partLow = part.toLowerCase(); @@ -173,7 +173,7 @@ export class TestFS implements vscode.FileSystemProvider { if (this.isCaseSensitive) { child = entry.entries.get(part); } else { - for (let [key, value] of entry.entries) { + for (const [key, value] of entry.entries) { if (key.toLowerCase() === partLow) { child = value; break; @@ -194,7 +194,7 @@ export class TestFS implements vscode.FileSystemProvider { } private _lookupAsDirectory(uri: vscode.Uri, silent: boolean): Directory { - let entry = this._lookup(uri, silent); + const entry = this._lookup(uri, silent); if (entry instanceof Directory) { return entry; } @@ -202,7 +202,7 @@ export class TestFS implements vscode.FileSystemProvider { } private _lookupAsFile(uri: vscode.Uri, silent: boolean): File { - let entry = this._lookup(uri, silent); + const entry = this._lookup(uri, silent); if (entry instanceof File) { return entry; } diff --git a/src/vs/workbench/api/common/extHostNotebook.ts b/src/vs/workbench/api/common/extHostNotebook.ts index 24ae1bac5ab..da05a8f3ede 100644 --- a/src/vs/workbench/api/common/extHostNotebook.ts +++ b/src/vs/workbench/api/common/extHostNotebook.ts @@ -139,7 +139,7 @@ export class ExtHostCell extends Disposable implements vscode.NotebookCell { } set outputs(newOutputs: vscode.CellOutput[]) { - let rawDiffs = diff(this._outputs || [], newOutputs || [], (a) => { + const rawDiffs = diff(this._outputs || [], newOutputs || [], (a) => { return this._outputMapping.has(a); }); @@ -374,11 +374,11 @@ export class ExtHostNotebookDocument extends Disposable implements vscode.Notebo return; } - let contentChangeEvents: vscode.NotebookCellsChangeData[] = []; + const contentChangeEvents: vscode.NotebookCellsChangeData[] = []; splices.reverse().forEach(splice => { - let cellDtos = splice[2]; - let newCells = cellDtos.map(cell => { + const cellDtos = splice[2]; + const newCells = cellDtos.map(cell => { const extCell = new ExtHostCell(this._proxy, this, this._documentsAndEditors, cell); @@ -386,7 +386,7 @@ export class ExtHostNotebookDocument extends Disposable implements vscode.Notebo this._cellDisposableMapping.set(extCell.handle, new DisposableStore()); } - let store = this._cellDisposableMapping.get(extCell.handle)!; + const store = this._cellDisposableMapping.get(extCell.handle)!; store.add(extCell.onDidChangeOutputs((diffs) => { this.eventuallyUpdateCellOutputs(extCell, diffs); @@ -475,9 +475,9 @@ export class ExtHostNotebookDocument extends Disposable implements vscode.Notebo } async eventuallyUpdateCellOutputs(cell: ExtHostCell, diffs: ISplice[]) { - let renderers = new Set(); - let outputDtos: NotebookCellOutputsSplice[] = diffs.map(diff => { - let outputs = diff.toInsert; + const renderers = new Set(); + const outputDtos: NotebookCellOutputsSplice[] = diffs.map(diff => { + const outputs = diff.toInsert; return [diff.start, diff.deleteCount, outputs]; }); @@ -528,7 +528,7 @@ export class NotebookEditorCellEditBuilder implements vscode.NotebookEditorCellE this._throwIfFinalized(); const sourceArr = Array.isArray(content) ? content : content.split(/\r|\n|\r\n/g); - let cell = { + const cell = { source: sourceArr, language, cellKind: type, @@ -673,7 +673,7 @@ export class ExtHostNotebookEditor extends Disposable implements vscode.Notebook return Promise.resolve(true); } - let compressedEdits: ICellEditOperation[] = []; + const compressedEdits: ICellEditOperation[] = []; let compressedEditsIndex = -1; for (let i = 0; i < editData.edits.length; i++) { @@ -683,8 +683,8 @@ export class ExtHostNotebookEditor extends Disposable implements vscode.Notebook continue; } - let prevIndex = compressedEditsIndex; - let prev = compressedEdits[prevIndex]; + const prevIndex = compressedEditsIndex; + const prev = compressedEdits[prevIndex]; if (prev.editType === CellEditType.Insert && editData.edits[i].editType === CellEditType.Insert) { if (prev.index === editData.edits[i].index) { @@ -761,7 +761,7 @@ export class ExtHostNotebookOutputRenderer { } render(document: ExtHostNotebookDocument, output: vscode.CellDisplayOutput, outputId: string, mimeType: string): string { - let html = this.renderer.render(document, { output, outputId, mimeType }); + const html = this.renderer.render(document, { output, outputId, mimeType }); return html; } @@ -794,7 +794,7 @@ export class ExtHostNotebookKernelProviderAdapter extends Disposable { const newMap = new Map(); let kernel_unique_pool = 0; - let kernelIdCache = new Set(); + const kernelIdCache = new Set(); const transformedData: INotebookKernelInfoDto2[] = data.map(kernel => { let id = this._kernelToId.get(kernel); @@ -947,7 +947,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN const documentHandle = arg.notebookEditor?.notebookHandle; const cellHandle = arg.cell.handle; - for (let value of this._editors) { + for (const value of this._editors) { if (value[1].editor.document.handle === documentHandle) { const cell = value[1].editor.document.getCell(cellHandle); if (cell) { @@ -971,7 +971,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN throw new Error(`Notebook renderer for '${type}' already registered`); } - let extHostRenderer = new ExtHostNotebookOutputRenderer(type, filter, renderer); + const extHostRenderer = new ExtHostNotebookOutputRenderer(type, filter, renderer); this._notebookOutputRenderers.set(extHostRenderer.type, extHostRenderer); this._proxy.$registerNotebookRenderer({ id: extension.identifier, location: extension.extensionLocation, description: extension.description }, type, filter, renderer.preloads || []); return new extHostTypes.Disposable(() => { @@ -1053,8 +1053,8 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN } findBestMatchedRenderer(mimeType: string): ExtHostNotebookOutputRenderer[] { - let matches: ExtHostNotebookOutputRenderer[] = []; - for (let renderer of this._notebookOutputRenderers) { + const matches: ExtHostNotebookOutputRenderer[] = []; + for (const renderer of this._notebookOutputRenderers) { if (renderer[1].matches(mimeType)) { matches.push(renderer[1]); } @@ -1148,7 +1148,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN async $resolveNotebookKernel(handle: number, editorId: string, uri: UriComponents, kernelId: string, token: CancellationToken): Promise { await this._withAdapter(handle, uri, async (adapter, document) => { - let webComm = this._webviewComm.get(editorId); + const webComm = this._webviewComm.get(editorId); if (webComm) { await adapter.resolveNotebook(kernelId, document, webComm.contentProviderComm, token); @@ -1263,7 +1263,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN } async $executeNotebookByAttachedKernel(viewType: string, uri: UriComponents, cellHandle: number | undefined): Promise { - let document = this._documents.get(URI.revive(uri).toString()); + const document = this._documents.get(URI.revive(uri).toString()); if (!document) { return; @@ -1306,7 +1306,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN async $executeNotebookKernelFromProvider(handle: number, uri: UriComponents, kernelId: string, cellHandle: number | undefined): Promise { await this._withAdapter(handle, uri, async (adapter, document) => { - let cell = cellHandle !== undefined ? document.getCell(cellHandle) : undefined; + const cell = cellHandle !== undefined ? document.getCell(cellHandle) : undefined; return adapter.executeNotebook(kernelId, document, cell); }); @@ -1314,26 +1314,26 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN async $cancelNotebookKernelFromProvider(handle: number, uri: UriComponents, kernelId: string, cellHandle: number | undefined): Promise { await this._withAdapter(handle, uri, async (adapter, document) => { - let cell = cellHandle !== undefined ? document.getCell(cellHandle) : undefined; + const cell = cellHandle !== undefined ? document.getCell(cellHandle) : undefined; return adapter.cancelNotebook(kernelId, document, cell); }); } async $executeNotebook2(kernelId: string, viewType: string, uri: UriComponents, cellHandle: number | undefined): Promise { - let document = this._documents.get(URI.revive(uri).toString()); + const document = this._documents.get(URI.revive(uri).toString()); if (!document || document.viewType !== viewType) { return; } - let kernelInfo = this._notebookKernels.get(kernelId); + const kernelInfo = this._notebookKernels.get(kernelId); if (!kernelInfo) { return; } - let cell = cellHandle !== undefined ? document.getCell(cellHandle) : undefined; + const cell = cellHandle !== undefined ? document.getCell(cellHandle) : undefined; if (cell) { return withToken(token => (kernelInfo!.kernel.executeCell as any)(document, cell, token)); @@ -1343,7 +1343,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN } async $saveNotebook(viewType: string, uri: UriComponents, token: CancellationToken): Promise { - let document = this._documents.get(URI.revive(uri).toString()); + const document = this._documents.get(URI.revive(uri).toString()); if (!document) { return false; } @@ -1357,7 +1357,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN } async $saveNotebookAs(viewType: string, uri: UriComponents, target: UriComponents, token: CancellationToken): Promise { - let document = this._documents.get(URI.revive(uri).toString()); + const document = this._documents.get(URI.revive(uri).toString()); if (!document) { return false; } @@ -1447,7 +1447,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN } $acceptEditorPropertiesChanged(uriComponents: UriComponents, data: INotebookEditorPropertiesChangeData): void { - let editor = this._getEditorFromURI(uriComponents); + const editor = this._getEditorFromURI(uriComponents); if (!editor) { return; @@ -1481,7 +1481,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN this._webviewComm.set(editorId, webComm); } - let editor = new ExtHostNotebookEditor( + const editor = new ExtHostNotebookEditor( document.viewType, editorId, revivedUri, @@ -1515,7 +1515,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN delta.removedDocuments.forEach((uri) => { const revivedUri = URI.revive(uri); const revivedUriStr = revivedUri.toString(); - let document = this._documents.get(revivedUriStr); + const document = this._documents.get(revivedUriStr); if (document) { document.dispose(); @@ -1547,7 +1547,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN if (!this._documents.has(revivedUriStr)) { const that = this; - let document = this._unInitializedDocuments.get(revivedUriStr) ?? new ExtHostNotebookDocument(this._proxy, this._documentsAndEditors, { + const document = this._unInitializedDocuments.get(revivedUriStr) ?? new ExtHostNotebookDocument(this._proxy, this._documentsAndEditors, { emitModelChange(event: vscode.NotebookCellsChangeEvent): void { that._onDidChangeNotebookCells.fire(event); }, diff --git a/src/vs/workbench/api/common/extHostNotebookConcatDocument.ts b/src/vs/workbench/api/common/extHostNotebookConcatDocument.ts index f499b9ac791..8ffeda97be3 100644 --- a/src/vs/workbench/api/common/extHostNotebookConcatDocument.ts +++ b/src/vs/workbench/api/common/extHostNotebookConcatDocument.ts @@ -41,7 +41,7 @@ export class ExtHostNotebookConcatDocument implements vscode.NotebookConcatTextD this._init(); this._disposables.add(extHostDocuments.onDidChangeDocument(e => { - let cellIdx = this._cellUris.get(e.document.uri); + const cellIdx = this._cellUris.get(e.document.uri); if (cellIdx !== undefined) { this._cellLengths.changeValue(cellIdx, this._cells[cellIdx].document.getText().length + 1); this._cellLines.changeValue(cellIdx, this._cells[cellIdx].document.lineCount); @@ -75,7 +75,7 @@ export class ExtHostNotebookConcatDocument implements vscode.NotebookConcatTextD this._cellUris = new ResourceMap(); const cellLengths: number[] = []; const cellLineCounts: number[] = []; - for (let cell of this._notebook.cells) { + for (const cell of this._notebook.cells) { if (cell.cellKind === CellKind.Code && (!this._selector || score(this._selector, cell.uri, cell.language, true))) { this._cellUris.set(cell.uri, this._cells.length); this._cells.push(cell); @@ -94,7 +94,7 @@ export class ExtHostNotebookConcatDocument implements vscode.NotebookConcatTextD getText(range?: vscode.Range): string { if (!range) { let result = ''; - for (let cell of this._cells) { + for (const cell of this._cells) { result += cell.document.getText() + '\n'; } // remove last newline again @@ -117,8 +117,8 @@ export class ExtHostNotebookConcatDocument implements vscode.NotebookConcatTextD } else if (startCell === endCell) { return startCell.document.getText(new types.Range(start.range.start, end.range.end)); } else { - let a = startCell.document.getText(new types.Range(start.range.start, new types.Position(startCell.document.lineCount, 0))); - let b = endCell.document.getText(new types.Range(new types.Position(0, 0), end.range.end)); + const a = startCell.document.getText(new types.Range(start.range.start, new types.Position(startCell.document.lineCount, 0))); + const b = endCell.document.getText(new types.Range(new types.Position(0, 0), end.range.end)); return a + '\n' + b; } } @@ -139,7 +139,7 @@ export class ExtHostNotebookConcatDocument implements vscode.NotebookConcatTextD const idx = this._cellUris.get(locationOrOffset.uri); if (idx !== undefined) { - let line = this._cellLines.getAccumulatedValue(idx - 1); + const line = this._cellLines.getAccumulatedValue(idx - 1); return new types.Position(line + locationOrOffset.range.start.line, locationOrOffset.range.start.character); } // do better? @@ -158,9 +158,9 @@ export class ExtHostNotebookConcatDocument implements vscode.NotebookConcatTextD endIdx = this._cellLines.getIndexOf(positionOrRange.end.line); } - let startPos = new types.Position(startIdx.remainder, positionOrRange.start.character); - let endPos = new types.Position(endIdx.remainder, positionOrRange.end.character); - let range = new types.Range(startPos, endPos); + const startPos = new types.Position(startIdx.remainder, positionOrRange.start.character); + const endPos = new types.Position(endIdx.remainder, positionOrRange.end.character); + const range = new types.Range(startPos, endPos); const startCell = this._cells[startIdx.index]; return new types.Location(startCell.uri, startCell.document.validateRange(range)); diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts index 3661855ef3d..71f74948655 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts @@ -244,13 +244,13 @@ export class NotebookFindWidget extends SimpleFindReplaceWidget implements INote private setAllFindMatchesDecorations(cellFindMatches: CellFindMatch[]) { this._notebookEditor.changeModelDecorations((accessor) => { - let findMatchesOptions: ModelDecorationOptions = FindDecorations._FIND_MATCH_DECORATION; + const findMatchesOptions: ModelDecorationOptions = FindDecorations._FIND_MATCH_DECORATION; - let deltaDecorations: ICellModelDeltaDecorations[] = cellFindMatches.map(cellFindMatch => { + const deltaDecorations: ICellModelDeltaDecorations[] = cellFindMatches.map(cellFindMatch => { const findMatches = cellFindMatch.matches; // Find matches - let newFindMatchesDecorations: IModelDeltaDecoration[] = new Array(findMatches.length); + const newFindMatchesDecorations: IModelDeltaDecoration[] = new Array(findMatches.length); for (let i = 0, len = findMatches.length; i < len; i++) { newFindMatchesDecorations[i] = { range: findMatches[i].range, @@ -355,8 +355,8 @@ registerAction2(class extends Action2 { } async run(accessor: ServicesAccessor): Promise { - let editorService = accessor.get(IEditorService); - let editor = getActiveNotebookEditor(editorService); + const editorService = accessor.get(IEditorService); + const editor = getActiveNotebookEditor(editorService); if (!editor) { return; @@ -382,8 +382,8 @@ registerAction2(class extends Action2 { } async run(accessor: ServicesAccessor): Promise { - let editorService = accessor.get(IEditorService); - let editor = getActiveNotebookEditor(editorService); + const editorService = accessor.get(IEditorService); + const editor = getActiveNotebookEditor(editorService); if (!editor) { return; @@ -395,8 +395,8 @@ registerAction2(class extends Action2 { }); EditorStartFindAction.addImplementation(100, (accessor: ServicesAccessor, args: any) => { - let editorService = accessor.get(IEditorService); - let editor = getActiveNotebookEditor(editorService); + const editorService = accessor.get(IEditorService); + const editor = getActiveNotebookEditor(editorService); if (!editor) { return false; @@ -408,8 +408,8 @@ EditorStartFindAction.addImplementation(100, (accessor: ServicesAccessor, args: }); EditorStartFindReplaceAction.addImplementation(100, (accessor: ServicesAccessor, args: any) => { - let editorService = accessor.get(IEditorService); - let editor = getActiveNotebookEditor(editorService); + const editorService = accessor.get(IEditorService); + const editor = getActiveNotebookEditor(editorService); if (!editor) { return false; diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel.ts b/src/vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel.ts index d612cf6e87a..18f853b05e5 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel.ts @@ -79,7 +79,7 @@ export class FoldingModel extends Disposable { recompute() { const cells = this._viewModel!.viewCells; - let stack: { index: number, level: number, endIndex: number }[] = []; + const stack: { index: number, level: number, endIndex: number }[] = []; for (let i = 0; i < cells.length; i++) { const cell = cells[i]; @@ -129,9 +129,9 @@ export class FoldingModel extends Disposable { // restore collased state let i = 0; - let nextCollapsed = () => { + const nextCollapsed = () => { while (i < this._regions.length) { - let isCollapsed = this._regions.isCollapsed(i); + const isCollapsed = this._regions.isCollapsed(i); i++; if (isCollapsed) { return i - 1; @@ -145,12 +145,12 @@ export class FoldingModel extends Disposable { while (collapsedIndex !== -1 && k < newRegions.length) { // get the latest range - let decRange = this._viewModel!.getTrackedRange(this._foldingRangeDecorationIds[collapsedIndex]); + const decRange = this._viewModel!.getTrackedRange(this._foldingRangeDecorationIds[collapsedIndex]); if (decRange) { - let collasedStartIndex = decRange.start; + const collasedStartIndex = decRange.start; while (k < newRegions.length) { - let startIndex = newRegions.getStartLineNumber(k) - 1; + const startIndex = newRegions.getStartLineNumber(k) - 1; if (collasedStartIndex >= startIndex) { newRegions.setCollapsed(k, collasedStartIndex === startIndex); k++; @@ -186,7 +186,7 @@ export class FoldingModel extends Disposable { const collapsedRanges: ICellRange[] = []; let i = 0; while (i < this._regions.length) { - let isCollapsed = this._regions.isCollapsed(i); + const isCollapsed = this._regions.isCollapsed(i); if (isCollapsed) { const region = this._regions.toRegion(i); @@ -205,12 +205,12 @@ export class FoldingModel extends Disposable { while (k < state.length && i < this._regions.length) { // get the latest range - let decRange = this._viewModel!.getTrackedRange(this._foldingRangeDecorationIds[i]); + const decRange = this._viewModel!.getTrackedRange(this._foldingRangeDecorationIds[i]); if (decRange) { - let collasedStartIndex = state[k].start; + const collasedStartIndex = state[k].start; while (i < this._regions.length) { - let startIndex = this._regions.getStartLineNumber(i) - 1; + const startIndex = this._regions.getStartLineNumber(i) - 1; if (collasedStartIndex >= startIndex) { this._regions.setCollapsed(i, collasedStartIndex === startIndex); i++; diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.ts b/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.ts index a944b34daff..6cb8b4a2bb0 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.ts @@ -65,7 +65,7 @@ registerAction2(class extends Action2 { const edits: WorkspaceTextEdit[] = []; - for (let cell of notebook.cells) { + for (const cell of notebook.cells) { const ref = await textModelService.createModelReference(cell.uri); dispoables.add(ref); diff --git a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts index b73d6b5c81a..136cfd3b622 100644 --- a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts +++ b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts @@ -344,7 +344,7 @@ class CellContentProvider implements ITextModelContentProvider { const ref = await this._notebookModelResolverService.resolve(data.notebook, info.id); let result: ITextModel | null = null; - for (let cell of ref.object.notebook.cells) { + for (const cell of ref.object.notebook.cells) { if (cell.uri.toString() === resource.toString()) { const bufferFactory: ITextBufferFactory = { create: (defaultEOL) => { diff --git a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts index 1747484b280..52a91df0833 100644 --- a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts +++ b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts @@ -592,13 +592,13 @@ export function reduceCellRanges(_ranges: ICellRange[]): ICellRange[] { return []; } - let ranges = _ranges.sort((a, b) => a.start - b.start); - let result: ICellRange[] = []; + const ranges = _ranges.sort((a, b) => a.start - b.start); + const result: ICellRange[] = []; let currentRangeStart = ranges[0].start; let currentRangeEnd = ranges[0].end + 1; for (let i = 0, len = ranges.length; i < len; i++) { - let range = ranges[i]; + const range = ranges[i]; if (range.start > currentRangeEnd) { result.push({ start: currentRangeStart, end: currentRangeEnd - 1 }); @@ -620,7 +620,7 @@ export function getVisibleCells(cells: CellViewModel[], hiddenRanges: ICellRange let start = 0; let hiddenRangeIndex = 0; - let result: CellViewModel[] = []; + const result: CellViewModel[] = []; while (start < cells.length && hiddenRangeIndex < hiddenRanges.length) { if (start < hiddenRanges[hiddenRangeIndex].start) { diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts index df4e7d2e45d..fa66c1ac380 100644 --- a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts +++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts @@ -845,8 +845,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor this._webview!.element.style.height = `${scrollHeight}px`; if (this._webview?.insetMapping) { - let updateItems: { cell: CodeCellViewModel, output: IProcessedOutput, cellTop: number }[] = []; - let removedItems: IProcessedOutput[] = []; + const updateItems: { cell: CodeCellViewModel, output: IProcessedOutput, cellTop: number }[] = []; + const removedItems: IProcessedOutput[] = []; this._webview?.insetMapping.forEach((value, key) => { const cell = value.cell; const viewIndex = this._list?.getViewIndex(cell); @@ -930,7 +930,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor if (this._list) { state.scrollPosition = { left: this._list.scrollLeft, top: this._list.scrollTop }; - let cellHeights: { [key: number]: number } = {}; + const cellHeights: { [key: number]: number } = {}; for (let i = 0; i < this.viewModel!.length; i++) { const elm = this.viewModel!.viewCells[i] as CellViewModel; if (elm.cellKind === CellKind.Code) { @@ -947,7 +947,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor const element = this._notebookViewModel!.viewCells[focus]; if (element) { const itemDOM = this._list?.domElementOfElement(element); - let editorFocused = !!(document.activeElement && itemDOM && itemDOM.contains(document.activeElement)); + const editorFocused = !!(document.activeElement && itemDOM && itemDOM.contains(document.activeElement)); state.editorFocused = editorFocused; state.focus = focus; @@ -1103,7 +1103,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor return; } - let relayout = (cell: ICellViewModel, height: number) => { + const relayout = (cell: ICellViewModel, height: number) => { if (this._isDisposed) { return; } @@ -1230,7 +1230,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor const originalIdx = this._notebookViewModel!.getCellIndex(cell); const relativeToIndex = this._notebookViewModel!.getCellIndex(relativeToCell); - let newIdx = direction === 'above' ? relativeToIndex : relativeToIndex + 1; + const newIdx = direction === 'above' ? relativeToIndex : relativeToIndex + 1; return this._moveCellToIndex(originalIdx, newIdx); } @@ -1287,7 +1287,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor } getActiveCell() { - let elements = this._list?.getFocusedElements(); + const elements = this._list?.getFocusedElements(); if (elements && elements.length) { return elements[0]; @@ -1438,7 +1438,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor cell.focusMode = CellFocusMode.Container; this.revealInCenterIfOutsideViewport(cell); } else { - let itemDOM = this._list?.domElementOfElement(cell); + const itemDOM = this._list?.domElementOfElement(cell); if (document.activeElement && itemDOM && itemDOM.contains(document.activeElement)) { (document.activeElement as HTMLElement).blur(); } @@ -1487,14 +1487,14 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor await this._resolveWebview(); - let preloads = this._notebookViewModel!.renderers; + const preloads = this._notebookViewModel!.renderers; if (!this._webview!.insetMapping.has(output)) { - let cellTop = this._list?.getAbsoluteTopOfElement(cell) || 0; + const cellTop = this._list?.getAbsoluteTopOfElement(cell) || 0; await this._webview!.createInset(cell, output, cellTop, offset, shadowContent, preloads); } else { - let cellTop = this._list?.getAbsoluteTopOfElement(cell) || 0; - let scrollTop = this._list?.scrollTop || 0; + const cellTop = this._list?.getAbsoluteTopOfElement(cell) || 0; + const scrollTop = this._list?.scrollTop || 0; this._webview!.updateViewScrollTop(-scrollTop, [{ cell: cell, output: output, cellTop: cellTop }]); } diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidgetService.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidgetService.ts index 2369eee6a02..def8c4e957a 100644 --- a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidgetService.ts +++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidgetService.ts @@ -68,7 +68,7 @@ class NotebookEditorWidgetService implements INotebookEditorWidgetService { const widgets = this._notebookWidgets.get(group.id); this._notebookWidgets.delete(group.id); if (widgets) { - for (let value of widgets.values()) { + for (const value of widgets.values()) { value.token = undefined; this._disposeWidget(value.widget); } diff --git a/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts index 8fca62a34e8..5c427e1ea9b 100644 --- a/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts +++ b/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts @@ -53,7 +53,7 @@ export class NotebookKernelProviderInfoStore extends Disposable { this._updateProviderExtensionsInfo(); return toDisposable(() => { - let idx = this._notebookKernelProviders.indexOf(provider); + const idx = this._notebookKernelProviders.indexOf(provider); if (idx >= 0) { this._notebookKernelProviders.splice(idx, 1); } @@ -307,7 +307,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu this._editorService.registerCustomEditorViewTypesHandler('Notebook', this); const updateOrder = () => { - let userOrder = this._configurationService.getValue('notebook.displayOrder'); + const userOrder = this._configurationService.getValue('notebook.displayOrder'); this._displayOrder = { defaultOrder: this._accessibilityService.isScreenReaderOptimized() ? ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER : NOTEBOOK_DISPLAY_ORDER, userOrder: userOrder @@ -643,7 +643,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu renderFunc: (rendererId: string, items: IOutputRenderRequestCellInfo[]) => Promise | undefined>, lookUp: (key: T) => { outputs: IProcessedOutput[] } ) { - for (let id of renderers) { + for (const id of renderers) { const requestsPerRenderer: IOutputRenderRequestCellInfo[] = requestItems.map(req => { return { key: req.key, @@ -815,14 +815,14 @@ export class NotebookService extends Disposable implements INotebookService, ICu } private _transformMimeTypes(output: IDisplayOutput, outputId: string, documentDisplayOrder: string[]): ITransformedDisplayOutputDto { - let mimeTypes = Object.keys(output.data); - let coreDisplayOrder = this._displayOrder; + const mimeTypes = Object.keys(output.data); + const coreDisplayOrder = this._displayOrder; const sorted = sortMimeTypes(mimeTypes, coreDisplayOrder?.userOrder || [], documentDisplayOrder, coreDisplayOrder?.defaultOrder || []); - let orderMimeTypes: IOrderedMimeType[] = []; + const orderMimeTypes: IOrderedMimeType[] = []; sorted.forEach(mimeType => { - let handlers = this._findBestMatchedRenderer(mimeType); + const handlers = this._findBestMatchedRenderer(mimeType); if (handlers.length) { const handler = handlers[0]; @@ -871,7 +871,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu } async executeNotebook(viewType: string, uri: URI): Promise { - let provider = this._notebookProviders.get(viewType); + const provider = this._notebookProviders.get(viewType); if (provider) { return provider.controller.executeNotebookByAttachedKernel(viewType, uri); @@ -888,7 +888,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu } async cancelNotebook(viewType: string, uri: URI): Promise { - let provider = this._notebookProviders.get(viewType); + const provider = this._notebookProviders.get(viewType); if (provider) { return provider.controller.cancelNotebookByAttachedKernel(viewType, uri); @@ -931,7 +931,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu } getNotebookProviderResourceRoots(): URI[] { - let ret: URI[] = []; + const ret: URI[] = []; this._notebookProviders.forEach(val => { ret.push(URI.revive(val.extensionData.location)); }); @@ -940,7 +940,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu } removeNotebookEditor(editor: INotebookEditor) { - let editorCache = this._notebookEditors.get(editor.getId()); + const editorCache = this._notebookEditors.get(editor.getId()); if (editorCache) { this._notebookEditors.delete(editor.getId()); @@ -1011,7 +1011,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu } async save(viewType: string, resource: URI, token: CancellationToken): Promise { - let provider = this._notebookProviders.get(viewType); + const provider = this._notebookProviders.get(viewType); if (provider) { return provider.controller.save(resource, token); @@ -1021,7 +1021,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu } async saveAs(viewType: string, resource: URI, target: URI, token: CancellationToken): Promise { - let provider = this._notebookProviders.get(viewType); + const provider = this._notebookProviders.get(viewType); if (provider) { return provider.controller.saveAs(resource, target, token); @@ -1031,7 +1031,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu } async backup(viewType: string, uri: URI, token: CancellationToken): Promise { - let provider = this._notebookProviders.get(viewType); + const provider = this._notebookProviders.get(viewType); if (provider) { return provider.controller.backup(uri, token); @@ -1041,7 +1041,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu } onDidReceiveMessage(viewType: string, editorId: string, rendererType: string | undefined, message: any): void { - let provider = this._notebookProviders.get(viewType); + const provider = this._notebookProviders.get(viewType); if (provider) { return provider.controller.onDidReceiveMessage(editorId, rendererType, message); @@ -1049,9 +1049,9 @@ export class NotebookService extends Disposable implements INotebookService, ICu } private _onWillDisposeDocument(model: INotebookTextModel): void { - let modelId = MODEL_ID(model.uri); + const modelId = MODEL_ID(model.uri); - let modelData = this._models.get(modelId); + const modelData = this._models.get(modelId); this._models.delete(modelId); if (modelData) { @@ -1065,7 +1065,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu willRemovedEditors.forEach(e => this._notebookEditors.delete(e.getId())); - let provider = this._notebookProviders.get(modelData!.model.viewType); + const provider = this._notebookProviders.get(modelData!.model.viewType); if (provider) { provider.controller.removeNotebookDocument(modelData!.model.uri); diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts index 249623eca74..d324fb3a8bc 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts @@ -163,7 +163,7 @@ export class NotebookCellList extends WorkbenchList implements ID } elementHeight(element: ICellViewModel): number { - let index = this._getViewIndexUpperBound(element); + const index = this._getViewIndexUpperBound(element); if (index === undefined || index < 0 || index >= this.length) { this._getViewIndexUpperBound(element); throw new ListError(this.listUser, `Invalid index ${index}`); @@ -300,7 +300,7 @@ export class NotebookCellList extends WorkbenchList implements ID // set hidden ranges prefix sum let start = 0; let index = 0; - let ret: number[] = []; + const ret: number[] = []; while (index < newRanges.length) { for (let j = start; j < newRanges[index].start - 1; j++) { @@ -541,7 +541,7 @@ export class NotebookCellList extends WorkbenchList implements ID } getAbsoluteTopOfElement(element: ICellViewModel): number { - let index = this._getViewIndexUpperBound(element); + const index = this._getViewIndexUpperBound(element); if (index === undefined || index < 0 || index >= this.length) { this._getViewIndexUpperBound(element); throw new ListError(this.listUser, `Invalid index ${index}`); @@ -667,8 +667,8 @@ export class NotebookCellList extends WorkbenchList implements ID private async _revealRangeInCenterInternalAsync(viewIndex: number, range: Range, revealType: CellRevealType): Promise { const reveal = (viewIndex: number, range: Range, revealType: CellRevealType) => { const element = this.view.element(viewIndex); - let positionOffset = element.getPositionScrollTopOffset(range.startLineNumber, range.startColumn); - let positionOffsetInView = this.view.elementTop(viewIndex) + positionOffset; + const positionOffset = element.getPositionScrollTopOffset(range.startLineNumber, range.startColumn); + const positionOffsetInView = this.view.elementTop(viewIndex) + positionOffset; this.view.setScrollTop(positionOffsetInView - this.view.renderHeight / 2); if (revealType === CellRevealType.Range) { @@ -699,8 +699,8 @@ export class NotebookCellList extends WorkbenchList implements ID private async _revealRangeInCenterIfOutsideViewportInternalAsync(viewIndex: number, range: Range, revealType: CellRevealType): Promise { const reveal = (viewIndex: number, range: Range, revealType: CellRevealType) => { const element = this.view.element(viewIndex); - let positionOffset = element.getPositionScrollTopOffset(range.startLineNumber, range.startColumn); - let positionOffsetInView = this.view.elementTop(viewIndex) + positionOffset; + const positionOffset = element.getPositionScrollTopOffset(range.startLineNumber, range.startColumn); + const positionOffsetInView = this.view.elementTop(viewIndex) + positionOffset; this.view.setScrollTop(positionOffsetInView - this.view.renderHeight / 2); if (revealType === CellRevealType.Range) { diff --git a/src/vs/workbench/contrib/notebook/browser/view/output/outputRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/output/outputRenderer.ts index cbc254803dd..7e988c86142 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/output/outputRenderer.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/output/outputRenderer.ts @@ -20,7 +20,7 @@ export class OutputRenderer { this._contributions = {}; this._mimeTypeMapping = {}; - let contributions = NotebookRegistry.getOutputTransformContributions(); + const contributions = NotebookRegistry.getOutputTransformContributions(); for (const desc of contributions) { try { @@ -44,7 +44,7 @@ export class OutputRenderer { } render(output: IProcessedOutput, container: HTMLElement, preferredMimeType: string | undefined): IRenderOutput { - let transform = this._mimeTypeMapping[output.outputKind]; + const transform = this._mimeTypeMapping[output.outputKind]; if (transform) { return transform.render(output, container, preferredMimeType); diff --git a/src/vs/workbench/contrib/notebook/browser/view/output/transforms/errorTransform.ts b/src/vs/workbench/contrib/notebook/browser/view/output/transforms/errorTransform.ts index fba5fe9f3e6..7998129daa4 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/output/transforms/errorTransform.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/output/transforms/errorTransform.ts @@ -174,7 +174,7 @@ export function handleANSIOutput(text: string, themeService: IThemeService): HTM * @see {@link https://en.wikipedia.org/wiki/ANSI_escape_code } */ function setBasicFormatters(styleCodes: number[]): void { - for (let code of styleCodes) { + for (const code of styleCodes) { switch (code) { case 0: { styleNames = []; diff --git a/src/vs/workbench/contrib/notebook/browser/view/output/transforms/richTransform.ts b/src/vs/workbench/contrib/notebook/browser/view/output/transforms/richTransform.ts index 423a2c5ec4c..73a1fd4af7e 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/output/transforms/richTransform.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/output/transforms/richTransform.ts @@ -54,12 +54,12 @@ class RichRenderer implements IOutputTransformContribution { if (!preferredMimeType || !this._richMimeTypeRenderers.has(preferredMimeType)) { const contentNode = document.createElement('p'); - let mimeTypes = []; + const mimeTypes = []; for (const property in output.data) { mimeTypes.push(property); } - let mimeTypesMessage = mimeTypes.join(', '); + const mimeTypesMessage = mimeTypes.join(', '); if (preferredMimeType) { contentNode.innerText = `No renderer could be found for MIME type: ${preferredMimeType}`; @@ -74,13 +74,13 @@ class RichRenderer implements IOutputTransformContribution { }; } - let renderer = this._richMimeTypeRenderers.get(preferredMimeType); + const renderer = this._richMimeTypeRenderers.get(preferredMimeType); return renderer!(output, container); } renderJSON(output: ITransformedDisplayOutputDto, container: HTMLElement) { - let data = output.data['application/json']; - let str = JSON.stringify(data, null, '\t'); + const data = output.data['application/json']; + const str = JSON.stringify(data, null, '\t'); const editor = this.instantiationService.createInstance(CodeEditorWidget, container, { ...getOutputSimpleEditorOptions(), @@ -92,14 +92,14 @@ class RichRenderer implements IOutputTransformContribution { isSimpleWidget: true }); - let mode = this.modeService.create('json'); - let resource = URI.parse(`notebook-output-${Date.now()}.json`); + const mode = this.modeService.create('json'); + const resource = URI.parse(`notebook-output-${Date.now()}.json`); const textModel = this.modelService.createModel(str, mode, resource, false); editor.setModel(textModel); - let width = this.notebookEditor.getLayoutInfo().width; - let fontInfo = this.notebookEditor.getLayoutInfo().fontInfo; - let height = Math.min(textModel.getLineCount(), 16) * (fontInfo.lineHeight || 18); + const width = this.notebookEditor.getLayoutInfo().width; + const fontInfo = this.notebookEditor.getLayoutInfo().fontInfo; + const height = Math.min(textModel.getLineCount(), 16) * (fontInfo.lineHeight || 18); editor.layout({ height, @@ -114,8 +114,8 @@ class RichRenderer implements IOutputTransformContribution { } renderCode(output: ITransformedDisplayOutputDto, container: HTMLElement) { - let data = output.data['text/x-javascript']; - let str = (isArray(data) ? data.join('') : data) as string; + const data = output.data['text/x-javascript']; + const str = (isArray(data) ? data.join('') : data) as string; const editor = this.instantiationService.createInstance(CodeEditorWidget, container, { ...getOutputSimpleEditorOptions(), @@ -127,14 +127,14 @@ class RichRenderer implements IOutputTransformContribution { isSimpleWidget: true }); - let mode = this.modeService.create('javascript'); - let resource = URI.parse(`notebook-output-${Date.now()}.js`); + const mode = this.modeService.create('javascript'); + const resource = URI.parse(`notebook-output-${Date.now()}.js`); const textModel = this.modelService.createModel(str, mode, resource, false); editor.setModel(textModel); - let width = this.notebookEditor.getLayoutInfo().width; - let fontInfo = this.notebookEditor.getLayoutInfo().fontInfo; - let height = Math.min(textModel.getLineCount(), 16) * (fontInfo.lineHeight || 18); + const width = this.notebookEditor.getLayoutInfo().width; + const fontInfo = this.notebookEditor.getLayoutInfo().fontInfo; + const height = Math.min(textModel.getLineCount(), 16) * (fontInfo.lineHeight || 18); editor.layout({ height, @@ -149,9 +149,9 @@ class RichRenderer implements IOutputTransformContribution { } renderJavaScript(output: ITransformedDisplayOutputDto, container: HTMLElement) { - let data = output.data['application/javascript']; - let str = isArray(data) ? data.join('') : data; - let scriptVal = ``; + const data = output.data['application/javascript']; + const str = isArray(data) ? data.join('') : data; + const scriptVal = ``; return { shadowContent: scriptVal, hasDynamicHeight: false @@ -159,8 +159,8 @@ class RichRenderer implements IOutputTransformContribution { } renderHTML(output: ITransformedDisplayOutputDto, container: HTMLElement) { - let data = output.data['text/html']; - let str = (isArray(data) ? data.join('') : data) as string; + const data = output.data['text/html']; + const str = (isArray(data) ? data.join('') : data) as string; return { shadowContent: str, hasDynamicHeight: false @@ -169,8 +169,8 @@ class RichRenderer implements IOutputTransformContribution { } renderSVG(output: ITransformedDisplayOutputDto, container: HTMLElement) { - let data = output.data['image/svg+xml']; - let str = (isArray(data) ? data.join('') : data) as string; + const data = output.data['image/svg+xml']; + const str = (isArray(data) ? data.join('') : data) as string; return { shadowContent: str, hasDynamicHeight: false @@ -178,7 +178,7 @@ class RichRenderer implements IOutputTransformContribution { } renderMarkdown(output: ITransformedDisplayOutputDto, container: HTMLElement) { - let data = output.data['text/markdown']; + const data = output.data['text/markdown']; const str = (isArray(data) ? data.join('') : data) as string; const mdOutput = document.createElement('div'); mdOutput.appendChild(this._mdRenderer.render({ value: str, isTrusted: true, supportThemeIcons: true }).element); @@ -215,8 +215,8 @@ class RichRenderer implements IOutputTransformContribution { } renderPlainText(output: ITransformedDisplayOutputDto, container: HTMLElement) { - let data = output.data['text/plain']; - let str = (isArray(data) ? data.join('') : data) as string; + const data = output.data['text/plain']; + const str = (isArray(data) ? data.join('') : data) as string; const contentNode = DOM.$('.output-plaintext'); contentNode.appendChild(handleANSIOutput(str, this.themeService)); container.appendChild(contentNode); diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts index e303984d8a5..a02b42db806 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts @@ -427,13 +427,13 @@ ${loaderJs} if (data.__vscode_notebook_message) { if (data.type === 'dimension') { - let height = data.data.height; - let outputHeight = height; + const height = data.data.height; + const outputHeight = height; const info = this.resolveOutputId(data.id); if (info) { const { cell, output } = info; - let outputIndex = cell.outputs.indexOf(output); + const outputIndex = cell.outputs.indexOf(output); cell.updateOutputHeight(outputIndex, outputHeight); this.notebookEditor.layoutNotebookCell(cell, cell.layoutInfo.totalHeight); } @@ -545,7 +545,7 @@ ${loaderJs} resolveFunc = resolve; }); - let dispose = webview.onMessage((data: FromWebviewMessage) => { + const dispose = webview.onMessage((data: FromWebviewMessage) => { if (data.__vscode_notebook_message && data.type === 'initialized') { resolveFunc(); dispose.dispose(); @@ -565,9 +565,9 @@ ${loaderJs} return false; } - let outputCache = this.insetMapping.get(output)!; - let outputIndex = cell.outputs.indexOf(output); - let outputOffset = cellTop + cell.getOutputOffset(outputIndex); + const outputCache = this.insetMapping.get(output)!; + const outputIndex = cell.outputs.indexOf(output); + const outputOffset = cellTop + cell.getOutputOffset(outputIndex); if (this.hiddenInsetMapping.has(output)) { return true; @@ -585,12 +585,12 @@ ${loaderJs} return; } - let widgets: IContentWidgetTopRequest[] = items.map(item => { - let outputCache = this.insetMapping.get(item.output)!; - let id = outputCache.outputId; - let outputIndex = item.cell.outputs.indexOf(item.output); + const widgets: IContentWidgetTopRequest[] = items.map(item => { + const outputCache = this.insetMapping.get(item.output)!; + const id = outputCache.outputId; + const outputIndex = item.cell.outputs.indexOf(item.output); - let outputOffset = item.cellTop + item.cell.getOutputOffset(outputIndex); + const outputOffset = item.cellTop + item.cell.getOutputOffset(outputIndex); outputCache.cachedCreation.top = outputOffset; this.hiddenInsetMapping.delete(item.output); @@ -615,10 +615,10 @@ ${loaderJs} } const requiredPreloads = await this.updateRendererPreloads(preloads); - let initialTop = cellTop + offset; + const initialTop = cellTop + offset; if (this.insetMapping.has(output)) { - let outputCache = this.insetMapping.get(output); + const outputCache = this.insetMapping.get(output); if (outputCache) { this.hiddenInsetMapping.delete(output); @@ -632,7 +632,7 @@ ${loaderJs} } } - let outputId = output.outputKind === CellOutputKind.Rich ? output.outputId : UUID.generateUuid(); + const outputId = output.outputKind === CellOutputKind.Rich ? output.outputId : UUID.generateUuid(); let apiNamespace: string | undefined; if (output.outputKind === CellOutputKind.Rich && output.pickedMimeTypeIndex !== undefined) { const pickedMimeTypeRenderer = output.orderedMimeTypes?.[output.pickedMimeTypeIndex]; @@ -641,7 +641,7 @@ ${loaderJs} } } - let message: ICreationRequestMessage = { + const message: ICreationRequestMessage = { type: 'html', content: shadowContent, cellId: cell.id, @@ -663,12 +663,12 @@ ${loaderJs} return; } - let outputCache = this.insetMapping.get(output); + const outputCache = this.insetMapping.get(output); if (!outputCache) { return; } - let id = outputCache.outputId; + const id = outputCache.outputId; this._sendMessageToWebview({ type: 'clearOutput', @@ -686,7 +686,7 @@ ${loaderJs} return; } - let outputCache = this.insetMapping.get(output); + const outputCache = this.insetMapping.get(output); if (!outputCache) { return; } @@ -752,7 +752,7 @@ ${loaderJs} await this._loaded; - let resources: IPreloadResource[] = []; + const resources: IPreloadResource[] = []; preloads = preloads.map(preload => { if (this.environmentService.isExtensionDevelopment && (preload.scheme === 'http' || preload.scheme === 'https')) { return preload; @@ -782,14 +782,14 @@ ${loaderJs} await this._loaded; - let requiredPreloads: IPreloadResource[] = []; - let resources: IPreloadResource[] = []; - let extensionLocations: URI[] = []; + const requiredPreloads: IPreloadResource[] = []; + const resources: IPreloadResource[] = []; + const extensionLocations: URI[] = []; preloads.forEach(preload => { - let rendererInfo = this.notebookService.getRendererInfo(preload); + const rendererInfo = this.notebookService.getRendererInfo(preload); if (rendererInfo) { - let preloadResources = rendererInfo.preloads.map(preloadResource => { + const preloadResources = rendererInfo.preloads.map(preloadResource => { if (this.environmentService.isExtensionDevelopment && (preloadResource.scheme === 'http' || preloadResource.scheme === 'https')) { return preloadResource; } diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellActionView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellActionView.ts index 2851c847ca4..c5ccf32bc91 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellActionView.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellActionView.ts @@ -37,7 +37,7 @@ export function createAndFillInActionBarActionsWithVerticalSeparators(menu: IMen } function fillInActions(groups: ReadonlyArray<[string, ReadonlyArray]>, target: IAction[] | { primary: IAction[]; secondary: IAction[]; }, useAlternativeActions: boolean, isPrimaryGroup: (group: string) => boolean = group => group === 'navigation'): void { - for (let tuple of groups) { + for (const tuple of groups) { let [group, actions] = tuple; if (useAlternativeActions) { actions = actions.map(a => (a instanceof MenuItemAction) && !!a.alt ? a.alt : a); diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts index b4fbd1618f0..bd860ff204f 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts @@ -439,7 +439,7 @@ export class MarkdownCellRenderer extends AbstractCellRenderer implements IListR templateData.currentEditor = undefined; templateData.editorPart!.style.display = 'none'; templateData.cellContainer.innerHTML = ''; - let renderedHTML = element.getHTML(); + const renderedHTML = element.getHTML(); if (renderedHTML) { templateData.cellContainer.appendChild(renderedHTML); } @@ -842,8 +842,8 @@ class EditorTextRenderer { } private getDefaultColorMap(): string[] { - let colorMap = modes.TokenizationRegistry.getColorMap(); - let result: string[] = ['#000000']; + const colorMap = modes.TokenizationRegistry.getColorMap(); + const result: string[] = ['#000000']; if (colorMap) { for (let i = 1, len = colorMap.length; i < len; i++) { result[i] = Color.Format.CSS.formatHex(colorMap[i]); diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts index 7c50a3e7b47..c541cb9b136 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts @@ -156,13 +156,13 @@ export class CodeCell extends Disposable { this.templateData.outputContainer!.style.display = 'none'; } - let reversedSplices = splices.reverse(); + const reversedSplices = splices.reverse(); reversedSplices.forEach(splice => { viewCell.spliceOutputHeights(splice[0], splice[1], splice[2].map(_ => 0)); }); - let removedKeys: IProcessedOutput[] = []; + const removedKeys: IProcessedOutput[] = []; this.outputElements.forEach((value, key) => { if (viewCell.outputs.indexOf(key) < 0) { @@ -191,12 +191,12 @@ export class CodeCell extends Disposable { } // newly added element - let currIndex = this.viewCell.outputs.indexOf(output); + const currIndex = this.viewCell.outputs.indexOf(output); this.renderOutput(output, currIndex, prevElement); prevElement = this.outputElements.get(output)!.element; }); - let editorHeight = templateData.editor!.getContentHeight(); + const editorHeight = templateData.editor!.getContentHeight(); viewCell.editorHeight = editorHeight; if (previousOutputHeight === 0 || this.viewCell.outputs.length === 0) { @@ -347,7 +347,7 @@ export class CodeCell extends Disposable { } private viewUpdateHideOuputs(): void { - for (let e of this.outputElements.keys()) { + for (const e of this.outputElements.keys()) { this.notebookEditor.hideInset(e); } } @@ -372,7 +372,7 @@ export class CodeCell extends Disposable { this.templateData.container.classList.toggle('collapsed', true); this.templateData.container.classList.toggle('output-collapsed', true); - for (let e of this.outputElements.keys()) { + for (const e of this.outputElements.keys()) { this.notebookEditor.hideInset(e); } @@ -433,11 +433,11 @@ export class CodeCell extends Disposable { this.outputResizeListeners.set(currOutput, new DisposableStore()); } - let outputItemDiv = document.createElement('div'); + const outputItemDiv = document.createElement('div'); let result: IRenderOutput | undefined = undefined; if (currOutput.outputKind === CellOutputKind.Rich) { - let transformedDisplayOutput = currOutput as ITransformedDisplayOutputDto; + const transformedDisplayOutput = currOutput as ITransformedDisplayOutputDto; if (transformedDisplayOutput.orderedMimeTypes!.length > 1) { outputItemDiv.style.position = 'relative'; @@ -464,7 +464,7 @@ export class CodeCell extends Disposable { }))); } - let pickedMimeTypeRenderer = currOutput.orderedMimeTypes![currOutput.pickedMimeTypeIndex!]; + const pickedMimeTypeRenderer = currOutput.orderedMimeTypes![currOutput.pickedMimeTypeIndex!]; const innerContainer = DOM.$('.output-inner-container'); DOM.append(outputItemDiv, innerContainer); @@ -505,19 +505,19 @@ export class CodeCell extends Disposable { outputItemDiv.style.position = 'absolute'; } - let hasDynamicHeight = result.hasDynamicHeight; + const hasDynamicHeight = result.hasDynamicHeight; if (hasDynamicHeight) { this.viewCell.selfSizeMonitoring = true; - let clientHeight = outputItemDiv.clientHeight; - let dimension = { + const clientHeight = outputItemDiv.clientHeight; + const dimension = { width: this.viewCell.layoutInfo.editorWidth, height: clientHeight }; const elementSizeObserver = getResizesObserver(outputItemDiv, dimension, () => { if (this.templateData.outputContainer && document.body.contains(this.templateData.outputContainer!)) { - let height = Math.ceil(elementSizeObserver.getHeight()); + const height = Math.ceil(elementSizeObserver.getHeight()); if (clientHeight === height) { return; @@ -541,7 +541,7 @@ export class CodeCell extends Disposable { // noop } else { // static output - let clientHeight = Math.ceil(outputItemDiv.clientHeight); + const clientHeight = Math.ceil(outputItemDiv.clientHeight); this.viewCell.updateOutputHeight(index, clientHeight); const top = this.viewCell.getOutputOffsetInContainer(index); @@ -555,7 +555,7 @@ export class CodeCell extends Disposable { return nls.localize('builtinRenderInfo', "built-in"); } - let renderInfo = this.notebookService.getRendererInfo(renderId); + const renderInfo = this.notebookService.getRendererInfo(renderId); if (renderInfo) { return `${renderId} (${renderInfo.extensionId.value})`; @@ -565,7 +565,7 @@ export class CodeCell extends Disposable { } async pickActiveMimeTypeRenderer(output: ITransformedDisplayOutputDto) { - let currIndex = output.pickedMimeTypeIndex; + const currIndex = output.pickedMimeTypeIndex; const items = output.orderedMimeTypes!.map((mimeType, index): IMimeTypeRenderer => ({ label: mimeType.mimeType, id: mimeType.mimeType, @@ -594,10 +594,10 @@ export class CodeCell extends Disposable { if (pick !== currIndex) { // user chooses another mimetype - let index = this.viewCell.outputs.indexOf(output); - let nextElement = index + 1 < this.viewCell.outputs.length ? this.outputElements.get(this.viewCell.outputs[index + 1])?.element : undefined; + const index = this.viewCell.outputs.indexOf(output); + const nextElement = index + 1 < this.viewCell.outputs.length ? this.outputElements.get(this.viewCell.outputs[index + 1])?.element : undefined; this.outputResizeListeners.get(output)?.clear(); - let element = this.outputElements.get(output)?.element; + const element = this.outputElements.get(output)?.element; if (element) { this.templateData?.outputContainer?.removeChild(element); this.notebookEditor.removeInset(output); diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts index 334187e139e..c3aed546e16 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts @@ -241,8 +241,8 @@ export class StatefulMarkdownCell extends Disposable { this.markdownContainer.innerHTML = ''; this.viewCell.clearHTML(); - let markdownRenderer = this.viewCell.getMarkdownRenderer(); - let renderedHTML = this.viewCell.getHTML(); + const markdownRenderer = this.viewCell.getMarkdownRenderer(); + const renderedHTML = this.viewCell.getHTML(); if (renderedHTML) { this.markdownContainer.appendChild(renderedHTML); } @@ -261,7 +261,7 @@ export class StatefulMarkdownCell extends Disposable { this.localDisposables.add(this.viewCell.textBuffer.onDidChangeContent(() => { this.markdownContainer.innerHTML = ''; this.viewCell.clearHTML(); - let renderedHTML = this.viewCell.getHTML(); + const renderedHTML = this.viewCell.getHTML(); if (renderedHTML) { this.markdownContainer.appendChild(renderedHTML); } @@ -326,7 +326,7 @@ export class StatefulMarkdownCell extends Disposable { private bindEditorListeners() { this.localDisposables.add(this.editor!.onDidContentSizeChange(e => { - let viewLayout = this.editor!.getLayoutInfo(); + const viewLayout = this.editor!.getLayoutInfo(); if (e.contentHeightChanged) { this.viewCell.editorHeight = e.contentHeight; diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/sizeObserver.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/sizeObserver.ts index 6a5b6ba6041..d9be462c054 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/renderers/sizeObserver.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/sizeObserver.ts @@ -33,7 +33,7 @@ export class BrowserResizeObserver extends Disposable implements IResizeObserver this.height = -1; this.observer = new ResizeObserver((entries: any) => { - for (let entry of entries) { + for (const entry of entries) { if (entry.target === referenceDomElement && entry.contentRect) { if (this.width !== entry.contentRect.width || this.height !== entry.contentRect.height) { this.width = entry.contentRect.width; diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts index 57dee431804..f2f4a217b4f 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts @@ -77,10 +77,10 @@ function webviewPreloads() { const domEval = (container: Element) => { const arr = Array.from(container.getElementsByTagName('script')); for (let n = 0; n < arr.length; n++) { - let node = arr[n]; - let scriptTag = document.createElement('script'); + const node = arr[n]; + const scriptTag = document.createElement('script'); scriptTag.text = node.innerText; - for (let key of preservedScriptAttributes) { + for (const key of preservedScriptAttributes) { const val = node[key] || node.getAttribute && node.getAttribute(key); if (val) { scriptTag.setAttribute(key, val as any); @@ -92,11 +92,11 @@ function webviewPreloads() { } }; - let outputObservers = new Map(); + const outputObservers = new Map(); const resizeObserve = (container: Element, id: string) => { const resizeObserver = new ResizeObserver(entries => { - for (let entry of entries) { + for (const entry of entries) { if (!document.body.contains(entry.target)) { return; } @@ -346,14 +346,14 @@ function webviewPreloads() { } let cellOutputContainer = document.getElementById(data.cellId); - let outputId = data.outputId; + const outputId = data.outputId; if (!cellOutputContainer) { const container = document.getElementById('container')!; const upperWrapperElement = createFocusSink(data.cellId, outputId); container.appendChild(upperWrapperElement); - let newElement = document.createElement('div'); + const newElement = document.createElement('div'); newElement.id = data.cellId; container.appendChild(newElement); @@ -363,7 +363,7 @@ function webviewPreloads() { container.appendChild(lowerWrapperElement); } - let outputNode = document.createElement('div'); + const outputNode = document.createElement('div'); outputNode.style.position = 'absolute'; outputNode.style.top = data.top + 'px'; outputNode.style.left = data.left + 'px'; @@ -372,7 +372,7 @@ function webviewPreloads() { outputNode.id = outputId; addMouseoverListeners(outputNode, outputId); - let content = data.content; + const content = data.content; outputNode.innerHTML = content; cellOutputContainer.appendChild(outputNode); @@ -411,7 +411,7 @@ function webviewPreloads() { // console.log('----- will scroll ---- ', date.getMinutes() + ':' + date.getSeconds() + ':' + date.getMilliseconds()); for (let i = 0; i < event.data.widgets.length; i++) { - let widget = document.getElementById(event.data.widgets[i].id)!; + const widget = document.getElementById(event.data.widgets[i].id)!; widget.style.top = event.data.widgets[i].top + 'px'; widget.parentElement!.style.display = 'block'; } @@ -428,7 +428,7 @@ function webviewPreloads() { outputObservers.clear(); break; case 'clearOutput': - let output = document.getElementById(event.data.outputId); + const output = document.getElementById(event.data.outputId); queuedOuputActions.delete(event.data.outputId); // stop any in-progress rendering if (output && output.parentNode) { onWillDestroyOutput.fire([event.data.apiNamespace, { outputId: event.data.outputId }]); @@ -445,7 +445,7 @@ function webviewPreloads() { break; case 'showOutput': enqueueOutputAction(event.data, ({ outputId, top }) => { - let output = document.getElementById(outputId); + const output = document.getElementById(outputId); if (output) { output.parentElement!.style.display = 'block'; output.style.top = top + 'px'; @@ -453,8 +453,8 @@ function webviewPreloads() { }); break; case 'preload': - let resources = event.data.resources; - let preloadsContainer = document.getElementById('__vscode_preloads')!; + const resources = event.data.resources; + const preloadsContainer = document.getElementById('__vscode_preloads')!; for (let i = 0; i < resources.length; i++) { const { uri } = resources[i]; const scriptTag = document.createElement('script'); @@ -471,7 +471,7 @@ function webviewPreloads() { break; case 'decorations': { - let outputContainer = document.getElementById(event.data.cellId); + const outputContainer = document.getElementById(event.data.cellId); event.data.addedClassNames.forEach(n => { outputContainer?.classList.add(n); }); diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.ts index 01de3cfb56a..d70f6e4c842 100644 --- a/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.ts +++ b/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.ts @@ -172,7 +172,7 @@ export abstract class BaseCellViewModel extends Disposable { this.saveViewState(); // decorations need to be cleared first as editors can be resued. this._resolvedDecorations.forEach(value => { - let resolvedid = value.id; + const resolvedid = value.id; if (resolvedid) { this._textEditor?.deltaDecorations([resolvedid], []); diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher.ts index 6b45a999f89..8700ba68862 100644 --- a/src/vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher.ts +++ b/src/vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher.ts @@ -54,7 +54,7 @@ export class NotebookEventDispatcher { emit(events: NotebookViewEvent[]) { for (let i = 0, len = events.length; i < len; i++) { - let e = events[i]; + const e = events[i]; switch (e.type) { case NotebookViewEventType.LayoutChanged: diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/markdownCellViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/markdownCellViewModel.ts index 75f80035264..9c1dc125163 100644 --- a/src/vs/workbench/contrib/notebook/browser/viewModel/markdownCellViewModel.ts +++ b/src/vs/workbench/contrib/notebook/browser/viewModel/markdownCellViewModel.ts @@ -156,7 +156,7 @@ export class MarkdownCellViewModel extends BaseCellViewModel implements ICellVie if (this._html) { return this._html; } - let renderer = this.getMarkdownRenderer(); + const renderer = this.getMarkdownRenderer(); const text = this.getText(); if (text.length === 0) { diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts index a8c6187a0f6..057122d125b 100644 --- a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts +++ b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts @@ -386,7 +386,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD updateFoldingRanges(ranges: FoldingRegions) { this._foldingRanges = ranges; let updateHiddenAreas = false; - let newHiddenAreas: ICellRange[] = []; + const newHiddenAreas: ICellRange[] = []; let i = 0; // index into hidden let k = 0; @@ -399,8 +399,8 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD continue; } - let startLineNumber = ranges.getStartLineNumber(i) + 1; // the first line is not hidden - let endLineNumber = ranges.getEndLineNumber(i); + const startLineNumber = ranges.getStartLineNumber(i) + 1; // the first line is not hidden + const endLineNumber = ranges.getEndLineNumber(i); if (lastCollapsedStart <= startLineNumber && endLineNumber <= lastCollapsedEnd) { // ignore ranges contained in collapsed regions continue; @@ -532,7 +532,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD const newDecorationsLen = newDecorations.length; let newDecorationIndex = 0; - let result = new Array(newDecorationsLen); + const result = new Array(newDecorationsLen); while (oldDecorationIndex < oldDecorationsLen || newDecorationIndex < newDecorationsLen) { let node: IntervalNode | null = null; @@ -597,7 +597,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD } }); - let result: string[] = []; + const result: string[] = []; newDecorations.forEach(decoration => { const cell = this.getCellByHandle(decoration.handle); @@ -726,7 +726,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD return null; } - let splitPoints = cell.getSelectionsStartPosition(); + const splitPoints = cell.getSelectionsStartPosition(); if (splitPoints && splitPoints.length > 0) { await cell.resolveTextModel(); @@ -734,7 +734,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD return null; } - let newLinesContents = this._computeCellLinesContents(cell, splitPoints); + const newLinesContents = this._computeCellLinesContents(cell, splitPoints); if (newLinesContents) { const editorSelections = cell.getSelections(); this._notebook.splitNotebookCell(index, newLinesContents, this.selectionHandles); @@ -1031,7 +1031,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD return; } - let textEdits: WorkspaceTextEdit[] = []; + const textEdits: WorkspaceTextEdit[] = []; this._lastNotebookEditResource.push(matches[0].cell.uri); matches.forEach(match => { diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts index 015b9db73be..015f62a96e3 100644 --- a/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts +++ b/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts @@ -58,7 +58,7 @@ export class NotebookCellTextModel extends Disposable implements ICell { return this._textBuffer; } - let builder = new PieceTreeTextBufferBuilder(); + const builder = new PieceTreeTextBufferBuilder(); builder.acceptChunk(Array.isArray(this._source) ? this._source.join('\n') : this._source); const bufferFactory = builder.finish(true); this._textBuffer = bufferFactory.create(model.DefaultEndOfLine.LF); diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts index 26dbd42de3a..5aaf438642f 100644 --- a/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts +++ b/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts @@ -212,7 +212,7 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel for (let i = 0; i < mainCells.length; i++) { this._mapping.set(mainCells[i].handle, mainCells[i]); - let dirtyStateListener = mainCells[i].onDidChangeContent(() => { + const dirtyStateListener = mainCells[i].onDidChangeContent(() => { this.setDirty(true); this._onDidChangeContent.fire(); }); @@ -259,7 +259,7 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel // const edits operations = operations.sort((a, b) => { - let r = compareRangesUsingEnds([a.start, a.end], [b.start, b.end]); + const r = compareRangesUsingEnds([a.start, a.end], [b.start, b.end]); if (r === 0) { return b.sortIndex - a.sortIndex; } @@ -384,7 +384,7 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel this.cells = [cell]; this._mapping.set(cell.handle, cell); - let dirtyStateListener = cell.onDidChangeContent(() => { + const dirtyStateListener = cell.onDidChangeContent(() => { this._isUntitled = false; this.setDirty(true); this._onDidChangeContent.fire(); @@ -421,7 +421,7 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel for (let i = 0; i < cells.length; i++) { this._mapping.set(cells[i].handle, cells[i]); - let dirtyStateListener = cells[i].onDidChangeContent(() => { + const dirtyStateListener = cells[i].onDidChangeContent(() => { this.setDirty(true); this._onDidChangeContent.fire(); }); @@ -463,7 +463,7 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel this._isUntitled = false; for (let i = index; i < index + count; i++) { - let cell = this.cells[i]; + const cell = this.cells[i]; this._cellListeners.get(cell.handle)?.dispose(); this._cellListeners.delete(cell.handle); } @@ -501,12 +501,12 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel // TODO@rebornix should this trigger content change event? $spliceNotebookCellOutputs(cellHandle: number, splices: NotebookCellOutputsSplice[]): void { - let cell = this._mapping.get(cellHandle); + const cell = this._mapping.get(cellHandle); cell?.spliceNotebookCellOutputs(splices); } clearCellOutput(handle: number) { - let cell = this._mapping.get(handle); + const cell = this._mapping.get(handle); if (cell) { cell.spliceNotebookCellOutputs([ [0, cell.outputs.length, []] @@ -518,7 +518,7 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel } changeCellLanguage(handle: number, languageId: string) { - let cell = this._mapping.get(handle); + const cell = this._mapping.get(handle); if (cell && cell.language !== languageId) { cell.language = languageId; diff --git a/src/vs/workbench/contrib/notebook/common/notebookOutputRenderer.ts b/src/vs/workbench/contrib/notebook/common/notebookOutputRenderer.ts index aa484dbfbaa..b22c64145eb 100644 --- a/src/vs/workbench/contrib/notebook/common/notebookOutputRenderer.ts +++ b/src/vs/workbench/contrib/notebook/common/notebookOutputRenderer.ts @@ -24,7 +24,7 @@ export class NotebookOutputRendererInfo { } matches(mimeType: string) { - let matched = this.mimeTypeGlobs.find(pattern => pattern(mimeType)); + const matched = this.mimeTypeGlobs.find(pattern => pattern(mimeType)); if (matched) { return true; } diff --git a/src/vs/workbench/contrib/notebook/test/notebookViewModel.test.ts b/src/vs/workbench/contrib/notebook/test/notebookViewModel.test.ts index f979f53344a..60d7d3cfdf7 100644 --- a/src/vs/workbench/contrib/notebook/test/notebookViewModel.test.ts +++ b/src/vs/workbench/contrib/notebook/test/notebookViewModel.test.ts @@ -239,7 +239,7 @@ function getVisibleCells(cells: T[], hiddenRanges: ICellRange[]) { let start = 0; let hiddenRangeIndex = 0; - let result: T[] = []; + const result: T[] = []; while (start < cells.length && hiddenRangeIndex < hiddenRanges.length) { if (start < hiddenRanges[hiddenRangeIndex].start) {