Skip to content

replace in checks with Object.hasOwn #292956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
meganrogge merged 1 commit into from
Feb 4, 2026
+48 −56
Merged

replace in checks with Object.hasOwn #292956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,6 @@ export default tseslint.config(
'extensions/emmet/src/updateImageSize.ts',
'extensions/emmet/src/util.ts',
'extensions/github-authentication/src/node/fetch.ts',
'extensions/terminal-suggest/src/fig/figInterface.ts',
'extensions/terminal-suggest/src/fig/fig-autocomplete-shared/mixins.ts',
'extensions/terminal-suggest/src/fig/fig-autocomplete-shared/specMetadata.ts',
'extensions/terminal-suggest/src/terminalSuggestMain.ts',
'extensions/terminal-suggest/src/test/env/pathExecutableCache.test.ts',
'extensions/tunnel-forwarding/src/extension.ts',
'extensions/typescript-language-features/src/utils/platform.ts',
'extensions/typescript-language-features/web/src/webServer.ts',
Expand Down Expand Up @@ -307,11 +302,6 @@ export default tseslint.config(
'src/vs/workbench/contrib/output/browser/outputView.ts',
'src/vs/workbench/contrib/preferences/browser/settingsTree.ts',
'src/vs/workbench/contrib/remoteTunnel/electron-browser/remoteTunnel.contribution.ts',
'src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts',
'src/vs/workbench/contrib/tasks/browser/taskTerminalStatus.ts',
'src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts',
'src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.ts',
'src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.ts',
'src/vs/workbench/contrib/testing/browser/explorerProjections/listProjection.ts',
'src/vs/workbench/contrib/testing/browser/explorerProjections/treeProjection.ts',
'src/vs/workbench/contrib/testing/browser/testCoverageBars.ts',
Expand Down
2 changes: 1 addition & 1 deletion extensions/terminal-suggest/src/fig/fig-autocomplete-shared/mixins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const mergeNamedObjectArrays = <T extends NamedObject>(
if (!partial) {
throw new Error('Invalid object passed to merge');
}
const existingNames = makeArray(partial.name).filter((name) => name in existingNameIndexMap);
const existingNames = makeArray(partial.name).filter((name) => Object.hasOwn(existingNameIndexMap, name));
if (existingNames.length === 0) {
mergedObjects.push(partial);
} else {
Expand Down
10 changes: 5 additions & 5 deletions extensions/terminal-suggest/src/fig/fig-autocomplete-shared/specMetadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ export function convertLoadSpec<ArgT, OptionT, SubcommandT>(

if (typeof loadSpec === 'function') {
return (...args) =>
loadSpec(...args).then((result) => {
loadSpec(...args).then((result): Fig.SpecLocation[] | Subcommand<ArgT, OptionT, SubcommandT> => {
if (Array.isArray(result)) {
return result;
return result as Fig.SpecLocation[];
}
if ('type' in result) {
return [result];
if (Object.hasOwn(result, 'type')) {
return [result as Fig.SpecLocation];
}
return convertSubcommand(result, initialize);
return convertSubcommand(result as Fig.Subcommand, initialize);
});
}

Expand Down
8 changes: 4 additions & 4 deletions extensions/terminal-suggest/src/fig/figInterface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ export async function collectCompletionItemResult(
let itemKind = kind;
const lastArgType: string | undefined = parsedArguments?.annotations.at(-1)?.type;
if (lastArgType === 'subcommand_arg') {
if (typeof item === 'object' && 'args' in item && (asArray(item.args ?? [])).length > 0) {
if (typeof item === 'object' && Object.hasOwn(item, 'args') && (asArray((item as Fig.Option).args ?? [])).length > 0) {
itemKind = vscode.TerminalCompletionItemKind.Option;
}
}
Expand All @@ -287,8 +287,8 @@ export async function collectCompletionItemResult(

// Add <argName> for every argument
let detail: string | undefined;
if (typeof item === 'object' && 'args' in item) {
const args = asArray(item.args);
if (typeof item === 'object' && Object.hasOwn(item, 'args')) {
const args = asArray((item as Fig.Option).args);
if (args.every(e => !!e?.name)) {
if (args.length > 0) {
detail = ' ' + args.map(e => {
Expand Down Expand Up @@ -352,7 +352,7 @@ function convertEnvRecordToArray(env: Record<string, string>): EnvironmentVariab
}

export function getFixSuggestionDescription(spec: Fig.Spec): string {
if ('description' in spec) {
if (typeof spec !== 'function' && Object.hasOwn(spec, 'description')) {
return spec.description ?? '';
}
return '';
Expand Down
2 changes: 1 addition & 1 deletion extensions/terminal-suggest/src/terminalSuggestMain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ export async function activate(context: vscode.ExtensionContext) {
return;
}

const shellType: string | undefined = 'shell' in terminal.state ? terminal.state.shell as string : undefined;
const shellType: string | undefined = Object.hasOwn(terminal.state, 'shell') ? terminal.state.shell as string : undefined;
const terminalShellType = getTerminalShellType(shellType);
if (!terminalShellType) {
console.debug(`#terminalCompletions Shell type ${shellType} not supported`);
Expand Down
4 changes: 2 additions & 2 deletions extensions/terminal-suggest/src/test/env/pathExecutableCache.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ suite('PathExecutableCache', () => {
symlinkDocRaw = resource.documentation;
}
}
const realDoc = typeof realDocRaw === 'string' ? realDocRaw : (realDocRaw && 'value' in realDocRaw ? realDocRaw.value : undefined);
const symlinkDoc = typeof symlinkDocRaw === 'string' ? symlinkDocRaw : (symlinkDocRaw && 'value' in symlinkDocRaw ? symlinkDocRaw.value : undefined);
const realDoc = typeof realDocRaw === 'string' ? realDocRaw : (realDocRaw && Object.hasOwn(realDocRaw, 'value') ? realDocRaw.value : undefined);
const symlinkDoc = typeof symlinkDocRaw === 'string' ? symlinkDocRaw : (symlinkDocRaw && Object.hasOwn(symlinkDocRaw, 'value') ? symlinkDocRaw.value : undefined);

const realPath = path.join(fixtureDir, 'real-executable.sh');
const symlinkPath = path.join(fixtureDir, 'symlink-executable.sh');
Expand Down
14 changes: 7 additions & 7 deletions src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
const tasks = await this.getWorkspaceTasks();
for (const [, workspaceTasks] of tasks) {
if (workspaceTasks.configurations) {
for (const taskName in workspaceTasks.configurations.byIdentifier) {
for (const taskName of Object.keys(workspaceTasks.configurations.byIdentifier)) {
const task = workspaceTasks.configurations.byIdentifier[taskName];
if (predicate(task, workspaceTasks.workspaceFolder)) {
result.push(task);
Expand Down Expand Up @@ -1256,7 +1256,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
readTasksMap.set(taskKey, task);
}
});
for (const configuration in customized) {
for (const configuration of Object.keys(customized)) {
const taskKey = customized[configuration].getKey();
if (taskKey) {
readTasksMap.set(taskKey, customized[configuration]);
Expand Down Expand Up @@ -1308,7 +1308,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
version: '2.0.0',
tasks: [customizations]
}, TaskRunSource.System, custom, customized, TaskConfig.TaskConfigSource.TasksJson, true);
for (const configuration in customized) {
for (const configuration of Object.keys(customized)) {
key = customized[configuration].getKey()!;
}
}
Expand Down Expand Up @@ -1351,7 +1351,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
version: '2.0.0',
tasks: [customizations]
}, TaskRunSource.System, custom, customized, TaskConfig.TaskConfigSource.TasksJson, true);
for (const configuration in customized) {
for (const configuration of Object.keys(customized)) {
key = customized[configuration].getKey()!;
}
}
Expand Down Expand Up @@ -3816,7 +3816,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
entry = <TaskQuickPickEntryType>task;
}
}
const task: Task | undefined | null = entry && 'task' in entry ? entry.task : undefined;
const task: Task | undefined | null = entry && Object.hasOwn(entry, 'task') ? (entry as IQuickPickItem & { task: Task }).task : undefined;
if ((task === undefined) || (task === null)) {
return;
}
Expand All @@ -3835,7 +3835,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
placeHolder: nls.localize('TaskService.pickDefaultBuildTask', 'Select the task to be used as the default build task')
}).
then((entry) => {
const task: Task | undefined | null = entry && 'task' in entry ? entry.task : undefined;
const task: Task | undefined | null = entry && Object.hasOwn(entry, 'task') ? (entry as IQuickPickItem & { task: Task }).task : undefined;
if ((task === undefined) || (task === null)) {
return;
}
Expand Down Expand Up @@ -3885,7 +3885,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
this._showIgnoredFoldersMessage().then(() => {
this._showQuickPick(tasks,
nls.localize('TaskService.pickDefaultTestTask', 'Select the task to be used as the default test task'), undefined, true, false, selectedEntry).then((entry) => {
const task: Task | undefined | null = entry ? entry.task : undefined;
const task: Task | undefined | null = entry && Object.hasOwn(entry, 'task') ? entry.task : undefined;
if (!task) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/tasks/browser/taskTerminalStatus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export class TaskTerminalStatus extends Disposable {
}

private terminalFromEvent(event: { terminalId: number | undefined }): ITerminalData | undefined {
if (!('terminalId' in event) || !event.terminalId) {
if (!Object.hasOwn(event, 'terminalId') || !event.terminalId) {
return undefined;
}
return this.terminalMap.get(event.terminalId);
Expand Down
12 changes: 6 additions & 6 deletions src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
getTerminalsForTasks(tasks: Types.SingleOrMany<Task>): URI[] | undefined {
const results: URI[] = [];
for (const t of asArray(tasks)) {
for (const key in this._terminals) {
for (const key of Object.keys(this._terminals)) {
const value = this._terminals[key];
if (value.lastTask === t.getMapKey()) {
results.push(value.terminal.resource);
Expand Down Expand Up @@ -850,7 +850,7 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
// Check that the task hasn't changed to include new variables
let hasAllVariables = true;
variables.forEach(value => {
if (value.substring(2, value.length - 1) in lastTask.getVerifiedTask().resolvedVariables) {
if (Object.hasOwn(lastTask.getVerifiedTask().resolvedVariables, value.substring(2, value.length - 1))) {
hasAllVariables = false;
}
});
Expand Down Expand Up @@ -1305,7 +1305,7 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
shellLaunchConfig.args = windowsShellArgs ? combinedShellArgs.join(' ') : combinedShellArgs;
if (task.command.presentation && task.command.presentation.echo) {
if (needsFolderQualification && workspaceFolder) {
const folder = cwd && typeof cwd === 'object' && 'path' in cwd ? path.basename(cwd.path) : workspaceFolder.name;
const folder = cwd && typeof cwd === 'object' && Object.hasOwn(cwd, 'path') ? path.basename(cwd.path) : workspaceFolder.name;
shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(nls.localize({
key: 'task.executingInFolder',
comment: ['The workspace folder the task is running in', 'The task command line or label']
Expand Down Expand Up @@ -1411,7 +1411,7 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
const reconnectedTerminal = await this._reconnectToTerminal(task);
const onDisposed = (terminal: ITerminalInstance) => this._fireTaskEvent(TaskEvent.terminated(task, terminal.instanceId, terminal.exitReason));
if (reconnectedTerminal) {
if ('command' in task && task.command.presentation) {
if ((CustomTask.is(task) || ContributedTask.is(task)) && task.command.presentation) {
reconnectedTerminal.waitOnExit = getWaitOnExitValue(task.command.presentation, task.configurationProperties);
}
this._register(reconnectedTerminal.onDisposed(onDisposed));
Expand Down Expand Up @@ -1717,7 +1717,7 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
} else if (Array.isArray(definition)) {
definition.forEach((element: any) => this._collectDefinitionVariables(variables, element));
} else if (Types.isObject(definition)) {
for (const key in definition) {
for (const key of Object.keys(definition)) {
this._collectDefinitionVariables(variables, definition[key]);
}
}
Expand Down Expand Up @@ -1947,7 +1947,7 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {

public async getTaskForTerminal(instanceId: number): Promise<Task | undefined> {
// First check if there's an active task for this terminal
for (const key in this._activeTasks) {
for (const key of Object.keys(this._activeTasks)) {
const activeTask = this._activeTasks[key];
if (activeTask.terminal?.instanceId === instanceId) {
return activeTask.task;
Expand Down
26 changes: 14 additions & 12 deletions src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,13 @@ export function getTaskDefinition(id: string) {
}

export function getTaskRepresentation(task: IConfiguredTask | Task): string {
if ('label' in task && task.label) {
return task.label;
} else if ('script' in task && task.script) {
return task.script;
} else if ('command' in task && task.command) {
return isString(task.command) ? task.command : task.command.name?.toString() || '';
if (Object.hasOwn(task, 'label') && (task as IConfiguredTask).label) {
return (task as IConfiguredTask).label!;
} else if (Object.hasOwn(task, 'script') && (task as IConfiguredTask).script) {
return (task as IConfiguredTask).script!;
} else if (Object.hasOwn(task, 'command') && (task as IConfiguredTask).command) {
const command = (task as IConfiguredTask).command;
return isString(command) ? command : command!.name?.toString() || '';
}
return '';
}
Expand Down Expand Up @@ -81,7 +82,7 @@ export async function getTaskForTool(id: string | undefined, taskDefinition: { t
}
}
for (const configTask of configTasks) {
if ((!allowParentTask && !configTask.type) || ('hide' in configTask && configTask.hide)) {
if ((!allowParentTask && !configTask.type) || (Object.hasOwn(configTask, 'hide') && configTask.hide)) {
// Skip these as they are not included in the agent prompt and we need to align with
// the indices used there.
continue;
Expand Down Expand Up @@ -144,11 +145,12 @@ export interface IConfiguredTask {
label?: string;
type?: string;
script?: string;
command?: string;
command?: string | { name?: string };
args?: string[];
isBackground?: boolean;
problemMatcher?: string[];
group?: string;
hide?: boolean;
}

export async function resolveDependencyTasks(parentTask: Task, workspaceFolder: string, configurationService: IConfigurationService, taskService: ITaskService): Promise<Task[] | undefined> {
Expand Down Expand Up @@ -219,16 +221,16 @@ export async function collectTerminalResults(
// Use reconnection data if possible to match, since the properties here are unique
const reconnectionData = instance.reconnectionProperties?.data as IReconnectionTaskData | undefined;
if (reconnectionData) {
if (reconnectionData.lastTask in commonTaskIdToTaskMap) {
if (Object.hasOwn(commonTaskIdToTaskMap, reconnectionData.lastTask)) {
terminalTask = commonTaskIdToTaskMap[reconnectionData.lastTask];
} else if (reconnectionData.id in taskIdToTaskMap) {
} else if (Object.hasOwn(taskIdToTaskMap, reconnectionData.id)) {
terminalTask = taskIdToTaskMap[reconnectionData.id];
}
} else {
// Otherwise, fallback to label matching
if (instance.shellLaunchConfig.name && instance.shellLaunchConfig.name in taskLabelToTaskMap) {
if (instance.shellLaunchConfig.name && Object.hasOwn(taskLabelToTaskMap, instance.shellLaunchConfig.name)) {
terminalTask = taskLabelToTaskMap[instance.shellLaunchConfig.name];
} else if (instance.title in taskLabelToTaskMap) {
} else if (Object.hasOwn(taskLabelToTaskMap, instance.title)) {
terminalTask = taskLabelToTaskMap[instance.title];
}
}
Expand Down
14 changes: 7 additions & 7 deletions ...orkbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,14 +478,14 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
try {
const match = responseText.match(/\{[\s\S]*\}/);
if (match) {
const obj = JSON.parse(match[0]) as unknown;
const parsed = JSON.parse(match[0]) as unknown;
if (
isObject(obj) &&
'prompt' in obj && isString(obj.prompt) &&
'options' in obj &&
'options' in obj &&
'freeFormInput' in obj && typeof obj.freeFormInput === 'boolean'
isObject(parsed) &&
Object.hasOwn(parsed, 'prompt') && isString((parsed as Record<string, unknown>).prompt) &&
Object.hasOwn(parsed, 'options') &&
Object.hasOwn(parsed, 'freeFormInput') && typeof (parsed as Record<string, unknown>).freeFormInput === 'boolean'
) {
const obj = parsed as { prompt: string; options: unknown; freeFormInput: boolean };
if (this._lastPrompt === obj.prompt) {
return;
}
Expand Down Expand Up @@ -644,7 +644,7 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
let option: string | undefined = undefined;
if (value === true) {
option = suggestedOptionValue;
} else if (typeof value === 'object' && 'label' in value) {
} else if (typeof value === 'object' && Object.hasOwn(value, 'label')) {
option = value.label.split(' (')[0];
}
this._outputMonitorTelemetryCounters.inputToolManualAcceptCount++;
Expand Down
Loading