Merge branch 'microsoft:main' into fix/prompt-filename-with-digits

j3iiifn · web-flow · commit 2f77b57ac409 · 2025-08-15T04:53:15.000+09:00
diff --git a/eslint.config.js b/eslint.config.js
@@ -6,7 +6,6 @@
 import fs from 'fs';
 import path from 'path';
 import tseslint from 'typescript-eslint';
-import { fileURLToPath } from 'url';
 
 import stylisticTs from '@stylistic/eslint-plugin-ts';
 import * as pluginLocal from './.eslint-plugin-local/index.js';
@@ -1395,17 +1394,33 @@ export default tseslint.config(
 			]
 		}
 	},
-	// typescript-language-features
+	// Additional extension strictness rules
 	{
 		files: [
+			'extensions/markdown-language-features/**/*.ts',
+			'extensions/media-preview/**/*.ts',
+			'extensions/simple-browser/**/*.ts',
 			'extensions/typescript-language-features/**/*.ts',
 		],
 		languageOptions: {
 			parser: tseslint.parser,
 			parserOptions: {
 				project: [
+					// Markdown
+					'extensions/markdown-language-features/tsconfig.json',
+					'extensions/markdown-language-features/notebook/tsconfig.json',
+					'extensions/markdown-language-features/preview-src/tsconfig.json',
+
+					// Media preview
+					'extensions/media-preview/tsconfig.json',
+
+					// Media preview
+					'extensions/simple-browser/tsconfig.json',
+					'extensions/simple-browser/preview-src/tsconfig.json',
+
+					// TypeScript
 					'extensions/typescript-language-features/tsconfig.json',
-					'extensions/typescript-language-features/web/tsconfig.json'
+					'extensions/typescript-language-features/web/tsconfig.json',
 				],
 			}
 		},
@@ -1415,6 +1430,7 @@ export default tseslint.config(
 		rules: {
 			'@typescript-eslint/prefer-optional-chain': 'warn',
 			'@typescript-eslint/prefer-readonly': 'warn',
+			'@typescript-eslint/consistent-generic-constructors': ['warn', 'constructor'],
 		}
 	},
 );
