Skip to content

Commit 551d88c

Browse files
michelcaradecmichelcaradec
committed
Update to TypeScript 3.7
1 parent 1d62c3c commit 551d88c

File tree

9 files changed

+39
-33
lines changed

9 files changed

+39
-33
lines changed

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
"markdown",
1616
"latex",
1717
"plaintext"
18-
]
18+
],
19+
"typescript.tsdk": "node_modules/typescript/lib"
1920
}

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ Here are a few common issues.
1515

1616
- Keywords in package.json to improve extension search in market place.
1717

18+
### Changed
19+
20+
- Update to [TypeScript 3.7](https://devblogs.microsoft.com/typescript/announcing-typescript-3-7/).
21+
1822
## [0.1.0] - 2019-11-05
1923

2024
### Added

‎package-lock.json‎

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,11 +308,11 @@
308308
"glob": "^7.1.4",
309309
"mocha": "^6.1.4",
310310
"tslint": "^5.12.1",
311-
"typescript": "^3.6.4"
311+
"typescript": "^3.7.2"
312312
},
313313
"dependencies": {
314314
"escape-string-regexp": "^2.0.0",
315-
"franc": "^4.1.0",
316-
"typescript": "^3.6.4"
315+
"typescript": "^3.7.2",
316+
"franc": "^4.1.0"
317317
}
318318
}

‎src/checker/providers/keywordsDetect.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ export class KeywordsDetect implements IDetectProvider {
99
private _messageList: UserDictionary;
1010

1111
constructor() {
12-
this._technicalList = UserDictionaryFactory.createInstance(DictionaryType.ExcludeToken) || new UserDictionary();
13-
this._messageList = UserDictionaryFactory.createInstance(DictionaryType.IncludeToken) || new UserDictionary();
12+
this._technicalList = UserDictionaryFactory.createInstance(DictionaryType.ExcludeToken) ?? new UserDictionary();
13+
this._messageList = UserDictionaryFactory.createInstance(DictionaryType.IncludeToken) ?? new UserDictionary();
1414
}
1515

1616
//#region IDetectProvider

‎src/helpers/converters.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ const _mapEventTypeToString
4343
[StatsEventType.DetectedAsMessageByString, StatsEventTypeStr.DetectedAsMessageByString]]);
4444

4545
export function statsEventTypeToString(event: StatsEventType): string {
46-
return _mapEventTypeToString.get(event) || '';
46+
return _mapEventTypeToString.get(event) ?? '';
4747
}

‎src/helpers/files.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ export class Files {
1818
DictionaryType.ExcludeFile,
1919
UserDictionaryFactory.createInstance(DictionaryType.ExcludeFile, false)!);
2020
private _extensionsInclude: string[]
21-
= vscode.workspace.getConfiguration(Constants.ExtensionID).get<string[]>('file-extension') || [];
21+
= vscode.workspace.getConfiguration(Constants.ExtensionID).get<string[]>('file-extension') ?? [];
2222
private _extensionsExclude: string[]
23-
= vscode.workspace.getConfiguration(Constants.ExtensionID).get<string[]>('file-extension-exclude') || [];
23+
= vscode.workspace.getConfiguration(Constants.ExtensionID).get<string[]>('file-extension-exclude') ?? [];
2424
private _maxFiles: number
2525
= vscode.workspace.getConfiguration(Constants.ExtensionID).get<number>('workspace.file-max')!;
2626

‎src/helpers/utils.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ export function distinct<T>(array: Array<T>, compareFn?: (a: T, b: T) => number)
1515
}
1616

