fix lint

nonoroazoro · nonoroazoro · commit 02d90c2e73c2 · 2019-06-25T14:21:08.000+08:00
diff --git a/src/core/AutoSyncService.ts b/src/core/AutoSyncService.ts
@@ -77,7 +77,7 @@ export class AutoSyncService
         {
             const { token, id, http_proxy } = syncingSettings;
             const localSettings = await this._vscodeSetting.getSettings(true);
-            const localLastModified = await this._vscodeSetting.getLastModified(localSettings);
+            const localLastModified = this._vscodeSetting.getLastModified(localSettings);
 
             const api = Gist.create(token, http_proxy);
             const remoteSettings = await api.get(id);
diff --git a/src/core/Gist.ts b/src/core/Gist.ts
@@ -23,7 +23,7 @@ export class Gist
     /**
      * The description of Syncing's gists.
      */
-    private static readonly GIST_DESCRIPTION: string = "VSCode's Settings - Syncing";
+    private static readonly _GIST_DESCRIPTION: string = "VSCode's Settings - Syncing";
 
     private _api: Github;
     private _proxy?: string;
@@ -150,7 +150,7 @@ export class Gist
             const gists: GitHubTypes.IGist[] = res.data as any;
             const extensionsRemoteFilename = `${SettingType.Extensions}.json`;
             return gists
-                .filter((gist) => (gist.description === Gist.GIST_DESCRIPTION || gist.files[extensionsRemoteFilename]))
+                .filter((gist) => (gist.description === Gist._GIST_DESCRIPTION || gist.files[extensionsRemoteFilename]))
                 .sort((a, b) => new Date(a.updated_at).getTime() - new Date(b.updated_at).getTime());
         }
         catch (err)
