revert unwanted changes

Author: zuoyaofu

docs/lsp.md

@@ -26,7 +26,9 @@ sequenceDiagram
 
 ## Language Server Debugging
 
-1. Clone https://github.com/aws/language-servers.git and set it up in the same workspace as this project by cmd+shift+p and "add folder to workspace" and selecting the language-servers folder that you just cloned. Your VS code folder structure should look like below.
+1. Clone https://github.com/aws/language-servers.git and set it up in the same workspace as this project by cmd+shift+p and "add folder to workspace" and selecting the language-servers folder that you just cloned. Your VS code folder structure should look like  below.
+
+    
 
     ```
     /aws-toolkit-vscode
@@ -57,4 +59,4 @@ sequenceDiagram
 
 ## Amazon Q Inline Activation
 
--   In order to get inline completion working you must open a supported file type defined in CodewhispererInlineCompletionLanguages in `packages/amazonq/src/app/inline/completion.ts`
+-   In order to get inline completion working you must open a supported file type defined in CodewhispererInlineCompletionLanguages in `packages/amazonq/src/app/inline/completion.ts`

packages/core/src/codewhisperer/commands/basicCommands.ts

@@ -3,8 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/* eslint-disable aws-toolkits/no-console-log */
-
 import * as vscode from 'vscode'
 import { CodewhispererCodeScanIssueApplyFix, Component, telemetry } from '../../shared/telemetry/telemetry'
 import { ExtContext, VSCODE_EXTENSION_ID } from '../../shared/extensions'
@@ -367,7 +365,6 @@ export const updateReferenceLog = Commands.declare(
 export const openSecurityIssuePanel = Commands.declare(
     'aws.amazonq.openSecurityIssuePanel',
     (context: ExtContext) => async (issue: CodeScanIssue | IssueItem, filePath: string) => {
-        console.log('in open security')
         const targetIssue: CodeScanIssue = issue instanceof IssueItem ? issue.issue : issue
         const targetFilePath: string = issue instanceof IssueItem ? issue.filePath : filePath
         await showSecurityIssueWebview(context.extensionContext, targetIssue, targetFilePath)
@@ -393,36 +390,6 @@ export const openSecurityIssuePanel = Commands.declare(
             undefined,
             !!targetIssue.suggestedFixes.length
         )
-        console.log('in show securityIssueWebview')
-        console.log('targetIssue', targetIssue)
-        console.log('file Path', filePath)
-        console.log('before', targetIssue.suggestedFixes.length === 0)
-
-        // telemetry.codewhisperer_codeScanIssueViewDetails.emit({
-        //     findingId: targetIssue.findingId,
-        //     detectorId: targetIssue.detectorId,
-        //     ruleId: targetIssue.ruleId,
-        //     credentialStartUrl: AuthUtil.instance.startUrl,
-        //     autoDetected: targetIssue.autoDetected,
-        // })
-        console.log('middle', targetIssue.suggestedFixes.length === 0)
-
-        // TelemetryHelper.instance.sendCodeScanRemediationsEvent(
-        //     undefined,
-        //     'CODESCAN_ISSUE_VIEW_DETAILS',
-        //     targetIssue.detectorId,
-        //     targetIssue.findingId,
-        //     targetIssue.ruleId,
-        //     undefined,
-        //     undefined,
-        //     undefined,
-        //     !!targetIssue.suggestedFixes.length
-        // )
-        console.log('after', targetIssue.suggestedFixes.length === 0)
-        if (targetIssue.suggestedFixes.length === 0) {
-            console.log('going to generate fix as suggested fix length is 0')
-            await generateFix.execute(targetIssue, targetFilePath, 'webview', true, false)
-        }
     }
 )
 
@@ -719,18 +686,13 @@ export const generateFix = Commands.declare(
             refresh: boolean = false,
             shouldOpenSecurityIssuePanel: boolean = true
         ) => {
-            console.log('in generate fix')
             const targetIssue: CodeScanIssue | undefined = issue instanceof IssueItem ? issue.issue : issue
             const targetFilePath: string = issue instanceof IssueItem ? issue.filePath : filePath
             const targetSource: Component = issue instanceof IssueItem ? 'tree' : source
-            console.log('target issue', targetIssue)
-            console.log('target file path', targetFilePath)
-            console.log('target source', targetSource)
             if (!targetIssue) {
                 return
             }
             if (targetIssue.ruleId === CodeWhispererConstants.sasRuleId) {
-                console.log('GenerateFix is not available for SAS findings.')
                 getLogger().warn('GenerateFix is not available for SAS findings.')
                 return
             }
@@ -770,9 +732,6 @@ export const generateFix = Commands.declare(
                         getLogger().debug(
                             `Received fix with reference and user settings disallow references. Job ID: ${jobId}`
                         )
-                        console.log(
-                            `Received fix with reference and user settings disallow references. Job ID: ${jobId}`
-                        )
                         // TODO: re-enable notifications once references published
                         // void vscode.window.showInformationMessage(
                         //     'Your settings do not allow code generation with references.'
@@ -796,7 +755,6 @@ export const generateFix = Commands.declare(
                                   ]
                                 : [],
                     }
-                    console.log('finish updating issue', updatedIssue)
                     await updateSecurityIssueWebview({
                         issue: updatedIssue,
                         isGenerateFixLoading: false,
@@ -807,7 +765,6 @@ export const generateFix = Commands.declare(
 
                     SecurityIssueProvider.instance.updateIssue(updatedIssue, targetFilePath)
                     SecurityIssueTreeViewProvider.instance.refresh()
-                    console.log('finish updating webview')
                 } catch (err) {
                     const error = err instanceof Error ? err : new TypeError('Unexpected error')
                     await updateSecurityIssueWebview({

packages/core/src/codewhisperer/commands/startCodeFixGeneration.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { fs } from '../../shared/fs/fs'
-// import { getLogger } from '../../shared/logger/logger'
+import { getLogger } from '../../shared/logger/logger'
 import {
     createCodeFixJob,
     getCodeFixJob,
@@ -21,7 +21,6 @@ import { tempDirPath } from '../../shared/filesystemUtilities'
 import { CodeWhispererSettings } from '../util/codewhispererSettings'
 import { AuthUtil } from '../util/authUtil'
 import { saveDocumentIfDirty } from '../../shared/utilities/textDocumentUtilities'
-/* eslint-disable aws-toolkits/no-console-log */
 
 export async function startCodeFixGeneration(
     client: DefaultCodeWhispererClient,
@@ -38,7 +37,7 @@ export async function startCodeFixGeneration(
     let linesOfFixGenerated
     let charsOfFixGenerated
     try {
-        console.log(
+        getLogger().verbose(
             `Starting code fix generation for lines ${issue.startLine + 1} through ${issue.endLine} of file ${filePath}`
         )
 
@@ -91,30 +90,30 @@ export async function startCodeFixGeneration(
         }
         jobId = codeFixJob.jobId
         issue.fixJobId = codeFixJob.jobId
-        console.log(`Created code fix job.`)
+        getLogger().verbose(`Created code fix job.`)
 
         /**
          * Step 4: Polling mechanism on code fix job status
          */
         throwIfCancelled()
         const jobStatus = await pollCodeFixJobStatus(client, String(codeFixJob.jobId), profile)
         if (jobStatus === 'Failed') {
-            console.log(`Code fix generation failed.`)
+            getLogger().verbose(`Code fix generation failed.`)
             throw new CreateCodeFixError()
         }
 
         /**
          * Step 5: Process and render code fix results
          */
         throwIfCancelled()
-        console.log(`Code fix job succeeded and start processing result.`)
+        getLogger().verbose(`Code fix job succeeded and start processing result.`)
 
         const { suggestedFix } = await getCodeFixJob(client, String(codeFixJob.jobId), profile)
         // eslint-disable-next-line aws-toolkits/no-json-stringify-in-log
-        console.log(`Suggested fix: ${JSON.stringify(suggestedFix)}`)
+        getLogger().verbose(`Suggested fix: ${JSON.stringify(suggestedFix)}`)
         return { suggestedFix, jobId }
     } catch (err) {
-        console.log('Code fix generation failed: %s', err)
+        getLogger().error('Code fix generation failed: %s', err)
         throw err
     } finally {
         codeFixState.setToNotStarted()

packages/core/src/codewhisperer/util/telemetryHelper.ts

@@ -890,8 +890,6 @@ export class TelemetryHelper {
         result?: string,
         includesFix?: boolean
     ) {
-        // eslint-disable-next-line aws-toolkits/no-console-log
-        console.log('sending telemetry')
         client
             .sendTelemetryEvent({
                 telemetryEvent: {
@@ -922,12 +920,6 @@ export class TelemetryHelper {
                 if (isAwsError(error)) {
                     requestId = error.requestId
                 }
-                // eslint-disable-next-line aws-toolkits/no-console-log
-                console.log(
-                    `Failed to sendCodeScanRemediationsEvent to CodeWhisperer, requestId: ${
-                        requestId ?? ''
-                    }, message: ${error.message}`
-                )
                 getLogger().debug(
                     `Failed to sendCodeScanRemediationsEvent to CodeWhisperer, requestId: ${
                         requestId ?? ''