Merge remote-tracking branch 'origin/main' into feature/diff-v2

Author: Akila Tennakoon

.github/workflows/release.yml

@@ -77,12 +77,12 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - { os: "ubuntu-latest", arch: "x64", platform: "linux" }
-          - { os: "ubuntu-latest", arch: "arm64", platform: "linux" }
-          - { os: "ubuntu-latest", arch: "arm", platform: "linux" }
-          - { os: "macos-latest", arch: "x64", platform: "darwin" }
-          - { os: "macos-latest", arch: "arm64", platform: "darwin" }
-          - { os: "windows-latest", arch: "x64", platform: "win32" }
+          - { os: "ubuntu-latest", arch: "x64", platform: "linux", go-arch: "amd64" }
+          - { os: "ubuntu-latest", arch: "arm64", platform: "linux", go-arch: "arm64" }
+          - { os: "ubuntu-latest", arch: "arm", platform: "linux", go-arch: "arm" }
+          - { os: "macos-latest", arch: "x64", platform: "darwin", go-arch: "amd64" }
+          - { os: "macos-latest", arch: "arm64", platform: "darwin", go-arch: "arm64" }
+          - { os: "windows-latest", arch: "x64", platform: "win32", go-arch: "amd64" }
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v5
@@ -127,9 +127,9 @@ jobs:
           GOPROXY: direct
         run: |
           if [[ "${{ runner.os }}" == "Windows" ]]; then
-            go build -C ./cfn-init -v -o ../bundle/production/bin/cfn-init.exe
+            GOARCH=${{ matrix.go-arch }} go build -C ./cfn-init/cmd -v -o ../../bundle/production/bin/cfn-init.exe
           else
-            go build -C ./cfn-init -v -o ../bundle/production/bin/cfn-init
+            GOARCH=${{ matrix.go-arch }} go build -C ./cfn-init/cmd -v -o ../../bundle/production/bin/cfn-init
           fi
           cp ./cfn-init/THIRD-PARTY-LICENSES.txt ./bundle/production/bin/
 

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@aws/cloudformation-languageserver",
   "displayName": "AWS CloudFormation",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "id": "aws-cloudformation-languageserver",
   "description": "AWS CloudFormation Language Server implementation",
   "publisher": "aws",
@@ -30,10 +30,10 @@
     "test:leaks": "NODE_ENV=test vitest run --pool=forks --logHeapUsage",
     "lint": "eslint --max-warnings 0 .",
     "lint:fix": "npm run lint -- --fix",
-    "build:go:dev": "GOPROXY=direct go build -C cfn-init -v -o ../bundle/development/bin/cfn-init",
-    "build:go:prod": "GOPROXY=direct go build -C cfn-init -v -o ../bundle/production/bin/cfn-init",
+    "build:go:dev": "GOPROXY=direct go build -C cfn-init/cmd -v -o ../../bundle/development/bin/cfn-init",
+    "build:go:prod": "GOPROXY=direct go build -C cfn-init/cmd -v -o ../../bundle/production/bin/cfn-init",
     "test:go": "GOPROXY=direct go test -C cfn-init ./...",
-    "bundle": "rm -rf out && webpack --env mode=development",
+    "bundle": "rm -rf out && webpack --env mode=development && npm run build:go:dev",
     "bundle:alpha": "rm -rf out && webpack --env mode=production --env env=alpha",
     "bundle:beta": "rm -rf out && webpack --env mode=production --env env=beta",
     "bundle:prod": "rm -rf out && webpack --env mode=production --env env=prod",

package.json

@@ -97,6 +97,9 @@ export class DocumentManager implements SettingsConfigurable {
                 delay,
             )
             .catch((error) => {
+                if (error instanceof Error && error.message.includes('Request cancelled')) {
+                    return;
+                }
                 this.log.error(error, 'Failed to send document metadata');
             });
     }

src/document/DocumentManager.ts

@@ -2,13 +2,16 @@ import { CodeActionParams, CodeAction, Command } from 'vscode-languageserver';
 import { ServerRequestHandler } from 'vscode-languageserver/lib/common/server';
 import { ServerComponents } from '../server/ServerComponents';
 import { LoggerFactory } from '../telemetry/LoggerFactory';