@@ -241,7 +241,7 @@ export class Gist
     public createSettings(files = {}, isPublic = false): Promise<GitHubTypes.IGist>
     {
         return this.create({
-            description: Gist.GIST_DESCRIPTION,
+            description: Gist._GIST_DESCRIPTION,
             files,
             public: isPublic
         });
@@ -397,7 +397,7 @@ export class Gist
         // Add the rest local files.
         for (const key of Object.keys(localFiles))
         {
-            if (recordedKeys.indexOf(key) === -1)
+            if (!recordedKeys.includes(key))
             {
                 // Ignore null local file.
                 localFile = localFiles[key];
diff --git a/src/core/Syncing.ts b/src/core/Syncing.ts
@@ -18,7 +18,7 @@ export class Syncing
     /**
      * The default settings of `Syncing`.
      */
-    private static readonly DEFAULT_SETTINGS: ISyncingSettings = {
+    private static readonly _DEFAULT_SETTINGS: ISyncingSettings = {
         id: "",
         token: "",
         http_proxy: "",
@@ -79,7 +79,7 @@ export class Syncing
      */
     public initSettings(): Promise<void>
     {
-        return this.saveSettings(Syncing.DEFAULT_SETTINGS);
+        return this.saveSettings(Syncing._DEFAULT_SETTINGS);
     }
 
     /**
@@ -181,7 +181,7 @@ export class Syncing
      */
     public loadSettings(): ISyncingSettings
     {
-        let settings: ISyncingSettings = { ...Syncing.DEFAULT_SETTINGS };
+        let settings: ISyncingSettings = { ...Syncing._DEFAULT_SETTINGS };
         try
         {
             settings = {
diff --git a/src/core/VSCodeSetting.ts b/src/core/VSCodeSetting.ts
@@ -35,12 +35,12 @@ export class VSCodeSetting
     /**
      * Suffix of remote mac files.
      */
-    private static readonly MAC_SUFFIX: string = "-mac";
+    private static readonly _MAC_SUFFIX: string = "-mac";
 
     /**
      * Prefix of remote snippet files.
      */
-    private static readonly SNIPPET_PREFIX: string = "snippet-";
+    private static readonly _SNIPPET_PREFIX: string = "snippet-";
 
     private _env: Environment;
     private _ext: Extension;
@@ -120,7 +120,7 @@ export class VSCodeSetting
                     );
                     if (separateKeybindings && this._env.isMac)
                     {
-                        remoteFilename = `${settingType}${VSCodeSetting.MAC_SUFFIX}.json`;
+                        remoteFilename = `${settingType}${VSCodeSetting._MAC_SUFFIX}.json`;
                     }
                 }
 
@@ -248,13 +248,13 @@ export class VSCodeSetting
                 let filename: string;
                 for (const key of Object.keys(files))
                 {
-                    if (existsFileKeys.indexOf(key) === -1)
+                    if (!existsFileKeys.includes(key))
                     {
                         gistFile = files[key];
-                        if (gistFile.filename.startsWith(VSCodeSetting.SNIPPET_PREFIX))
+                        if (gistFile.filename.startsWith(VSCodeSetting._SNIPPET_PREFIX))
                         {
                             // Snippets.
-                            filename = gistFile.filename.slice(VSCodeSetting.SNIPPET_PREFIX.length);
+                            filename = gistFile.filename.slice(VSCodeSetting._SNIPPET_PREFIX.length);
                             if (filename)
                             {
                                 settingsToSave.push({
@@ -370,7 +370,7 @@ export class VSCodeSetting
                 // Add prefix to all snippets.
                 results.push({
                     localFilePath: path.join(snippetsDir, filename),
-                    remoteFilename: `${VSCodeSetting.SNIPPET_PREFIX}${filename}`,
+                    remoteFilename: `${VSCodeSetting._SNIPPET_PREFIX}${filename}`,
                     type: SettingType.Snippets
                 });
             });
diff --git a/src/extension.ts b/src/extension.ts
@@ -66,7 +66,7 @@ function _initAutoSync()
     {
         setTimeout(async () =>
         {
-            const syncingSettings = await _syncing.loadSettings();
+            const syncingSettings = _syncing.loadSettings();
             if (syncingSettings.auto_sync && syncingSettings.token != null && syncingSettings.id != null)
             {
                 _autoSyncService = AutoSyncService.create();
diff --git a/src/i18n/index.ts b/src/i18n/index.ts
@@ -10,7 +10,7 @@ let instance: I18n;
 class I18n
 {
     private static _instance: I18n;
-    private static DEFAULT_LOCALE_FILENAME: string = "package.nls.json";
+    private static _DEFAULT_LOCALE_FILENAME: string = "package.nls.json";
 
     private _bundle: Record<string, string>;
     private _extensionPath: string;
@@ -63,7 +63,7 @@ class I18n
     private _prepare()
     {
         const filename = (this.locale === NormalizedLocale.EN_US)
-            ? I18n.DEFAULT_LOCALE_FILENAME
+            ? I18n._DEFAULT_LOCALE_FILENAME
             : `package.nls.${this.locale}.json`;
         try
         {
@@ -75,7 +75,7 @@ class I18n
         catch (err)
         {
             this._bundle = readJsonSync(
-                path.resolve(this._extensionPath, I18n.DEFAULT_LOCALE_FILENAME),
+                path.resolve(this._extensionPath, I18n._DEFAULT_LOCALE_FILENAME),
                 { encoding: "utf8" }
             );
         }
diff --git a/src/utils/jsonc.ts b/src/utils/jsonc.ts
@@ -75,7 +75,7 @@ export function mergeSettings(sSettingsJSONString: string, dSettingsJSONString:
         const sPatterns = sSettingsJSON[SETTING_EXCLUDED_SETTINGS] || [];
         const sExcludedKeys = getExcludedKeys(sSettingsJSON, sPatterns);
         const dExcludedKeys = getExcludedKeys(dSettingsJSON, sPatterns);
-        const excludedKeys = Array.from<string>(new Set([...sExcludedKeys, ...dExcludedKeys])).sort();
+        const excludedKeys = Array.from<string>(new Set([...sExcludedKeys, ...dExcludedKeys])).sort((a, b) => a.localeCompare(b));
 
         // Replace the source properties with the corresponding destination properties values.
         let dValue: any;
@@ -125,7 +125,7 @@ export function getExcludedKeys(settingsJSON: object, patterns: string[]): strin
             excludeKeys.push(key);
         }
     }
-    return excludeKeys.sort();
+    return excludeKeys.sort((a, b) => a.localeCompare(b));
 }
 
 /**
diff --git a/src/watcher/ChokidarFileWatcher.ts b/src/watcher/ChokidarFileWatcher.ts
@@ -16,7 +16,7 @@ export type ChokidarIgnoredFunction = (path: string, stats: Stats) => boolean;
 
 export class ChokidarFileWatcher extends AbstractWatcher
 {
-    private static readonly DEFAULT_OPTIONS = {
+    private static readonly _DEFAULT_OPTIONS = {
         depth: 2,
         interval: 1000, // Increase the intervals when the chokidar fallbacks to polling,
         binaryInterval: 1000,
@@ -33,7 +33,7 @@ export class ChokidarFileWatcher extends AbstractWatcher
     {
         super();
         this._paths = paths;
-        this._options = { ...ChokidarFileWatcher.DEFAULT_OPTIONS, ...options };
+        this._options = { ...ChokidarFileWatcher._DEFAULT_OPTIONS, ...options };
     }
 
     public start()
diff --git a/src/watcher/SettingsWatcherService.ts b/src/watcher/SettingsWatcherService.ts
@@ -31,7 +31,7 @@ export interface SettingsWatcherServiceOptions
 
 export class SettingsWatcherService extends AbstractWatcher<WatcherEvent.ALL>
 {
-    private static readonly DEFAULT_OPTIONS: SettingsWatcherServiceOptions = {
+    private static readonly _DEFAULT_OPTIONS: SettingsWatcherServiceOptions = {
         debounce: true,
         debounceDelay: 8000
     };
@@ -43,7 +43,7 @@ export class SettingsWatcherService extends AbstractWatcher<WatcherEvent.ALL>
     constructor(options?: SettingsWatcherServiceOptions)
     {
         super();
-        this._options = { ...SettingsWatcherService.DEFAULT_OPTIONS, ...options };
+        this._options = { ...SettingsWatcherService._DEFAULT_OPTIONS, ...options };
         if (this._options.debounce)
         {
             this._handleWatcherEvent = debounce(

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ export class AutoSyncService`
`77`	`77`	`{`
`78`	`78`	`const { token, id, http_proxy } = syncingSettings;`
`79`	`79`	`const localSettings = await this._vscodeSetting.getSettings(true);`
`80`		`- const localLastModified = await this._vscodeSetting.getLastModified(localSettings);`
	`80`	`+ const localLastModified = this._vscodeSetting.getLastModified(localSettings);`
`81`	`81`
`82`	`82`	`const api = Gist.create(token, http_proxy);`
`83`	`83`	`const remoteSettings = await api.get(id);`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export class Syncing`
`18`	`18`	`/**`
`19`	`19`	* The default settings of `Syncing`.
`20`	`20`	`*/`
`21`		`- private static readonly DEFAULT_SETTINGS: ISyncingSettings = {`
	`21`	`+ private static readonly _DEFAULT_SETTINGS: ISyncingSettings = {`
`22`	`22`	`id: "",`
`23`	`23`	`token: "",`
`24`	`24`	`http_proxy: "",`
`@@ -79,7 +79,7 @@ export class Syncing`
`79`	`79`	`*/`
`80`	`80`	`public initSettings(): Promise<void>`
`81`	`81`	`{`
`82`		`- return this.saveSettings(Syncing.DEFAULT_SETTINGS);`
	`82`	`+ return this.saveSettings(Syncing._DEFAULT_SETTINGS);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`/**`
`@@ -181,7 +181,7 @@ export class Syncing`
`181`	`181`	`*/`
`182`	`182`	`public loadSettings(): ISyncingSettings`
`183`	`183`	`{`
`184`		`- let settings: ISyncingSettings = { ...Syncing.DEFAULT_SETTINGS };`
	`184`	`+ let settings: ISyncingSettings = { ...Syncing._DEFAULT_SETTINGS };`
`185`	`185`	`try`
`186`	`186`	`{`
`187`	`187`	`settings = {`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ function _initAutoSync()`
`66`	`66`	`{`
`67`	`67`	`setTimeout(async () =>`
`68`	`68`	`{`
`69`		`- const syncingSettings = await _syncing.loadSettings();`
	`69`	`+ const syncingSettings = _syncing.loadSettings();`
`70`	`70`	`if (syncingSettings.auto_sync && syncingSettings.token != null && syncingSettings.id != null)`
`71`	`71`	`{`
`72`	`72`	`_autoSyncService = AutoSyncService.create();`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ let instance: I18n;`
`10`	`10`	`class I18n`
`11`	`11`	`{`
`12`	`12`	`private static _instance: I18n;`
`13`		`- private static DEFAULT_LOCALE_FILENAME: string = "package.nls.json";`
	`13`	`+ private static _DEFAULT_LOCALE_FILENAME: string = "package.nls.json";`
`14`	`14`
`15`	`15`	`private _bundle: Record<string, string>;`
`16`	`16`	`private _extensionPath: string;`
`@@ -63,7 +63,7 @@ class I18n`
`63`	`63`	`private _prepare()`
`64`	`64`	`{`
`65`	`65`	`const filename = (this.locale === NormalizedLocale.EN_US)`
`66`		`- ? I18n.DEFAULT_LOCALE_FILENAME`
	`66`	`+ ? I18n._DEFAULT_LOCALE_FILENAME`
`67`	`67`	: `package.nls.${this.locale}.json`;
`68`	`68`	`try`
`69`	`69`	`{`
`@@ -75,7 +75,7 @@ class I18n`
`75`	`75`	`catch (err)`
`76`	`76`	`{`
`77`	`77`	`this._bundle = readJsonSync(`
`78`		`- path.resolve(this._extensionPath, I18n.DEFAULT_LOCALE_FILENAME),`
	`78`	`+ path.resolve(this._extensionPath, I18n._DEFAULT_LOCALE_FILENAME),`
`79`	`79`	`{ encoding: "utf8" }`
`80`	`80`	`);`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ export function mergeSettings(sSettingsJSONString: string, dSettingsJSONString:`
`75`	`75`	`const sPatterns = sSettingsJSON[SETTING_EXCLUDED_SETTINGS] \|\| [];`
`76`	`76`	`const sExcludedKeys = getExcludedKeys(sSettingsJSON, sPatterns);`
`77`	`77`	`const dExcludedKeys = getExcludedKeys(dSettingsJSON, sPatterns);`
`78`		`- const excludedKeys = Array.from<string>(new Set([...sExcludedKeys, ...dExcludedKeys])).sort();`
	`78`	`+ const excludedKeys = Array.from<string>(new Set([...sExcludedKeys, ...dExcludedKeys])).sort((a, b) => a.localeCompare(b));`
`79`	`79`
`80`	`80`	`// Replace the source properties with the corresponding destination properties values.`
`81`	`81`	`let dValue: any;`
`@@ -125,7 +125,7 @@ export function getExcludedKeys(settingsJSON: object, patterns: string[]): strin`
`125`	`125`	`excludeKeys.push(key);`
`126`	`126`	`}`
`127`	`127`	`}`
`128`		`- return excludeKeys.sort();`
	`128`	`+ return excludeKeys.sort((a, b) => a.localeCompare(b));`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ export type ChokidarIgnoredFunction = (path: string, stats: Stats) => boolean;`
`16`	`16`
`17`	`17`	`export class ChokidarFileWatcher extends AbstractWatcher`
`18`	`18`	`{`
`19`		`- private static readonly DEFAULT_OPTIONS = {`
	`19`	`+ private static readonly _DEFAULT_OPTIONS = {`
`20`	`20`	`depth: 2,`
`21`	`21`	`interval: 1000, // Increase the intervals when the chokidar fallbacks to polling,`
`22`	`22`	`binaryInterval: 1000,`
`@@ -33,7 +33,7 @@ export class ChokidarFileWatcher extends AbstractWatcher`
`33`	`33`	`{`
`34`	`34`	`super();`
`35`	`35`	`this._paths = paths;`
`36`		`- this._options = { ...ChokidarFileWatcher.DEFAULT_OPTIONS, ...options };`
	`36`	`+ this._options = { ...ChokidarFileWatcher._DEFAULT_OPTIONS, ...options };`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public start()`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ export interface SettingsWatcherServiceOptions`
`31`	`31`
`32`	`32`	`export class SettingsWatcherService extends AbstractWatcher<WatcherEvent.ALL>`
`33`	`33`	`{`
`34`		`- private static readonly DEFAULT_OPTIONS: SettingsWatcherServiceOptions = {`
	`34`	`+ private static readonly _DEFAULT_OPTIONS: SettingsWatcherServiceOptions = {`
`35`	`35`	`debounce: true,`
`36`	`36`	`debounceDelay: 8000`
`37`	`37`	`};`
`@@ -43,7 +43,7 @@ export class SettingsWatcherService extends AbstractWatcher<WatcherEvent.ALL>`
`43`	`43`	`constructor(options?: SettingsWatcherServiceOptions)`
`44`	`44`	`{`
`45`	`45`	`super();`
`46`		`- this._options = { ...SettingsWatcherService.DEFAULT_OPTIONS, ...options };`
	`46`	`+ this._options = { ...SettingsWatcherService._DEFAULT_OPTIONS, ...options };`
`47`	`47`	`if (this._options.debounce)`
`48`	`48`	`{`
`49`	`49`	`this._handleWatcherEvent = debounce(`