Skip to content

Commit a6fbee6

Browse files
alan-agius4mgechev
authored andcommitted
style: add no-invalid-await and prefer-promise-shorthand lint rules (angular#15450)
Add these two lint rules for a better code quality and readability
1 parent 5606a4c commit a6fbee6

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

packages/angular_devkit/architect/src/index_spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ describe('architect', () => {
177177

178178
it('reports errors in the builder (async)', async () => {
179179
testArchitectHost.addBuilder('package:error', createBuilder(() => {
180-
return new Promise((_, reject) => reject(new Error('Error async')));
180+
return Promise.reject(new Error('Error async'));
181181
}));
182182

183183
let run: BuilderRun | undefined = undefined;

packages/angular_devkit/core/src/experimental/jobs/strategy_spec.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ describe('strategy.serialize()', () => {
3939
name: 'add',
4040
});
4141

42-
const job1 = await scheduler.schedule('add', [1, 2, 3, 4]);
43-
const job2 = await scheduler.schedule('add', [1, 2, 3, 4, 5]);
42+
const job1 = scheduler.schedule('add', [1, 2, 3, 4]);
43+
const job2 = scheduler.schedule('add', [1, 2, 3, 4, 5]);
4444
expect(started).toBe(0);
4545
expect(finished).toBe(0);
4646

@@ -102,8 +102,8 @@ describe('strategy.serialize()', () => {
102102
name: 'add100',
103103
});
104104

105-
const job1 = await scheduler.schedule('add', [1, 2, 3, 4]);
106-
const job2 = await scheduler.schedule('add100', [1, 2, 3, 4, 5]);
105+
const job1 = scheduler.schedule('add', [1, 2, 3, 4]);
106+
const job2 = scheduler.schedule('add100', [1, 2, 3, 4, 5]);
107107
expect(started).toBe(0);
108108
expect(finished).toBe(0);
109109

@@ -159,8 +159,8 @@ describe('strategy.reuse()', () => {
159159
name: 'add',
160160
});
161161

162-
const job1 = await scheduler.schedule('add', [1, 2, 3, 4]);
163-
const job2 = await scheduler.schedule('add', []);
162+
const job1 = scheduler.schedule('add', [1, 2, 3, 4]);
163+
const job2 = scheduler.schedule('add', []);
164164
expect(started).toBe(0);
165165
expect(finished).toBe(0);
166166

@@ -179,8 +179,8 @@ describe('strategy.reuse()', () => {
179179
expect(job1.state).toBe(JobState.Ended);
180180
expect(job2.state).toBe(JobState.Ended);
181181

182-
const job3 = await scheduler.schedule('add', [1, 2, 3, 4, 5]);
183-
const job4 = await scheduler.schedule('add', []);
182+
const job3 = scheduler.schedule('add', [1, 2, 3, 4, 5]);
183+
const job4 = scheduler.schedule('add', []);
184184
job3.output.subscribe();
185185
expect(started).toBe(2);
186186
expect(finished).toBe(1);
@@ -226,10 +226,10 @@ describe('strategy.memoize()', () => {
226226
name: 'add',
227227
});
228228

229-
const job1 = await scheduler.schedule('add', [1, 2, 3, 4]);
230-
const job2 = await scheduler.schedule('add', [1, 2, 3, 4]);
231-
const job3 = await scheduler.schedule('add', [1, 2, 3, 4, 5]);
232-
const job4 = await scheduler.schedule('add', [1, 2, 3, 4, 5]);
229+
const job1 = scheduler.schedule('add', [1, 2, 3, 4]);
230+
const job2 = scheduler.schedule('add', [1, 2, 3, 4]);
231+
const job3 = scheduler.schedule('add', [1, 2, 3, 4, 5]);
232+
const job4 = scheduler.schedule('add', [1, 2, 3, 4, 5]);
233233
expect(started).toBe(0);
234234
expect(finished).toBe(0);
235235

scripts/validate.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export default async function (options: { verbose: boolean }, logger: logging.Lo
4242

4343
logger.info('');
4444
logger.info('Running commit validation...');
45-
error = await validateCommits({}, logger.createChild('validate-commits')) != 0
45+
error = validateCommits({}, logger.createChild('validate-commits')) != 0
4646
|| error;
4747

4848
logger.info('');

tslint.json

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
"no-unthrown-error": true,
3636
"no-use-of-empty-return-value": true,
3737
"no-useless-increment": true,
38+
"no-invalid-await": true,
39+
"prefer-promise-shorthand": true,
3840

3941
//These rules are part of the code smell detection section of tslint-sonarts
4042
"no-dead-store": true,

0 commit comments

Comments
 (0)