lint: prettier decides eslint

https://prettier.io/docs/en/integrating-with-linters.html

Author: justinmk3

.eslintrc.js

@@ -18,7 +18,9 @@ module.exports = {
         'plugin:@typescript-eslint/eslint-recommended',
         'plugin:@typescript-eslint/recommended-requiring-type-checking',
         'plugin:@typescript-eslint/recommended',
-        'prettier',
+        // "Add this as the _last_ item in the extends array, so that eslint-config-prettier has the
+        // opportunity to override other configs." https://github.com/prettier/eslint-plugin-prettier
+        'plugin:prettier/recommended',
     ],
     rules: {
         curly: 2, // Enforce braces on "if"/"for"/etc.

package-lock.json

@@ -55,6 +55,7 @@
         "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-aws-toolkits": "file:plugins/eslint-plugin-aws-toolkits",
         "eslint-plugin-header": "^3.1.1",
+        "eslint-plugin-prettier": "^5.1.3",
         "eslint-plugin-security-node": "^1.1.4",
         "eslint-plugin-unicorn": "^54.0.0",
         "husky": "^9.0.7",

package.json

@@ -71,7 +71,7 @@ function updateContent(/** @type {string} */ text) {
 
 async function checkThreatComposerAPI() {
     while (!window.threatcomposer || !window.threatcomposer.setCurrentWorkspaceData) {
-        await new Promise(r => setTimeout(r, checkThreatComposerAPITimeout))
+        await new Promise((r) => setTimeout(r, checkThreatComposerAPITimeout))
     }
 }
 
@@ -110,7 +110,7 @@ async function render(/** @type {string} */ text) {
         defaultTemplate = window.threatcomposer.stringifyWorkspaceData(initialState)
     }
 
-    window.threatcomposer.addEventListener('save', e => {
+    window.threatcomposer.addEventListener('save', (e) => {
         const stringyfiedData = window.threatcomposer.stringifyWorkspaceData(e.detail)
         const currentState = vscode.getState()
         currentState.fileContents = stringyfiedData

packages/core/resources/js/vsCodeExtensionInterface.js

@@ -43,7 +43,7 @@ function addBaseClass(generated: string, topLevelClass: string): string {
 
 async function generateConfigurationAttributes(): Promise<void> {
     for (const debugConfiguration of packageJson.contributes.debuggers) {
-        const debuggerConfig = config.find(cfg => {
+        const debuggerConfig = config.find((cfg) => {
             return cfg.debugger === debugConfiguration.type
         })
         if (debuggerConfig === undefined) {
@@ -52,9 +52,9 @@ async function generateConfigurationAttributes(): Promise<void> {
         // JSONSchema4 impl doesn't like properties with type undefined, but the compilation works correctly
         const schema = debugConfiguration.configurationAttributes[debuggerConfig.requestType] as any as JSONSchema4
         await compile(schema, 'DirectInvoke', { bannerComment: header })
-            .then(ts => addBaseClass(ts, debuggerConfig.topLevelClass))
-            .then(ts => ts.replace(docRegex, replacer))
-            .then(ts => fs.writeFileSync(debuggerConfig.outputFile, ts))
+            .then((ts) => addBaseClass(ts, debuggerConfig.topLevelClass))
+            .then((ts) => ts.replace(docRegex, replacer))
+            .then((ts) => fs.writeFileSync(debuggerConfig.outputFile, ts))
     }
 }
 

packages/core/scripts/build/generateConfigurationAttributes.ts

@@ -90,7 +90,7 @@ async function generateCloud9Icons(targets: { name: string; path: string }[], de
     for (const [theme, color] of Object.entries(themes)) {
         const themeDest = path.join(destination, theme)
         await fs.mkdirp(themeDest)
-        await Promise.all(targets.map(t => replaceColor(t.path, color, path.join(themeDest, `${t.name}.svg`))))
+        await Promise.all(targets.map((t) => replaceColor(t.path, color, path.join(themeDest, `${t.name}.svg`))))
     }
 }
 
@@ -113,7 +113,7 @@ async function generate(mappings: Record<string, number | undefined> = {}) {
         templateClassName: 'icon',
         descent: 200, // Icons were negatively offset on the y-axes, this fixes it
         templateFontPath: path.relative(stylesheetsDir, fontsDir).replace(/\\/g, '/'),
-        glyphTransformFn: obj => {
+        glyphTransformFn: (obj) => {
             const filePath = (obj as { path?: string }).path
 
             if (!filePath) {
@@ -174,7 +174,7 @@ ${result.template}
     await fs.writeFile(stylesheetPath, template)
     await updatePackage(
         `./${relativeDest}`,
-        icons.filter(isValidIcon).map(i => [i.name, i.data])
+        icons.filter(isValidIcon).map((i) => [i.name, i.data])
     )
     await generateCloud9Icons(icons, cloud9Dest)
 

packages/core/scripts/build/generateIcons.ts

@@ -21,7 +21,7 @@ interface ServiceClientDefinition {
 async function generateServiceClients(serviceClientDefinitions: ServiceClientDefinition[]): Promise<void> {
     const tempJsSdkPath = path.join(repoRoot, 'node_modules', '.zzz-awssdk2')
     console.log(`Temp JS SDK Repo location: ${tempJsSdkPath}`)
-    console.log('Service Clients to Generate: ', serviceClientDefinitions.map(x => x.serviceName).join(', '))
+    console.log('Service Clients to Generate: ', serviceClientDefinitions.map((x) => x.serviceName).join(', '))
 
     await cloneJsSdk(tempJsSdkPath)
     await insertServiceClientsIntoJsSdk(tempJsSdkPath, serviceClientDefinitions)
@@ -106,7 +106,7 @@ async function insertServiceClientsIntoJsSdk(
     jsSdkPath: string,
     serviceClientDefinitions: ServiceClientDefinition[]
 ): Promise<void> {
-    serviceClientDefinitions.forEach(serviceClientDefinition => {
+    serviceClientDefinitions.forEach((serviceClientDefinition) => {
         const apiVersion = getApiVersion(serviceClientDefinition.serviceJsonPath)
 
         // Copy the Service Json into the JS SDK for generation
@@ -121,7 +121,7 @@ async function insertServiceClientsIntoJsSdk(
     const apiMetadataPath = path.join(jsSdkPath, 'apis', 'metadata.json')
     await patchServicesIntoApiMetadata(
         apiMetadataPath,
-        serviceClientDefinitions.map(x => x.serviceName)
+        serviceClientDefinitions.map((x) => x.serviceName)
     )
 }
 
@@ -151,7 +151,7 @@ async function patchServicesIntoApiMetadata(apiMetadataPath: string, serviceName
     const apiMetadataJson = fs.readFileSync(apiMetadataPath).toString()
     const apiMetadata = JSON.parse(apiMetadataJson) as ApiMetadata
 
-    serviceNames.forEach(serviceName => {
+    serviceNames.forEach((serviceName) => {
         apiMetadata[serviceName.toLowerCase()] = { name: serviceName }
     })
 

packages/core/scripts/build/generateServiceClient.ts

@@ -12,11 +12,11 @@ void (async () => {
         const mocha = new Mocha()
 
         const testFiles = await glob('dist/src/testLint/**/*.test.js')
-        testFiles.forEach(file => {
+        testFiles.forEach((file) => {
             mocha.addFile(file)
         })
 
-        mocha.run(failures => {
+        mocha.run((failures) => {
             const exitCode = failures ? 1 : 0
             console.log(`Finished running Main test suite with result code: ${exitCode}`)
             process.exit(exitCode)

packages/core/scripts/lint/testLint.ts

@@ -173,7 +173,7 @@ async function invokeVSCodeCli(vsCodeExecutablePath: string, args: string[]): Pr
     // Workaround: set --user-data-dir to avoid this error in CI:
     // "You are trying to start Visual Studio Code as a super user …"
     if (process.env.AWS_TOOLKIT_TEST_USER_DIR) {
-        cmdArgs = cmdArgs.filter(a => !a.startsWith('--user-data-dir='))
+        cmdArgs = cmdArgs.filter((a) => !a.startsWith('--user-data-dir='))
         cmdArgs.push(`--user-data-dir=${process.env.AWS_TOOLKIT_TEST_USER_DIR}`)
     }
 

packages/core/scripts/test/launchTestUtilities.ts

@@ -60,7 +60,7 @@ export async function activate(context: ExtensionContext) {
         focusAmazonQPanel.register(),
         focusAmazonQPanelKeybinding.register(),
         tryChatCodeLensCommand.register(),
-        vscode.workspace.onDidChangeConfiguration(async configurationChangeEvent => {
+        vscode.workspace.onDidChangeConfiguration(async (configurationChangeEvent) => {
             if (configurationChangeEvent.affectsConfiguration('amazonQ.workspaceIndex')) {
                 if (CodeWhispererSettings.instance.isLocalIndexEnabled()) {
                     void setupLsp()