+import { TelemetryService } from '../telemetry/TelemetryService';
 
 const log = LoggerFactory.getLogger('CodeActionHandler');
 
 export function codeActionHandler(
     components: ServerComponents,
 ): ServerRequestHandler<CodeActionParams, (Command | CodeAction)[] | undefined | null, (Command | CodeAction)[], void> {
     return (params, _token, _workDoneProgress, _resultProgress) => {
+        TelemetryService.instance.get('CodeActionHandler').count('count', 1);
+
         try {
             return components.codeActionService.generateCodeActions(params);
         } catch (error) {

src/handlers/CodeActionHandler.ts

@@ -1,11 +1,13 @@
 import { CodeLens, CodeLensParams } from 'vscode-languageserver';
 import { ServerRequestHandler } from 'vscode-languageserver/lib/common/server';
 import { ServerComponents } from '../server/ServerComponents';
+import { TelemetryService } from '../telemetry/TelemetryService';
 
 export function codeLensHandler(
     components: ServerComponents,
 ): ServerRequestHandler<CodeLensParams, CodeLens[] | undefined | null, CodeLens[], void> {
     return (params, _token, _workDoneProgress, _resultProgress) => {
+        TelemetryService.instance.get('CodeLensHandler').count('count', 1);
         return components.codeLensProvider.getCodeLenses(params.textDocument.uri);
     };
 }

src/handlers/CodeLensHandler.ts

@@ -1,6 +1,7 @@
 import { CompletionParams, CompletionList, CompletionItem } from 'vscode-languageserver';
 import { ServerRequestHandler } from 'vscode-languageserver/lib/common/server';
 import { ServerComponents } from '../server/ServerComponents';
+import { TelemetryService } from '../telemetry/TelemetryService';
 
 export function completionHandler(
     components: ServerComponents,
@@ -11,6 +12,7 @@ export function completionHandler(
     void
 > {
     return (params, _token, _workDoneProgress, _resultProgress) => {
+        TelemetryService.instance.get('CompletionHandler').count('count', 1);
         return components.completionRouter.getCompletions(params);
     };
 }

src/handlers/CompletionHandler.ts

@@ -1,13 +1,15 @@
 import { DidChangeConfigurationParams } from 'vscode-languageserver';
 import { ServerComponents } from '../server/ServerComponents';
 import { LoggerFactory } from '../telemetry/LoggerFactory';
+import { TelemetryService } from '../telemetry/TelemetryService';
 
 const log = LoggerFactory.getLogger('ConfigurationHandler');
 
 export function configurationHandler(components: ServerComponents): (params: DidChangeConfigurationParams) => void {
     return (_params: DidChangeConfigurationParams): void => {
         // Pull configuration from LSP workspace and notify all components via subscriptions (fire-and-forget)
         components.settingsManager.syncConfiguration().catch((error) => {
+            TelemetryService.instance.get('ConfigurationHandler').count('count', 1);
             log.error(error, `Failed to sync configuration`);
         });
     };

src/handlers/ConfigurationHandler.ts

@@ -1,6 +1,7 @@
 import { DefinitionParams, Location, Definition, DefinitionLink } from 'vscode-languageserver';
 import { ServerRequestHandler } from 'vscode-languageserver/lib/common/server';
 import { ServerComponents } from '../server/ServerComponents';
+import { TelemetryService } from '../telemetry/TelemetryService';
 
 export function definitionHandler(
     components: ServerComponents,
@@ -11,6 +12,7 @@ export function definitionHandler(
     void
 > {
     return (params, _token, _workDoneProgress, _resultProgress) => {
+        TelemetryService.instance.get('DefinitionHandler').count('count', 1);
         return components.definitionProvider.getDefinitions(params);
     };
 }

src/handlers/DefinitionHandler.ts

@@ -1,11 +1,13 @@
 import { DocumentSymbol, DocumentSymbolParams } from 'vscode-languageserver';
 import { ServerRequestHandler } from 'vscode-languageserver/lib/common/server';
 import { ServerComponents } from '../server/ServerComponents';
+import { TelemetryService } from '../telemetry/TelemetryService';
 
 export function documentSymbolHandler(
     components: ServerComponents,
 ): ServerRequestHandler<DocumentSymbolParams, DocumentSymbol[] | null | undefined, DocumentSymbol[], void> {
     return (params, _token, _workDoneProgress, _resultProgress) => {
+        TelemetryService.instance.get('DocumentSymbolHandler').count('count', 1);
         return components.documentSymbolRouter.getDocumentSymbols(params);
     };
 }