Skip to content

Commit f976187

Browse files
committed
Fixes useless spread lint issues
1 parent 00f1a76 commit f976187

File tree

9 files changed

+20
-22
lines changed

9 files changed

+20
-22
lines changed

scripts/prep-release.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ rl.question(`Enter the new version number (format x.x.x, current is ${currentVer
4646
// Add the new version header below the ## [Unreleased] header
4747
data = data.replace('## [Unreleased]', newVersionHeader);
4848

49-
const unreleasedLink = match[0].replace(/\/compare\/v(.+?)\.\.\.HEAD/, `\/compare\/v${version}...HEAD`);
49+
const unreleasedLink = match[0].replace(/\/compare\/v(.+?)\.\.\.HEAD/, `/compare/v${version}...HEAD`);
5050

5151
// Update the [unreleased]: line
5252
data = data.replace(match[0], `${unreleasedLink}\n${newVersionLink}`);

src/commands/quickCommand.steps.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ export async function getWorktrees(
228228
},
229229
): Promise<WorktreeQuickPickItem[]> {
230230
const worktrees = repoOrWorktrees instanceof Repository ? await repoOrWorktrees.getWorktrees() : repoOrWorktrees;
231-
return Promise.all<WorktreeQuickPickItem>([
232-
...worktrees
231+
return Promise.all<WorktreeQuickPickItem>(
232+
worktrees
233233
.filter(w => filter == null || filter(w))
234234
.map(async w => {
235235
let missing = false;
@@ -254,7 +254,7 @@ export async function getWorktrees(
254254
},
255255
);
256256
}),
257-
]);
257+
);
258258
}
259259

260260
export async function getBranchesAndOrTags(

src/commands/quickCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ export function createConfirmStep<T extends QuickPickItem, Context extends { tit
334334
ignoreFocusOut: true,
335335
items: [...confirmations, cancel ?? createDirectiveQuickPickItem(Directive.Cancel)],
336336
selectedItems: [confirmations.find(c => c.picked) ?? confirmations[0]],
337-
...(options ?? {}),
337+
...options,
338338
});
339339
}
340340

src/git/remotes/custom.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export class CustomRemote extends RemoteProvider {
112112
repo: this.path,
113113
repoBase: repoBase,
114114
repoPath: repoPath,
115-
...(additionalContext ?? {}),
115+
...additionalContext,
116116
};
117117

118118
for (const [key, value] of Object.entries(context)) {

src/plus/integrations/providers/github/githubGitProvider.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3071,9 +3071,9 @@ export class GitHubGitProvider implements GitProvider, Disposable {
30713071

30723072
const values = operations.get('commit:');
30733073
if (values != null) {
3074-
const commitsResults = await Promise.allSettled<Promise<GitCommit | undefined>[]>([
3075-
...map(values, v => this.getCommit(repoPath, v.replace(doubleQuoteRegex, ''))),
3076-
]);
3074+
const commitsResults = await Promise.allSettled(
3075+
map(values, v => this.getCommit(repoPath, v.replace(doubleQuoteRegex, ''))),
3076+
);
30773077

30783078
let i = 0;
30793079
for (const commitResult of commitsResults) {

src/quickpicks/repositoryPicker.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ export async function showRepositoryPicker(
8888

8989
let items: RepositoryQuickPickItem[];
9090
if (repositoriesOrOptions == null || Array.isArray(repositoriesOrOptions)) {
91-
items = await Promise.all<Promise<RepositoryQuickPickItem>>([
92-
...map(repositoriesOrOptions ?? Container.instance.git.openRepositories, r =>
91+
items = await Promise.all<Promise<RepositoryQuickPickItem>>(
92+
map(repositoriesOrOptions ?? Container.instance.git.openRepositories, r =>
9393
createRepositoryQuickPickItem(r, undefined, { branch: true, status: true }),
9494
),
95-
]);
95+
);
9696
} else {
9797
const { filter } = repositoriesOrOptions;
9898
items = await filterMapAsync(Container.instance.git.openRepositories, async r =>
@@ -162,11 +162,11 @@ export async function showRepositoriesPicker(
162162

163163
let items: RepositoryQuickPickItem[];
164164
if (repositoriesOrOptions == null || Array.isArray(repositoriesOrOptions)) {
165-
items = await Promise.all<Promise<RepositoryQuickPickItem>>([
166-
...map(repositoriesOrOptions ?? Container.instance.git.openRepositories, r =>
165+
items = await Promise.all<Promise<RepositoryQuickPickItem>>(
166+
map(repositoriesOrOptions ?? Container.instance.git.openRepositories, r =>
167167
createRepositoryQuickPickItem(r, undefined, { branch: true, status: true }),
168168
),
169-
]);
169+
);
170170
} else {
171171
const { filter } = repositoriesOrOptions;
172172
items = await filterMapAsync(Container.instance.git.openRepositories, async r =>

src/telemetry/telemetry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export class TelemetryService implements Disposable {
142142
type: 'sendEvent',
143143
name: name,
144144
data: data,
145-
global: new Map([...this.globalAttributes]),
145+
global: new Map(this.globalAttributes),
146146
startTime: startTime ?? Date.now(),
147147
endTime: endTime ?? Date.now(),
148148
});

src/webviews/webviewsController.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -298,11 +298,9 @@ export class WebviewsController implements Disposable {
298298
descriptor.title,
299299
{ viewColumn: column, preserveFocus: options?.preserveFocus ?? false },
300300
{
301-
...{
302-
enableCommandUris: true,
303-
enableScripts: true,
304-
localResourceRoots: [Uri.file(container.context.extensionPath)],
305-
},
301+
enableCommandUris: true,
302+
enableScripts: true,
303+
localResourceRoots: [Uri.file(container.context.extensionPath)],
306304
...descriptor.webviewOptions,
307305
...descriptor.webviewHostOptions,
308306
},

webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ class FantasticonPlugin {
756756
return;
757757
}
758758

759-
const fontConfig = { ...(loadedConfig ?? {}), ...(config ?? {}) };
759+
const fontConfig = { ...loadedConfig, ...config };
760760

761761
// TODO@eamodio: Figure out how to add watching for the fontConfig.inputDir
762762
// Maybe something like: https://github.com/Fridus/webpack-watch-files-plugin

0 commit comments

Comments
 (0)