fix: resolve ESlint errors

Author: nakrovati

src/DocumentWatcher.ts

@@ -1,4 +1,4 @@
-import * as path from 'path'
+import * as path from 'node:path'
 import {
 	Disposable,
 	TextDocument,
@@ -9,7 +9,6 @@ import {
 	workspace,
 } from 'vscode'
 import { KnownProps } from 'editorconfig'
-
 import {
 	InsertFinalNewline,
 	PreSaveTransformation,
@@ -55,9 +54,6 @@ export default class DocumentWatcher {
 			window.onDidChangeActiveTextEditor(async editor => {
 				this.handleTextEditorChange(editor)
 			}),
-		)
-
-		subscriptions.push(
 			window.onDidChangeWindowState(async state => {
 				if (state.focused && this.doc) {
 					const newOptions = await resolveTextEditorOptions(this.doc, {
@@ -69,19 +65,13 @@ export default class DocumentWatcher {
 					})
 				}
 			}),
-		)
-
-		subscriptions.push(
 			workspace.onDidSaveTextDocument(doc => {
 				if (path.basename(doc.fileName) === '.editorconfig') {
 					this.log('.editorconfig file saved.')
 				}
 				// in case document was dirty on text editor change
 				this.handleDocumentEncoding(doc)
 			}),
-		)
-
-		subscriptions.push(
 			workspace.onWillSaveTextDocument(async e => {
 				const transformations = this.calculatePreSaveTransformations(
 					e.document,
@@ -199,7 +189,9 @@ export default class DocumentWatcher {
 			return
 		}
 
-		this.log(`${relativePath}: Re-opening document with ${targetEncoding} encoding...`)
+		this.log(
+			`${relativePath}: Re-opening document with ${targetEncoding} encoding...`,
+		)
 		await workspace.openTextDocument(document.uri, {
 			encoding: targetEncoding,
 		})

src/EditorConfigCompletionProvider.ts

@@ -97,9 +97,9 @@ class EditorConfigCompletionProvider implements CompletionItemProvider {
 		const textOfEntireLine = document.getText(
 			document.lineAt(position.line).range,
 		)
-		const textOfLineUpToCursor = textOfEntireLine.substring(
+		const textOfLineUpToCursor = textOfEntireLine.slice(
 			0,
-			position.character,
+			Math.max(0, position.character),
 		)
 
 		// conditionally generate autocomplete for property names or values
@@ -144,7 +144,7 @@ class EditorConfigCompletionProvider implements CompletionItemProvider {
 	}
 
 	private hasEqualsSign(lineText: string): boolean {
-		return lineText.indexOf('=') >= 0
+		return lineText.includes('=')
 	}
 
 	// =========================================================================

src/api.ts

@@ -1,5 +1,5 @@
-import * as editorconfig from 'editorconfig'
 import { TextDocument, TextEditorOptions, Uri, window, workspace } from 'vscode'
+import * as editorconfig from 'editorconfig'
 
 /**
  * Resolves `TextEditorOptions` for a `TextDocument`, combining the editor's
@@ -139,6 +139,13 @@ export function resolveFile(doc: TextDocument): {
 	}
 }
 
+/**
+ * Convert vscode tabSize option into numeric value
+ */
+function resolveTabSize(tabSize: number | string) {
+	return tabSize === 'auto' ? 4 : Number.parseInt(String(tabSize), 10)
+}
+
 /**
  * Convert .editorconfig values to vscode editor options
  */
@@ -192,27 +199,22 @@ export function toEditorConfig(options: TextEditorOptions) {
 	const result: editorconfig.KnownProps = {}
 
 	switch (options.insertSpaces) {
-		case true:
+		case true: {
 			result.indent_style = 'space'
 			if (options.tabSize) {
 				result.indent_size = resolveTabSize(options.tabSize)
 			}
 			break
+		}
 		case false:
-		case 'auto':
+		case 'auto': {
 			result.indent_style = 'tab'
 			if (options.tabSize) {
 				result.tab_width = resolveTabSize(options.tabSize)
 			}
 			break
+		}
 	}
 
 	return result
-
-	/**
-	 * Convert vscode tabSize option into numeric value
-	 */
-	function resolveTabSize(tabSize: number | string) {
-		return tabSize === 'auto' ? 4 : parseInt(String(tabSize), 10)
-	}
 }

src/commands/generateEditorConfig.ts

@@ -1,11 +1,8 @@
-import { readFile as _readFile } from 'fs'
-import { EOL } from 'os'
-import { resolve } from 'path'
-import { promisify } from 'util'
+import { readFile } from 'node:fs/promises'
+import { EOL } from 'node:os'
+import { resolve } from 'node:path'
 import { FileType, Uri, window, workspace } from 'vscode'
 
-const readFile = promisify(_readFile)
-
 /**
  * Generate a .editorconfig file in the root of the workspace based on the
  * current vscode settings.
@@ -28,18 +25,18 @@ export async function generateEditorConfig(uri: Uri) {
 			)
 			return
 		}
-	} catch (err: unknown) {
+	} catch (error: unknown) {
 		if (
-			typeof err === 'object' &&
-			err !== null &&
-			'name' in err &&
-			'message' in err &&
-			typeof err.message === 'string'
+			typeof error === 'object' &&
+			error !== null &&
+			'name' in error &&
+			'message' in error &&
+			typeof error.message === 'string'
 		) {
-			if (err.name === 'EntryNotFound (FileSystemError)') {
+			if (error.name === 'EntryNotFound (FileSystemError)') {
 				writeFile()
 			} else {
-				window.showErrorMessage(err.message)
+				window.showErrorMessage(error.message)
 			}
 			return
 		}
@@ -132,7 +129,7 @@ export async function generateEditorConfig(uri: Uri) {
 
 		const encodingMap = {
 			iso88591: 'latin1',
-			utf8: 'utf-8',
+			utf8: 'utff8-8',
 			utf8bom: 'utf-8-bom',
 			utf16be: 'utf-16-be',
 			utf16le: 'utf-16-le',
@@ -159,17 +156,17 @@ export async function generateEditorConfig(uri: Uri) {
 				editorConfigUri,
 				Buffer.from(settingsLines.join(eolKey)),
 			)
-		} catch (err) {
+		} catch (error) {
 			if (
-				typeof err !== 'object' ||
-				err === null ||
-				!('message' in err) ||
-				typeof err.message !== 'string'
+				typeof error !== 'object' ||
+				error === null ||
+				!('message' in error) ||
+				typeof error.message !== 'string'
 			) {
 				return
 			}
 
-			window.showErrorMessage(err.message)
+			window.showErrorMessage(error.message)
 		}
 	}
 }

src/test/runTest.ts

@@ -1,4 +1,4 @@
-import * as path from 'path'
+import * as path from 'node:path'
 
 import { runTests } from '@vscode/test-electron'
 
@@ -39,4 +39,5 @@ async function main() {
 	}
 }
 
+// eslint-disable-next-line unicorn/prefer-top-level-await
 main()

src/test/suite/api.test.ts

@@ -1,7 +1,6 @@
-import * as assert from 'assert'
-import { KnownProps } from 'editorconfig'
+import * as assert from 'node:assert'
 import { TextEditorOptions } from 'vscode'
-
+import { KnownProps } from 'editorconfig'
 import * as api from '../../api'
 
 suite('EditorConfig extension', () => {

src/test/suite/index.test.ts

@@ -1,9 +1,8 @@
-import * as assert from 'assert'
-import * as os from 'os'
+import * as assert from 'node:assert'
+import * as os from 'node:os'
 import { Position, window, workspace, WorkspaceEdit } from 'vscode'
-import { getFixturePath, getOptionsForFixture, wait } from '../testUtils'
-
 import * as utils from 'vscode-test-utils'
+import { getFixturePath, getOptionsForFixture, wait } from '../testUtils'
 
 suite('EditorConfig extension', function () {
 	this.retries(2)
@@ -372,26 +371,27 @@ function withSetting(
 ) {
 	return {
 		async getText() {
-			return (
-				await this.createDoc(options.contents, options.fileName)
-			).getText()
+			const doc = await this.createDoc(options.contents, options.fileName)
+			return doc.getText()
 		},
-		saveText(text: string) {
-			return new Promise<string>(async resolve => {
-				const doc = await this.createDoc(options.contents, options.fileName)
+		async saveText(text: string) {
+			const doc = await this.createDoc(options.contents, options.fileName)
+
+			const savePromise = new Promise<string>(resolve => {
 				workspace.onDidChangeTextDocument(doc.save)
 				workspace.onDidSaveTextDocument(savedDoc => {
 					assert.strictEqual(savedDoc.isDirty, false, 'dirty saved doc')
 					resolve(savedDoc.getText())
 				})
-				const edit = new WorkspaceEdit()
-				edit.insert(doc.uri, new Position(0, 0), text)
-				assert.strictEqual(
-					await workspace.applyEdit(edit),
-					true,
-					'editor fails to apply edit',
-				)
 			})
+
+			const edit = new WorkspaceEdit()
+			edit.insert(doc.uri, new Position(0, 0), text)
+
+			const result = await workspace.applyEdit(edit)
+			assert.strictEqual(result, true, 'editor fails to apply edit')
+
+			return savePromise
 		},
 		async createDoc(contents = '', name = 'test') {
 			const uri = await utils.createFile(

src/test/suite/index.ts

@@ -1,6 +1,6 @@
+import * as path from 'node:path'
 import { globSync } from 'glob'
 import * as Mocha from 'mocha'
-import * as path from 'path'
 
 export function run(): Promise<void> {
 	// Create the mocha test
@@ -25,8 +25,8 @@ export function run(): Promise<void> {
 					c()
 				}
 			})
-		} catch (err) {
-			e(err)
+		} catch (error) {
+			e(error)
 		}
 	})
 }

src/test/testUtils.ts

@@ -1,5 +1,5 @@
-import * as assert from 'assert'
-import * as path from 'path'
+import * as assert from 'node:assert'
+import * as path from 'node:path'
 import { TextEditorOptions, Uri, window } from 'vscode'
 import * as utils from 'vscode-test-utils'
 
@@ -10,7 +10,7 @@ export async function getOptionsForFixture(file: string[]) {
 
 export function getFixturePath(file: string[]) {
 	return path.resolve(
-		path.join(...[__dirname, '..', 'test', 'suite', 'fixtures'].concat(file)),
+		path.join(__dirname, '..', 'test', 'suite', 'fixtures', ...file),
 	)
 }
 
@@ -21,19 +21,18 @@ export function wait(ms: number) {
 }
 
 async function getTextEditorOptions() {
-	let resolved = false
-
-	return new Promise<TextEditorOptions>(async resolve => {
+	const eventPromise = new Promise<TextEditorOptions>(resolve => {
 		window.onDidChangeTextEditorOptions(e => {
-			resolved = true
 			assert.ok(e.options)
 			resolve(e.options)
 		})
+	})
+
+	const fallbackPromise = (async () => {
 		await wait(100)
-		if (resolved) {
-			return
-		}
 		assert.ok(window.activeTextEditor!.options)
-		resolve(window.activeTextEditor!.options)
-	})
+		return window.activeTextEditor!.options
+	})()
+
+	return await Promise.race([eventPromise, fallbackPromise])
 }

src/test/untitled-suite/index.test.ts

@@ -1,8 +1,7 @@
-import * as assert from 'assert'
+import * as assert from 'node:assert'
 import { commands, window } from 'vscode'
-import { wait } from '../testUtils'
-
 import * as utils from 'vscode-test-utils'
+import { wait } from '../testUtils'
 
 suite('EditorConfig extension untitled workspace', function () {
 	this.retries(2)