Merge remote-tracking branch 'upstream/master' into lsp

Author: Will-ShaoHua

packages/amazonq/.changes/next-release/Bug Fix-30c6bfc4-9411-4bc4-bfd1-41305859109d.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Fix broken inline suggestion auto-trigger on Systemverfilog files if users dont have systemverilog extension installed and enabled"
+}

packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts

@@ -4,7 +4,7 @@
  */
 
 import assert from 'assert'
-import { resetCodeWhispererGlobalVariables } from 'aws-core-vscode/test'
+import { resetCodeWhispererGlobalVariables, toTextDocument } from 'aws-core-vscode/test'
 import { runtimeLanguageContext, RuntimeLanguageContext, PlatformLanguageId } from 'aws-core-vscode/codewhisperer'
 import * as codewhispererClient from 'aws-core-vscode/codewhisperer'
 import { CodewhispererLanguage } from 'aws-core-vscode/shared'
@@ -61,6 +61,61 @@ describe('runtimeLanguageContext', function () {
                 assert.strictEqual(actual, expected)
             })
         })
+
+        describe('test isLanguageSupported with document as the argument', function () {
+            const cases: [string, boolean][] = [
+                ['helloJava.java', true],
+                ['helloPython.py', true],
+                ['helloJavascript.js', true],
+                ['helloJsx.jsx', true],
+                ['helloTypescript.ts', true],
+                ['helloTsx.tsx', true],
+                ['helloCsharp.cs', true],
+                ['helloC.c', true],
+                ['helloC.h', true],
+                ['helloCpp.cpp', true],
+                ['helloCpp.cc', true],
+                ['helloGo.go', true],
+                ['helloKotlin.kt', true],
+                ['helloPhp.php', true],
+                ['helloRuby.rb', true],
+                ['helloRust.rs', true],
+                ['helloScala.scala', true],
+                ['helloShellscript.sh', true],
+                ['helloSql.sql', true],
+                ['helloSystemVerilog.svh', true],
+                ['helloSystemVerilog.sv', true],
+                ['helloSystemVerilog.vh', true],
+                ['helloDart.dart', true],
+                ['helloLua.lua', true],
+                ['helloLua.wlua', true],
+                ['helloSwift.swift', true],
+                ['helloVue.vue', true],
+                ['helloPowerShell.ps1', true],
+                ['helloPowerShell.psm1', true],
+                ['helloR.r', true],
+                ['helloJson.json', true],
+                ['helloYaml.yaml', true],
+                ['helloYaml.yml', true],
+                ['helloTf.tf', true],
+                ['helloPlaintext.txt', false],
+                ['helloHtml.html', false],
+                ['helloCss.css', false],
+                ['helloUnknown', false],
+                ['helloFoo.foo', false],
+            ]
+
+            cases.forEach((tuple) => {
+                const fileName = tuple[0]
+                const expected = tuple[1]
+
+                it(`pass document ${fileName} as argument should first try determine by languageId then file extensions`, async function () {
+                    const doc = await toTextDocument('', fileName)
+                    const actual = languageContext.isLanguageSupported(doc)
+                    assert.strictEqual(actual, expected)
+                })
+            })
+        })
     })
 
     describe('test getLanguageContext', function () {

packages/core/src/auth/auth.ts

@@ -16,7 +16,7 @@ import { Timeout } from '../shared/utilities/timeoutUtils'
 import { errorCode, isAwsError, isNetworkError, ToolkitError, UnknownError } from '../shared/errors'
 import { getCache, getCacheFileWatcher } from './sso/cache'
 import { isNonNullable, Mutable } from '../shared/utilities/tsUtils'
-import { builderIdStartUrl, SsoToken, truncateStartUrl } from './sso/model'
+import { SsoToken, truncateStartUrl } from './sso/model'
 import { SsoClient } from './sso/clients'
 import { getLogger } from '../shared/logger'
 import { CredentialsProviderManager } from './providers/credentialsProviderManager'
@@ -68,6 +68,7 @@ import { asStringifiedStack } from '../shared/telemetry/spans'
 import { withTelemetryContext } from '../shared/telemetry/util'
 import { DiskCacheError } from '../shared/utilities/cacheUtils'
 import { setContext } from '../shared/vscode/setContext'
+import { builderIdStartUrl, internalStartUrl } from './sso/constants'
 
 interface AuthService {
     /**
@@ -189,7 +190,7 @@ export class Auth implements AuthService, ConnectionManager {
     }
 
     public isInternalAmazonUser(): boolean {
-        return this.isConnected() && this.startUrl === 'https://amzn.awsapps.com/start'
+        return this.isConnected() && this.startUrl === internalStartUrl
     }
 
     /**

packages/core/src/auth/connection.ts

@@ -5,7 +5,7 @@
 import * as vscode from 'vscode'
 import { Credentials } from '@aws-sdk/types'
 import { Mutable } from '../shared/utilities/tsUtils'
-import { builderIdStartUrl, ClientRegistration, SsoToken, truncateStartUrl } from './sso/model'
+import { ClientRegistration, SsoToken, truncateStartUrl } from './sso/model'
 import { SsoClient } from './sso/clients'
 import { CredentialsProviderManager } from './providers/credentialsProviderManager'
 import { fromString } from './providers/credentials'
@@ -17,6 +17,7 @@ import { withTelemetryContext } from '../shared/telemetry/util'
 import { AuthModifyConnection, telemetry } from '../shared/telemetry/telemetry'
 import { asStringifiedStack } from '../shared/telemetry/spans'
 import { getTelemetryReason, getTelemetryReasonDesc } from '../shared/errors'
+import { builderIdStartUrl } from './sso/constants'
 
 /** Shows a warning message unless it is the same as the last one shown. */
 const warnOnce = onceChanged((s: string, url: string) => {

packages/core/src/auth/providers/sharedCredentialsProvider.ts

@@ -29,9 +29,9 @@ import {
     Profile,
     Section,
 } from '../credentials/sharedCredentials'
-import { builderIdStartUrl } from '../sso/model'
 import { SectionName, SharedCredentialsKeys } from '../credentials/types'
 import { SsoProfile, hasScopes, scopesSsoAccountAccess } from '../connection'
+import { builderIdStartUrl } from '../sso/constants'
 
 const credentialSources = {
     ECS_CONTAINER: 'EcsContainer',

packages/core/src/auth/sso/constants.ts

@@ -8,6 +8,9 @@
  * web, node, or vue.
  */
 
+export const builderIdStartUrl = 'https://view.awsapps.com/start'
+export const internalStartUrl = 'https://amzn.awsapps.com/start'
+
 export const ssoUrlFormatRegex =
     /^(https?:\/\/(.+)\.awsapps\.com\/start|https?:\/\/identitycenter\.amazonaws\.com\/ssoins-[\da-zA-Z]{16})\/?$/
 

packages/core/src/auth/sso/model.ts

@@ -16,6 +16,7 @@ import { ssoAuthHelpUrl } from '../../shared/constants'
 import { openUrl } from '../../shared/utilities/vsCodeUtils'
 import { ToolkitError } from '../../shared/errors'
 import { isCloud9 } from '../../shared/extensionUtilities'
+import { builderIdStartUrl } from './constants'
 
 export interface SsoToken {
     /**
@@ -88,7 +89,6 @@ export interface SsoProfile {
     readonly identifier?: string
 }
 
-export const builderIdStartUrl = 'https://view.awsapps.com/start'
 export const trustedDomainCancellation = 'TrustedDomainCancellation'
 
 const tryOpenHelpUrl = (url: vscode.Uri) =>

packages/core/src/auth/sso/ssoAccessTokenProvider.ts

@@ -6,15 +6,7 @@
 import * as vscode from 'vscode'
 import globals from '../../shared/extensionGlobals'
 import { AuthorizationPendingException, SSOOIDCServiceException, SlowDownException } from '@aws-sdk/client-sso-oidc'
-import {
-    SsoToken,
-    ClientRegistration,
-    isExpired,
-    SsoProfile,
-    builderIdStartUrl,
-    openSsoPortalLink,
-    isDeprecatedAuth,
-} from './model'
+import { SsoToken, ClientRegistration, isExpired, SsoProfile, openSsoPortalLink, isDeprecatedAuth } from './model'
 import { getCache } from './cache'
 import { hasProps, hasStringProps, RequiredProps, selectFrom } from '../../shared/utilities/tsUtils'
 import { OidcClient } from './clients'
@@ -46,6 +38,7 @@ import { NestedMap } from '../../shared/utilities/map'
 import { asStringifiedStack } from '../../shared/telemetry/spans'
 import { showViewLogsMessage } from '../../shared/utilities/messages'
 import _ from 'lodash'
+import { builderIdStartUrl } from './constants'
 
 export const authenticationPath = 'sso/authenticated'
 

packages/core/src/awsService/cloudWatchLogs/commands/viewLogStream.ts

@@ -24,8 +24,8 @@ import {
 import { prepareDocument, searchLogGroup } from './searchLogGroup'
 import { telemetry, Result } from '../../../shared/telemetry/telemetry'
 import { CancellationError } from '../../../shared/utilities/timeoutUtils'
-import { formatLocalized } from '../../../shared/utilities/textUtilities'
 import { cwlUriSchema } from '../cloudWatchLogsUtils'
+import { formatLocalized } from '../../../shared/datetime'
 
 export async function viewLogStream(node: LogGroupNode, registry: LogDataRegistry): Promise<void> {
     await telemetry.cloudwatchlogs_open.run(async (span) => {

packages/core/src/awsService/cloudWatchLogs/document/textContent.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { formatDateTimestamp } from '../../../shared/datetime'
 import { CloudWatchLogsEvent, CloudWatchLogsGroupInfo } from '../registry/logDataRegistry'
-import { formatDateTimestamp } from '../../../shared/utilities/textUtilities'
 
 export const timestampSpaceEquivalent = '                             '