Skip to content

Commit 121f2ec

Browse files
authored
feat(amazonq): emit ide_editCodeFile (#5407)
4294f8d only emits for toolkit. This adds to amazon q as well. This will mean telemetry events are duplicated if both extensions are installed. With some additional complexity and over-engineering, we can avoid this. But de-duplication should not be a big deal across products.
1 parent 3c8c3a1 commit 121f2ec

File tree

4 files changed

+25
-3
lines changed

4 files changed

+25
-3
lines changed

packages/amazonq/src/extensionNode.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import * as vscode from 'vscode'
77
import { activateAmazonQCommon, amazonQContextPrefix, deactivateCommon } from './extension'
88
import { DefaultAmazonQAppInitContext } from 'aws-core-vscode/amazonq'
99
import { activate as activateQGumby } from 'aws-core-vscode/amazonqGumby'
10-
import { ExtContext } from 'aws-core-vscode/shared'
10+
import { ExtContext, globals } from 'aws-core-vscode/shared'
11+
import { filetypes, SchemaService } from 'aws-core-vscode/sharedNode'
1112
import { updateDevMode } from 'aws-core-vscode/dev'
1213
import { CommonAuthViewProvider } from 'aws-core-vscode/login'
1314
import { isExtensionActive, VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
@@ -51,6 +52,9 @@ async function activateAmazonQNode(context: vscode.ExtensionContext) {
5152
registerSubmitFeedback(context, 'Amazon Q', amazonQContextPrefix)
5253
)
5354

55+
globals.schemaService = new SchemaService()
56+
filetypes.activate()
57+
5458
await setupDevMode(context)
5559
}
5660

packages/core/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"./codewhisperer": "./dist/src/codewhisperer/index.js",
3636
"./codewhisperer/node": "./dist/src/codewhisperer/indexNode.js",
3737
"./shared": "./dist/src/shared/index.js",
38+
"./sharedNode": "./dist/src/shared/indexNode.js",
3839
"./auth": "./dist/src/auth/index.js",
3940
"./amazonqGumby": "./dist/src/amazonqGumby/index.js",
4041
"./amazonqFeatureDev": "./dist/src/amazonqFeatureDev/index.js",

packages/core/src/shared/index.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/**
7+
* Contains exports that work in both node and web.
8+
*/
9+
610
export { ExtContext } from './extensions'
711
export { initialize, default as globals } from './extensionGlobals'
812
export { activate as activateLogger } from './logger/activation'
@@ -14,7 +18,6 @@ export { initializeComputeRegion } from './extensionUtilities'
1418
export { RegionProvider } from './regions/regionProvider'
1519
export { Commands } from './vscode/commands2'
1620
export { getMachineId } from './vscode/env'
17-
export * from './environmentVariables'
1821
export { getLogger } from './logger/logger'
1922
export { activateExtension } from './utilities/vsCodeUtils'
2023
export { waitUntil, sleep } from './utilities/timeoutUtils'
@@ -24,7 +27,6 @@ export { VirtualMemoryFile } from './virtualMemoryFile'
2427
export { AmazonqCreateUpload, Metric } from './telemetry/telemetry'
2528
export { getClientId, getOperatingSystem } from './telemetry/util'
2629
export { extensionVersion } from './vscode/env'
27-
export * from './vscode/setContext'
2830
export { cast } from './utilities/typeConstructors'
2931
export {
3032
CodewhispererUserTriggerDecision,
@@ -34,6 +36,8 @@ export {
3436
CodewhispererUserDecision,
3537
CodewhispererSecurityScan,
3638
} from './telemetry/telemetry.gen'
39+
export * from './environmentVariables'
40+
export * from './vscode/setContext'
3741
export * from './utilities/textUtilities'
3842
export * from './filesystemUtilities'
3943
export * from './localizedText'
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/*!
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
/**
7+
* Contains exports that only work for node, NOT web.
8+
* Attempting to import from this file in web will throw an error,
9+
* likely `TypeError: Cannot read properties of undefined (reading 'native')`
10+
*/
11+
12+
export * as filetypes from './filetypes'
13+
export { SchemaService } from './schemas'

0 commit comments

Comments
 (0)