Skip to content

Commit 50f5c07

Browse files
authored
Improved prettier
1 parent b48c19d commit 50f5c07

File tree

7 files changed

+70
-64
lines changed

7 files changed

+70
-64
lines changed

.prettierrc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
printWidth: 120,
3-
tabWidth: 2,
4-
semi: true,
3+
tabWidth: 4,
4+
semi: false,
55
singleQuote: true,
66
trailingComma: 'all',
77
arrowParens: 'always',

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"scripts": {
77
"lint:ts": "tslint -c tslint.json 'src/**/*.ts'",
88
"lint:fixts": "tslint -c tslint.json 'src/**/*.ts' --fix",
9-
"prettier": "prettier -c --write ./src",
9+
"prettier": "prettier -c --write ./src/**/*.ts",
1010
"build": "rm -rf ./dist && tsc",
1111
"precommit": "lint-staged",
1212
"prepare": "husky install",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
class ListNode {
2+
public val: number | null
3+
public next: ListNode | null
4+
5+
constructor(val?: number | null, next?: ListNode | null) {
6+
this.val = val === undefined ? 0 : val
7+
this.next = next === undefined ? null : next
8+
}
9+
}
10+
11+
export { ListNode }

src/main/ts/g0001_0100/s0001_two_sum/solution.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
// #2023_03_10_Time_66_ms_(93.20%)_Space_45.6_MB_(23.43%)
44

55
interface ITemp {
6-
[key: number]: number;
6+
[key: number]: number
77
}
88

99
function twoSum(nums: number[], target: number): number[] {
10-
const temp: ITemp = {};
11-
for (let i = 0; i < nums.length; i++) {
12-
const tag = target - nums[i];
13-
if (temp[tag] >= 0) {
14-
return [temp[tag], i];
10+
const temp: ITemp = {}
11+
for (let i = 0; i < nums.length; i++) {
12+
const tag = target - nums[i]
13+
if (temp[tag] >= 0) {
14+
return [temp[tag], i]
15+
}
16+
temp[nums[i]] = i
1517
}
16-
temp[nums[i]] = i;
17-
}
1818
}
1919

20-
export { twoSum };
20+
export { twoSum }

src/main/ts/g0001_0100/s0002_add_two_numbers/solution.ts

+24-32
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@
22
// #Data_Structure_II_Day_10_Linked_List #Programming_Skills_II_Day_15
33
// #2023_03_10_Time_106_ms_(79.11%)_Space_48.6_MB_(31.94%)
44

5-
class ListNode {
6-
public val: number | null;
7-
public next: ListNode | null;
8-
9-
constructor(val?: number | null, next?: ListNode | null) {
10-
this.val = val === undefined ? 0 : val;
11-
this.next = next === undefined ? null : next;
12-
}
13-
}
5+
import { ListNode } from '../../com_github_leetcode/listnode'
146

157
/*
168
* Definition for singly-linked list.
@@ -24,29 +16,29 @@ class ListNode {
2416
* }
2517
*/
2618
function addTwoNumbers(l1: ListNode | null, l2: ListNode | null): ListNode | null {
27-
const result = new ListNode(null);
28-
let next = result;
29-
let carryNum = 0;
30-
let currSum = 0;
31-
let num1 = 0;
32-
let num2 = 0;
19+
const result = new ListNode(null)
20+
let next = result
21+
let carryNum = 0
22+
let currSum = 0
23+
let num1 = 0
24+
let num2 = 0
3325

34-
while (l1 !== null || l2 !== null) {
35-
// @ts-ignore
36-
num1 = l1 !== null ? l1.val : 0;
37-
// @ts-ignore
38-
num2 = l2 !== null ? l2.val : 0;
39-
currSum = (num1 + num2 + carryNum) % 10;
40-
carryNum = Math.floor((num1 + num2 + carryNum) / 10);
41-
next.next = new ListNode(currSum);
42-
next = next.next;
43-
l1 = l1 !== null ? l1.next : null;
44-
l2 = l2 !== null ? l2.next : null;
45-
}
46-
if (carryNum) {
47-
next.next = new ListNode(carryNum);
48-
}
49-
return result.next;
26+
while (l1 !== null || l2 !== null) {
27+
// @ts-ignore
28+
num1 = l1 !== null ? l1.val : 0
29+
// @ts-ignore
30+
num2 = l2 !== null ? l2.val : 0
31+
currSum = (num1 + num2 + carryNum) % 10
32+
carryNum = Math.floor((num1 + num2 + carryNum) / 10)
33+
next.next = new ListNode(currSum)
34+
next = next.next
35+
l1 = l1 !== null ? l1.next : null
36+
l2 = l2 !== null ? l2.next : null
37+
}
38+
if (carryNum) {
39+
next.next = new ListNode(carryNum)
40+
}
41+
return result.next
5042
}
5143

52-
export { ListNode, addTwoNumbers };
44+
export { ListNode, addTwoNumbers }
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
// tslint:disable:no-magic-numbers
2-
import { twoSum } from 'src/main/ts/g0001_0100/s0001_two_sum/solution';
3-
import { expect, test } from 'vitest';
2+
import { twoSum } from 'src/main/ts/g0001_0100/s0001_two_sum/solution'
3+
import { expect, test } from 'vitest'
44

55
test('twoSum', () => {
6-
expect(twoSum([2, 7, 11, 15], 9)).toEqual([0, 1]);
7-
});
6+
expect(twoSum([2, 7, 11, 15], 9)).toEqual([0, 1])
7+
})
88