1717
export function removeSentenceQuotes(text: string | undefined): string | undefined {
18-
if (!text || text.length < 2) {
18+
if ((text?.length ?? 0) < 2) {
1919
return text;
2020
}
2121

22-
text = text.trim();
22+
text = text!.trim();
2323

2424
const first = text.charAt(0);
2525
const last = text.charAt(text.length - 1);
@@ -41,23 +41,23 @@ export function isPascalCase(text: string): boolean {
4141
}
4242

4343
export function getNonAlphaRatio(text: string | undefined): number {
44-
if (!text || text.length <= 0) {
44+
if ((text?.length ?? 0) <= 0) {
4545
return 0;
4646
}
4747

48-
return 1 - stripNonAlphaCharacters(normalizeString(text))!.length / text.length;
48+
return 1 - stripNonAlphaCharacters(normalizeString(text))!.length / text!.length;
4949
}
5050

5151
export function normalizeString(text: string | undefined): string | undefined {
52-
if (!text || text.length <= 0) {
52+
if ((text?.length ?? 0) <= 0) {
5353
return text;
5454
}
5555

56-
return text.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
56+
return text!.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
5757
}
5858

5959
export function stripNonAlphaCharacters(text: string | undefined): string | undefined {
60-
if (!text || text.length <= 0) {
60+
if ((text?.length ?? 0) <= 0) {
6161
return text;
6262
}
6363

‎src/stats/statsProvider.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ export class StatsProvider implements IStatsEmiter {
2323
//#region File System
2424

2525
this._channel.appendLine(Stats.FileSystem_Title);
26-
this._channel.appendLine(`${Stats.FileSystem_FoldersPicked}: ${(this._events.get(StatsEventType.FolderScanned) || 0) - (this._events.get(StatsEventType.FolderExcluded) || 0)} / ${this._events.get(StatsEventType.FolderScanned) || 0}.`);
27-
this._channel.appendLine(`${Stats.FileSystem_FilesPicked}: ${this._events.get(StatsEventType.FileSelected) || 0} / ${this._events.get(StatsEventType.FileScanned) || 0}.`);
26+
this._channel.appendLine(`${Stats.FileSystem_FoldersPicked}: ${(this._events.get(StatsEventType.FolderScanned) ?? 0) - (this._events.get(StatsEventType.FolderExcluded) ?? 0)} / ${this._events.get(StatsEventType.FolderScanned) ?? 0}.`);
27+
this._channel.appendLine(`${Stats.FileSystem_FilesPicked}: ${this._events.get(StatsEventType.FileSelected) ?? 0} / ${this._events.get(StatsEventType.FileScanned) ?? 0}.`);
2828
this._channel.appendLine('');
2929

3030
//#endregion
3131
//#region Parser
3232

3333
this._channel.appendLine(Stats.Parser_Title);
3434
for (const event of [StatsEventType.ParserStatementThrowIgnored, StatsEventType.ParserStatementJQueryIgnored, StatsEventType.ParserStatementConsoleIgnored]) {
35-
this._channel.appendLine(`${statsEventTypeToString(event)}: ${this._events.get(event) || 0}`);
35+
this._channel.appendLine(`${statsEventTypeToString(event)}: ${this._events.get(event) ?? 0}`);
3636
}
3737
this._channel.appendLine('');
3838

@@ -55,22 +55,22 @@ export class StatsProvider implements IStatsEmiter {
5555
[ProviderName.Keywords, StatsEventType.DetectedAsTechnicalByKeyword, StatsEventType.DetectedAsMessageByKeyword],
5656
[ProviderName.Language, StatsEventType.DetectedAsTechnicalByLanguage, StatsEventType.DetectedAsMessageByLanguage],
5757
[ProviderName.String, StatsEventType.DetectedAsTechnicalByString, StatsEventType.DetectedAsMessageByString]]) {
58-
const countTechnical = (this._events.get(<StatsEventType>eventTechnical) || 0).toString().padStart(1 + padTechnical);
59-
const countMessage = (this._events.get(<StatsEventType>eventMessage) || 0).toString().padStart(1 + padMessage);
58+
const countTechnical = (this._events.get(<StatsEventType>eventTechnical) ?? 0).toString().padStart(1 + padTechnical);
59+
const countMessage = (this._events.get(<StatsEventType>eventMessage) ?? 0).toString().padStart(1 + padMessage);
6060
this._channel.appendLine(`${(<string>name).padEnd(padProvider)}|${countTechnical}|${countMessage}`);
6161
}
6262

6363
//#region Message strings ratio
6464

65-
const totalTokens = this._events.get(StatsEventType.ParserToken) || 0;
65+
const totalTokens = this._events.get(StatsEventType.ParserToken) ?? 0;
6666
if (totalTokens > 0) {
6767
const totalMessages
68-
= (this._events.get(StatsEventType.DetectedAsMessageByClassName) || 0)
69-
+ (this._events.get(StatsEventType.DetectedAsMessageByCode) || 0)
70-
+ (this._events.get(StatsEventType.DetectedAsMessageByEntropy) || 0)
71-
+ (this._events.get(StatsEventType.DetectedAsMessageByKeyword) || 0)
72-
+ (this._events.get(StatsEventType.DetectedAsMessageByLanguage) || 0)
73-
+ (this._events.get(StatsEventType.DetectedAsMessageByString) || 0);
68+
= (this._events.get(StatsEventType.DetectedAsMessageByClassName) ?? 0)
69+
+ (this._events.get(StatsEventType.DetectedAsMessageByCode) ?? 0)
70+
+ (this._events.get(StatsEventType.DetectedAsMessageByEntropy) ?? 0)
71+
+ (this._events.get(StatsEventType.DetectedAsMessageByKeyword) ?? 0)
72+
+ (this._events.get(StatsEventType.DetectedAsMessageByLanguage) ?? 0)
73+
+ (this._events.get(StatsEventType.DetectedAsMessageByString) ?? 0);
7474
this._channel.appendLine(line);
7575
this._channel.appendLine(`${''.padEnd(padProvider)}|${''.padEnd(1 + padTechnical)}|${(totalMessages / totalTokens * 100).toFixed(2).padStart(padMessage)}%`);
7676
}
@@ -107,7 +107,7 @@ export class StatsProvider implements IStatsEmiter {
107107
return;
108108
}
109109

110-
this._events.set(event, (this._events.get(event) || 0) + value!);
110+
this._events.set(event, (this._events.get(event) ?? 0) + value!);
111111
}
112112

113113
//#endregion

0 commit comments

Comments
 (0)