diff --git a/extensions/markdown-language-features/preview-src/csp.ts b/extensions/markdown-language-features/preview-src/csp.ts
@@ -24,7 +24,7 @@ export class CspAlerter {
 		});
 
 		window.addEventListener('message', (event) => {
-			if (event && event.data && event.data.name === 'vscode-did-block-svg') {
+			if (event?.data && event.data.name === 'vscode-did-block-svg') {
 				this._onCspWarning();
 			}
 		});
diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts
@@ -432,7 +432,7 @@ function domEval(el: Element): void {
 		const trustedScript = node.innerText;
 		scriptTag.text = trustedScript as string;
 		for (const key of preservedScriptAttributes) {
-			const val = node.getAttribute && node.getAttribute(key);
+			const val = node.getAttribute?.(key);
 			if (val) {
 				scriptTag.setAttribute(key, val as any);
 			}
diff --git a/extensions/markdown-language-features/preview-src/loading.ts b/extensions/markdown-language-features/preview-src/loading.ts
@@ -5,7 +5,7 @@
 import { MessagePoster } from './messaging';
 
 export class StyleLoadingMonitor {
-	private _unloadedStyles: string[] = [];
+	private readonly _unloadedStyles: string[] = [];
 	private _finishedLoading: boolean = false;
 
 	private _poster?: MessagePoster;
diff --git a/extensions/markdown-language-features/src/client/workspace.ts b/extensions/markdown-language-features/src/client/workspace.ts
@@ -17,7 +17,7 @@ import { ResourceMap } from '../util/resourceMap';
  */
 export class VsCodeMdWorkspace extends Disposable {
 
-	private _watcher: vscode.FileSystemWatcher | undefined;
+	private readonly _watcher: vscode.FileSystemWatcher | undefined;
 
 	private readonly _documentCache = new ResourceMap<ITextDocument>();
 
diff --git a/extensions/markdown-language-features/src/commands/showPreview.ts b/extensions/markdown-language-features/src/commands/showPreview.ts
@@ -37,7 +37,7 @@ async function showPreview(
 		return;
 	}
 
-	const resourceColumn = (vscode.window.activeTextEditor && vscode.window.activeTextEditor.viewColumn) || vscode.ViewColumn.One;
+	const resourceColumn = vscode.window.activeTextEditor?.viewColumn || vscode.ViewColumn.One;
 	webviewManager.openDynamicPreview(resource, {
 		resourceColumn: resourceColumn,
 		previewColumn: previewSettings.sideBySide ? vscode.ViewColumn.Beside : resourceColumn,
@@ -62,7 +62,7 @@ export class ShowPreviewCommand implements Command {
 		for (const uri of Array.isArray(allUris) ? allUris : [mainUri]) {
 			showPreview(this._webviewManager, this._telemetryReporter, uri, {
 				sideBySide: false,
-				locked: previewSettings && previewSettings.locked
+				locked: previewSettings?.locked
 			});
 		}
 	}
@@ -79,7 +79,7 @@ export class ShowPreviewToSideCommand implements Command {
 	public execute(uri?: vscode.Uri, previewSettings?: DynamicPreviewSettings) {
 		showPreview(this._webviewManager, this._telemetryReporter, uri, {
 			sideBySide: true,
-			locked: previewSettings && previewSettings.locked
+			locked: previewSettings?.locked
 		});
 	}
 }
diff --git a/extensions/markdown-language-features/src/languageFeatures/linkUpdater.ts b/extensions/markdown-language-features/src/languageFeatures/linkUpdater.ts
@@ -65,7 +65,7 @@ class UpdateLinksOnFileRenameHandler extends Disposable {
 
 		const result = await this._getEditsForFileRename(renames, noopToken);
 
-		if (result && result.edit.size) {
+		if (result?.edit.size) {
 			if (await this._confirmActionWithUser(result.resourcesBeingRenamed)) {
 				await vscode.workspace.applyEdit(result.edit);
 			}
diff --git a/extensions/markdown-language-features/src/markdownEngine.ts b/extensions/markdown-language-features/src/markdownEngine.ts
@@ -101,7 +101,7 @@ export class MarkdownItEngine implements IMdParser {
 	private _md?: Promise<MarkdownIt>;
 
 	private _slugCount = new Map<string, number>();
-	private _tokenCache = new TokenCache();
+	private readonly _tokenCache = new TokenCache();
 
 	public readonly slugifier: Slugifier;
 
@@ -433,7 +433,7 @@ async function getMarkdownOptions(md: () => MarkdownIt): Promise<MarkdownIt.Opti
 }
 
 function normalizeHighlightLang(lang: string | undefined) {
-	switch (lang && lang.toLowerCase()) {
+	switch (lang?.toLowerCase()) {
 		case 'shell':
 			return 'sh';
 
diff --git a/extensions/markdown-language-features/src/markdownExtensions.ts b/extensions/markdown-language-features/src/markdownExtensions.ts
@@ -84,7 +84,7 @@ export namespace MarkdownContributions {
 		const map = new Map<string, Thenable<(md: any) => any>>();
 		if (contributes['markdown.markdownItPlugins']) {
 			map.set(extension.id, extension.activate().then(() => {
-				if (extension.exports && extension.exports.extendMarkdownIt) {
+				if (extension.exports?.extendMarkdownIt) {
 					return (md: any) => extension.exports.extendMarkdownIt(md);
 				}
 				return (md: any) => md;
diff --git a/extensions/markdown-language-features/src/preview/preview.ts b/extensions/markdown-language-features/src/preview/preview.ts
@@ -53,7 +53,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 	private readonly _webviewPanel: vscode.WebviewPanel;
 
 	private _line: number | undefined;
-	private _scrollToFragment: string | undefined;
+	private readonly _scrollToFragment: string | undefined;
 	private _firstUpdate = true;
 	private _currentVersion?: PreviewDocumentVersion;
 	private _isScrolling = false;
diff --git a/extensions/markdown-language-features/src/preview/previewConfig.ts b/extensions/markdown-language-features/src/preview/previewConfig.ts
@@ -36,7 +36,7 @@ export class MarkdownPreviewConfiguration {
 		this.scrollBeyondLastLine = editorConfig.get<boolean>('scrollBeyondLastLine', false);
 
 		this.wordWrap = editorConfig.get<string>('wordWrap', 'off') !== 'off';
-		if (markdownEditorConfig && markdownEditorConfig['editor.wordWrap']) {
+		if (markdownEditorConfig?.['editor.wordWrap']) {
 			this.wordWrap = markdownEditorConfig['editor.wordWrap'] !== 'off';
 		}
 
@@ -83,13 +83,11 @@ export class MarkdownPreviewConfigurationManager {
 		return config;
 	}
 
-	public hasConfigurationChanged(
-		resource: vscode.Uri
-	): boolean {
+	public hasConfigurationChanged(resource: vscode.Uri): boolean {
 		const key = this._getKey(resource);
 		const currentConfig = this._previewConfigurationsForWorkspaces.get(key);
 		const newConfig = MarkdownPreviewConfiguration.getForResource(resource);
-		return (!currentConfig || !currentConfig.isEqualTo(newConfig));
+		return !currentConfig?.isEqualTo(newConfig);
 	}
 
 	private _getKey(
diff --git a/extensions/markdown-language-features/src/preview/topmostLineMonitor.ts b/extensions/markdown-language-features/src/preview/topmostLineMonitor.ts
@@ -17,8 +17,8 @@ export class TopmostLineMonitor extends Disposable {
 
 	private readonly _pendingUpdates = new ResourceMap<number>();
 	private readonly _throttle = 50;
-	private _previousTextEditorInfo = new ResourceMap<LastScrollLocation>();
-	private _previousStaticEditorInfo = new ResourceMap<LastScrollLocation>();
+	private readonly _previousTextEditorInfo = new ResourceMap<LastScrollLocation>();
+	private readonly _previousStaticEditorInfo = new ResourceMap<LastScrollLocation>();
 
 	constructor() {
 		super();
diff --git a/extensions/markdown-language-features/src/telemetryReporter.ts b/extensions/markdown-language-features/src/telemetryReporter.ts
@@ -49,7 +49,7 @@ export function loadDefaultTelemetryReporter(): TelemetryReporter {
 
 function getPackageInfo(): IPackageInfo | null {
 	const extension = vscode.extensions.getExtension('Microsoft.vscode-markdown');
-	if (extension && extension.packageJSON) {
+	if (extension?.packageJSON) {
 		return {
 			name: extension.packageJSON.name,
 			version: extension.packageJSON.version,
diff --git a/extensions/markdown-language-features/src/util/async.ts b/extensions/markdown-language-features/src/util/async.ts
@@ -39,7 +39,7 @@ export class Delayer<T> {
 			}).then(() => {
 				this._cancelTimeout = null;
 				this._onSuccess = null;
-				const result = this._task && this._task?.();
+				const result = this._task?.() ?? null;
 				this._task = null;
 				return result;
 			});
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
@@ -302,6 +302,12 @@
             "markdownDescription": "%configuration.implicitProjectConfig.strictFunctionTypes%",
             "scope": "window"
           },
+          "js/ts.implicitProjectConfig.strict": {
+            "type": "boolean",
+            "default": true,
+            "markdownDescription": "%configuration.implicitProjectConfig.strict%",
+            "scope": "window"
+          },
           "typescript.tsc.autoDetect": {
             "type": "string",
             "default": "on",
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
@@ -86,6 +86,7 @@
 	"configuration.implicitProjectConfig.experimentalDecorators": "Enable/disable `experimentalDecorators` in JavaScript files that are not part of a project. Existing `jsconfig.json` or `tsconfig.json` files override this setting.",
 	"configuration.implicitProjectConfig.strictNullChecks": "Enable/disable [strict null checks](https://www.typescriptlang.org/tsconfig#strictNullChecks) in JavaScript and TypeScript files that are not part of a project. Existing `jsconfig.json` or `tsconfig.json` files override this setting.",
 	"configuration.implicitProjectConfig.strictFunctionTypes": "Enable/disable [strict function types](https://www.typescriptlang.org/tsconfig#strictFunctionTypes) in JavaScript and TypeScript files that are not part of a project. Existing `jsconfig.json` or `tsconfig.json` files override this setting.",
+	"configuration.implicitProjectConfig.strict": "Enable/disable [strict mode](https://www.typescriptlang.org/tsconfig#strict) in JavaScript and TypeScript files that are not part of a project. Existing `jsconfig.json` or `tsconfig.json` files override this setting.",
 	"configuration.suggest.jsdoc.generateReturns": "Enable/disable generating `@returns` annotations for JSDoc templates.",
 	"configuration.suggest.autoImports": "Enable/disable auto import suggestions.",
 	"configuration.preferGoToSourceDefinition": "Makes `Go to Definition` avoid type declaration files when possible by triggering `Go to Source Definition` instead. This allows `Go to Source Definition` to be triggered with the mouse gesture.",
diff --git a/extensions/typescript-language-features/src/configuration/configuration.ts b/extensions/typescript-language-features/src/configuration/configuration.ts
@@ -64,6 +64,7 @@ export class ImplicitProjectConfiguration {
 	public readonly experimentalDecorators: boolean;
 	public readonly strictNullChecks: boolean;
 	public readonly strictFunctionTypes: boolean;
+	public readonly strict: boolean;
 
 	constructor(configuration: vscode.WorkspaceConfiguration) {
 		this.target = ImplicitProjectConfiguration.readTarget(configuration);
@@ -72,6 +73,7 @@ export class ImplicitProjectConfiguration {
 		this.experimentalDecorators = ImplicitProjectConfiguration.readExperimentalDecorators(configuration);
 		this.strictNullChecks = ImplicitProjectConfiguration.readImplicitStrictNullChecks(configuration);
 		this.strictFunctionTypes = ImplicitProjectConfiguration.readImplicitStrictFunctionTypes(configuration);
+		this.strict = ImplicitProjectConfiguration.readImplicitStrict(configuration);
 	}
 
 	public isEqualTo(other: ImplicitProjectConfiguration): boolean {
@@ -101,6 +103,10 @@ export class ImplicitProjectConfiguration {
 	private static readImplicitStrictFunctionTypes(configuration: vscode.WorkspaceConfiguration): boolean {
 		return configuration.get<boolean>('js/ts.implicitProjectConfig.strictFunctionTypes', true);
 	}
+
+	private static readImplicitStrict(configuration: vscode.WorkspaceConfiguration): boolean {
+		return configuration.get<boolean>('js/ts.implicitProjectConfig.strict', true);
+	}
 }
 
 export interface TypeScriptServiceConfiguration {
diff --git a/extensions/typescript-language-features/src/task/taskProvider.ts b/extensions/typescript-language-features/src/task/taskProvider.ts
@@ -57,7 +57,7 @@ class TscTaskProvider extends Disposable implements vscode.TaskProvider {
 			return [];
 		}
 
-		const configPaths: Set<string> = new Set();
+		const configPaths = new Set<string>();
 		const tasks: vscode.Task[] = [];
 		for (const project of await this.getAllTsConfigs(token)) {
 			if (!configPaths.has(project.fsPath)) {
diff --git a/extensions/typescript-language-features/src/tsconfig.ts b/extensions/typescript-language-features/src/tsconfig.ts
@@ -55,6 +55,10 @@ export function inferredProjectCompilerOptions(
 		projectConfig.strictFunctionTypes = true;
 	}
 
+	if (serviceConfig.implicitProjectConfiguration.strict) {
+		projectConfig.strict = true;
+	}
+
 	if (serviceConfig.implicitProjectConfiguration.module) {
 		projectConfig.module = serviceConfig.implicitProjectConfiguration.module as Proto.ModuleKind;
 	}
diff --git a/extensions/typescript-language-features/web/src/typingsInstaller/typingsInstaller.ts b/extensions/typescript-language-features/web/src/typingsInstaller/typingsInstaller.ts
@@ -40,7 +40,7 @@ export class WebTypingsInstallerClient implements ts.server.ITypingsInstaller {
 
 	private requestedRegistry = false;
 
-	private typesRegistryCache: Map<string, ts.MapLike<string>> = new Map();
+	private typesRegistryCache = new Map<string, ts.MapLike<string>>();
 
 	private readonly server: Promise<WebTypingsInstallerServer>;
 
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -48,7 +48,7 @@ import { ITerminalGroupService, ITerminalService } from '../../terminal/browser/
 import { ITerminalProfileResolverService } from '../../terminal/common/terminal.js';
 
 import { ConfiguringTask, ContributedTask, CustomTask, ExecutionEngine, InMemoryTask, ITaskEvent, ITaskIdentifier, ITaskSet, JsonSchemaVersion, KeyedTaskIdentifier, RuntimeType, Task, TASK_RUNNING_STATE, TaskDefinition, TaskGroup, TaskRunSource, TaskSettingId, TaskSorter, TaskSourceKind, TasksSchemaProperties, USER_TASKS_GROUP_KEY, TaskEventKind, InstancePolicy, RerunAllRunningTasksCommandId } from '../common/tasks.js';
-import { CustomExecutionSupportedContext, ICustomizationProperties, IProblemMatcherRunOptions, ITaskFilter, ITaskProvider, ITaskService, IWorkspaceFolderTaskResult, ProcessExecutionSupportedContext, ServerlessWebContext, ShellExecutionSupportedContext, TaskCommandsRegistered, TaskExecutionSupportedContext } from '../common/taskService.js';
+import { CustomExecutionSupportedContext, ICustomizationProperties, IProblemMatcherRunOptions, ITaskFilter, ITaskProvider, ITaskService, IWorkspaceFolderTaskResult, ProcessExecutionSupportedContext, ServerlessWebContext, ShellExecutionSupportedContext, TaskCommandsRegistered, TaskExecutionSupportedContext, TasksAvailableContext } from '../common/taskService.js';
 import { ITaskExecuteResult, ITaskResolver, ITaskSummary, ITaskSystem, ITaskSystemInfo, ITaskTerminateResponse, TaskError, TaskErrors, TaskExecuteKind, Triggers, VerifiedTask } from '../common/taskSystem.js';
 import { getTemplates as getTaskTemplates } from '../common/taskTemplates.js';
 
@@ -231,6 +231,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 	private _persistentTasks: LRUCache<string, string> | undefined;
 
 	protected _taskRunningState: IContextKey<boolean>;
+	protected _tasksAvailableState: IContextKey<boolean>;
 
 	protected _outputChannel: IOutputChannel;
 	protected readonly _onDidStateChange: Emitter<ITaskEvent>;
@@ -347,6 +348,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 
 		}));
 		this._taskRunningState = TASK_RUNNING_STATE.bindTo(_contextKeyService);
+		this._tasksAvailableState = TasksAvailableContext.bindTo(_contextKeyService);
 		this._onDidStateChange = this._register(new Emitter());
 		this._registerCommands().then(() => TaskCommandsRegistered.bindTo(this._contextKeyService).set(true));
 		ServerlessWebContext.bindTo(this._contextKeyService).set(Platform.isWeb && !remoteAgentService.getConnection()?.remoteAuthority);
@@ -2467,6 +2469,14 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		if (userTasks) {
 			result.set(USER_TASKS_GROUP_KEY, userTasks);
 		}
+
+		// Update tasks available context key
+		const hasAnyTasks = Array.from(result.values()).some(folderResult =>
+			(folderResult.set?.tasks && folderResult.set.tasks.length > 0) ||
+			(folderResult.configurations?.byIdentifier && Object.keys(folderResult.configurations.byIdentifier).length > 0)
+		);
+		this._tasksAvailableState.set(hasAnyTasks);
+
 		return result;
 	}
 
diff --git a/src/vs/workbench/contrib/tasks/common/taskService.ts b/src/vs/workbench/contrib/tasks/common/taskService.ts
@@ -14,14 +14,13 @@ import { ITaskSummary, ITaskTerminateResponse, ITaskSystemInfo } from './taskSys
 import { IStringDictionary } from '../../../../base/common/collections.js';
 import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { URI } from '../../../../base/common/uri.js';
-
 export type { ITaskSummary, Task, ITaskTerminateResponse as TaskTerminateResponse };
-
 export const CustomExecutionSupportedContext = new RawContextKey<boolean>('customExecutionSupported', false, nls.localize('tasks.customExecutionSupported', "Whether CustomExecution tasks are supported. Consider using in the when clause of a \'taskDefinition\' contribution."));
 export const ShellExecutionSupportedContext = new RawContextKey<boolean>('shellExecutionSupported', false, nls.localize('tasks.shellExecutionSupported', "Whether ShellExecution tasks are supported. Consider using in the when clause of a \'taskDefinition\' contribution."));
 export const TaskCommandsRegistered = new RawContextKey<boolean>('taskCommandsRegistered', false, nls.localize('tasks.taskCommandsRegistered', "Whether the task commands have been registered yet"));
 export const ProcessExecutionSupportedContext = new RawContextKey<boolean>('processExecutionSupported', false, nls.localize('tasks.processExecutionSupported', "Whether ProcessExecution tasks are supported. Consider using in the when clause of a \'taskDefinition\' contribution."));
 export const ServerlessWebContext = new RawContextKey<boolean>('serverlessWebContext', false, nls.localize('tasks.serverlessWebContext', "True when in the web with no remote authority."));
+export const TasksAvailableContext = new RawContextKey<boolean>('tasksAvailable', false, nls.localize('tasks.tasksAvailable', "Whether any tasks are available in the workspace."));
 export const TaskExecutionSupportedContext = ContextKeyExpr.or(ContextKeyExpr.and(ShellExecutionSupportedContext, ProcessExecutionSupportedContext), CustomExecutionSupportedContext);
 
 export const ITaskService = createDecorator<ITaskService>('taskService');
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/bufferOutputPolling.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/bufferOutputPolling.ts
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.ts
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.ts
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/createAndRunTaskTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/createAndRunTaskTool.ts
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/getTaskOutputTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/getTaskOutputTool.ts
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/runTaskTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/runTaskTool.ts

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ export class CspAlerter {`
`24`	`24`	`});`
`25`	`25`
`26`	`26`	`window.addEventListener('message', (event) => {`
`27`		`- if (event && event.data && event.data.name === 'vscode-did-block-svg') {`
	`27`	`+ if (event?.data && event.data.name === 'vscode-did-block-svg') {`
`28`	`28`	`this._onCspWarning();`
`29`	`29`	`}`
`30`	`30`	`});`
Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ function domEval(el: Element): void {`
`432`	`432`	`const trustedScript = node.innerText;`
`433`	`433`	`scriptTag.text = trustedScript as string;`
`434`	`434`	`for (const key of preservedScriptAttributes) {`
`435`		`- const val = node.getAttribute && node.getAttribute(key);`
	`435`	`+ const val = node.getAttribute?.(key);`
`436`	`436`	`if (val) {`
`437`	`437`	`scriptTag.setAttribute(key, val as any);`
`438`	`438`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ async function showPreview(`
`37`	`37`	`return;`
`38`	`38`	`}`
`39`	`39`
`40`		`- const resourceColumn = (vscode.window.activeTextEditor && vscode.window.activeTextEditor.viewColumn) \|\| vscode.ViewColumn.One;`
	`40`	`+ const resourceColumn = vscode.window.activeTextEditor?.viewColumn \|\| vscode.ViewColumn.One;`
`41`	`41`	`webviewManager.openDynamicPreview(resource, {`
`42`	`42`	`resourceColumn: resourceColumn,`
`43`	`43`	`previewColumn: previewSettings.sideBySide ? vscode.ViewColumn.Beside : resourceColumn,`
`@@ -62,7 +62,7 @@ export class ShowPreviewCommand implements Command {`
`62`	`62`	`for (const uri of Array.isArray(allUris) ? allUris : [mainUri]) {`
`63`	`63`	`showPreview(this._webviewManager, this._telemetryReporter, uri, {`
`64`	`64`	`sideBySide: false,`
`65`		`- locked: previewSettings && previewSettings.locked`
	`65`	`+ locked: previewSettings?.locked`
`66`	`66`	`});`
`67`	`67`	`}`
`68`	`68`	`}`
`@@ -79,7 +79,7 @@ export class ShowPreviewToSideCommand implements Command {`
`79`	`79`	`public execute(uri?: vscode.Uri, previewSettings?: DynamicPreviewSettings) {`
`80`	`80`	`showPreview(this._webviewManager, this._telemetryReporter, uri, {`
`81`	`81`	`sideBySide: true,`
`82`		`- locked: previewSettings && previewSettings.locked`
	`82`	`+ locked: previewSettings?.locked`
`83`	`83`	`});`
`84`	`84`	`}`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ class UpdateLinksOnFileRenameHandler extends Disposable {`
`65`	`65`
`66`	`66`	`const result = await this._getEditsForFileRename(renames, noopToken);`
`67`	`67`
`68`		`- if (result && result.edit.size) {`
	`68`	`+ if (result?.edit.size) {`
`69`	`69`	`if (await this._confirmActionWithUser(result.resourcesBeingRenamed)) {`
`70`	`70`	`await vscode.workspace.applyEdit(result.edit);`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ export namespace MarkdownContributions {`
`84`	`84`	`const map = new Map<string, Thenable<(md: any) => any>>();`
`85`	`85`	`if (contributes['markdown.markdownItPlugins']) {`
`86`	`86`	`map.set(extension.id, extension.activate().then(() => {`
`87`		`- if (extension.exports && extension.exports.extendMarkdownIt) {`
	`87`	`+ if (extension.exports?.extendMarkdownIt) {`
`88`	`88`	`return (md: any) => extension.exports.extendMarkdownIt(md);`
`89`	`89`	`}`
`90`	`90`	`return (md: any) => md;`