99
test('twoSum2', () => {
10-
expect(twoSum([3, 2, 4], 6)).toEqual([1, 2]);
11-
});
10+
expect(twoSum([3, 2, 4], 6)).toEqual([1, 2])
11+
})
1212

1313
test('twoSum3', () => {
14-
expect(twoSum([3, 3], 6)).toEqual([0, 1]);
15-
});
14+
expect(twoSum([3, 3], 6)).toEqual([0, 1])
15+
})
1616

1717
test('twoSum4', () => {
18-
expect(twoSum([3, 3], 7)).toEqual(undefined);
19-
});
18+
expect(twoSum([3, 3], 7)).toEqual(undefined)
19+
})
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
// tslint:disable:no-magic-numbers
2-
import { addTwoNumbers, ListNode } from 'src/main/ts/g0001_0100/s0002_add_two_numbers/solution';
3-
import { expect, test } from 'vitest';
2+
import { addTwoNumbers, ListNode } from 'src/main/ts/g0001_0100/s0002_add_two_numbers/solution'
3+
import { expect, test } from 'vitest'
44

55
test('addTwoNumbers', () => {
6-
expect(
7-
addTwoNumbers(new ListNode(2, new ListNode(4, new ListNode(3))), new ListNode(5, new ListNode(6, new ListNode(4)))),
8-
).toEqual(new ListNode(7, new ListNode(0, new ListNode(8))));
9-
});
6+
expect(
7+
addTwoNumbers(
8+
new ListNode(2, new ListNode(4, new ListNode(3))),
9+
new ListNode(5, new ListNode(6, new ListNode(4))),
10+
),
11+
).toEqual(new ListNode(7, new ListNode(0, new ListNode(8))))
12+
})
1013

1114
test('addTwoNumbers2', () => {
12-
expect(new ListNode(7).val).toEqual(7);
13-
});
15+
expect(new ListNode(7).val).toEqual(7)
16+
})
1417

1518
test('addTwoNumbers3', () => {
16-
expect(addTwoNumbers(new ListNode(5), new ListNode(5))).toEqual(new ListNode(0, new ListNode(1)));
17-
});
19+
expect(addTwoNumbers(new ListNode(5), new ListNode(5))).toEqual(new ListNode(0, new ListNode(1)))
20+
})

0 commit comments

Comments
 (0)