Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .git2gus/config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"productTag": "a1aB00000001F81IAE",
"defaultBuild": "248",
"defaultBuild": "264",
"issueTypeLabels": {
"feature": "USER STORY",
"enhancement": "USER STORY",
Expand Down
16 changes: 15 additions & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- develop

env:
NODE_VERSION: '18.15.0'
NODE_VERSION: '22.22.1'

jobs:
# We really only need to run lint on one job so we'll do it here
Expand All @@ -21,6 +21,10 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: Create sf CLI stub
# The marketplace salesforcedx-vscode-core extension tries to spawn 'sf' during activation.
# Provide a stub so it doesn't crash with ENOENT in CI where sf is not installed.
run: sudo sh -c 'printf "#!/bin/sh\nexit 1\n" > /usr/local/bin/sf && chmod +x /usr/local/bin/sf'
- name: Build
run: |
npm install
Expand All @@ -40,6 +44,8 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: Create sf CLI stub
run: sudo sh -c 'printf "#!/bin/sh\nexit 1\n" > /usr/local/bin/sf && chmod +x /usr/local/bin/sf'
- name: Build
run: |
npm install
Expand All @@ -63,6 +69,8 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: Create sf CLI stub
run: sudo sh -c 'printf "#!/bin/sh\nexit 1\n" > /usr/local/bin/sf && chmod +x /usr/local/bin/sf'
- name: Build
# do --ignore-scripts so it skips the bootstrap in the extensions/, since test:vsix-integration runs
# a git clean and a bootstrap to build the vsix's
Expand Down Expand Up @@ -96,6 +104,8 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: Create sf CLI stub
run: sudo sh -c 'printf "#!/bin/sh\nexit 1\n" > /usr/local/bin/sf && chmod +x /usr/local/bin/sf'
- name: Build
run: |
npm install
Expand All @@ -117,6 +127,10 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: Create sf CLI stub
# Windows equivalent: create a minimal sf.cmd that exits with code 1
run: |
echo @exit /b 1 > C:\Windows\sf.cmd
- name: Build
run: |
npm install
Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/pr-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- develop

env:
NODE_VERSION: '18.15.0'
NODE_VERSION: '22.22.1'

jobs:
pr-build:
Expand All @@ -20,6 +20,10 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: Create sf CLI stub
# The marketplace salesforcedx-vscode-core extension tries to spawn 'sf' during activation.
# Provide a stub so it doesn't crash with ENOENT in CI where sf is not installed.
run: sudo sh -c 'printf "#!/bin/sh\nexit 1\n" > /usr/local/bin/sf && chmod +x /usr/local/bin/sf'
- name: Build
run: |
npm install
Expand All @@ -43,6 +47,8 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: Create sf CLI stub
run: sudo sh -c 'printf "#!/bin/sh\nexit 1\n" > /usr/local/bin/sf && chmod +x /usr/local/bin/sf'
- name: Build
run: |
npm install
Expand All @@ -65,6 +71,8 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: Create sf CLI stub
run: sudo sh -c 'printf "#!/bin/sh\nexit 1\n" > /usr/local/bin/sf && chmod +x /usr/local/bin/sf'
- name: Build
# do --ignore-scripts so it skips the bootstrap in the extensions/, since test:vsix-integration runs
# a git clean and a bootstrap to build the vsix's
Expand All @@ -89,6 +97,10 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: Create sf CLI stub
# Windows equivalent: create a minimal sf.cmd that exits with code 1
run: |
echo @exit /b 1 > C:\Windows\sf.cmd
- name: Build
# Note: npm run lint fails silently on windows for some reason, but we really only need
# to run it in one job anyways
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ jspm_packages/

# SalesforceDX
.sfdx/
.sf/

# Node lock files (actually causes issues with the symlinking that lerna does, so ignore)
package-lock.json
Expand All @@ -92,5 +93,10 @@ package-lock.json
# vim swap files
*.swp

# Claude user-specific things
.agents/
.claude/settings.local.json

# output from 'npm run license-report'
analyticsdx-vscode-license-report.csv

2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.15.0
v22.22.1
3 changes: 0 additions & 3 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
// See https://code.visualstudio.com/docs/editor/extension-gallery#_workspace-recommended-extensions
// for the documentation about the extensions.json format
"recommendations": [
// Git
"eamodio.gitlens",
"donjayamanne.githistory",
// Linters
"dbaeumer.vscode-eslint",
"ms-vscode.vscode-typescript-tslint-plugin",
Expand Down
3 changes: 1 addition & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
"search.exclude": {
"**/out": true
},
"typescript.tsdk": "./node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"js/ts.tsdk.path": "./node_modules/typescript/lib",
"editor.tabSize": 2,
"editor.formatOnSave": true,
"editor.rulers": [120],
Expand Down
2 changes: 1 addition & 1 deletion contributing/developing.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Pre-requisites

1. We are using the same version of Node that the supported release of VSCode uses (see `engines.vscode` in the
extensions' `package.json`'s, currently 18.15.0).
extensions' `package.json`'s, currently 22.22.1).
If you need to work with multiple versions of Node (e.g. for other projects), you might consider using
[nvm](https://github.com/creationix/nvm).
1. It is suggested, though not required, that you use the Insiders version of VS
Expand Down
42 changes: 21 additions & 21 deletions extensions/analyticsdx-vscode-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,40 +19,40 @@
},
"license": "BSD-3-Clause",
"engines": {
"vscode": "^1.82.0"
"vscode": "^1.120.0"
},
"categories": [
"Other"
],
"dependencies": {
"@salesforce/salesforcedx-utils-vscode": "file:../../lib/salesforcedx-utils-vscode.tgz",
"@salesforce/templates": "54.7.0",
"glob": "10.3.10",
"semver": "7.5.4",
"tmp": "0.2.1",
"which": "4.0.0"
"@salesforce/templates": "66.7.13",
"glob": "13.0.6",
"semver": "7.8.0",
"tmp": "0.2.5",
"which": "6.0.1"
},
"devDependencies": {
"@salesforce/analyticsdx-test-utils-vscode": "1.2.1",
"@types/chai": "4.3.11",
"@types/glob": "8.1.0",
"@types/mocha": "10.0.6",
"@types/node": "18.11.9",
"@types/semver": "7.5.6",
"@types/sinon": "17.0.2",
"@types/chai": "4.3.20",
"@types/glob": "9.0.0",
"@types/mocha": "10.0.10",
"@types/node": "22.17.2",
"@types/semver": "7.7.1",
"@types/sinon": "21.0.1",
"@types/tmp": "0.2.6",
"@types/vscode": "1.82.0",
"@types/which": "3.0.3",
"chai": "4.3.10",
"cross-env": "7.0.3",
"mocha": "10.2.0",
"@types/vscode": "1.120.0",
"@types/which": "3.0.4",
"chai": "4.5.0",
"cross-env": "10.1.0",
"mocha": "11.7.5",
"mocha-junit-reporter": "2.2.1",
"mocha-multi-reporters": "1.5.1",
"mock-spawn": "0.2.6",
"nyc": "15.1.0",
"shx": "0.3.4",
"sinon": "17.0.1",
"typescript": "5.2.2"
"nyc": "18.0.0",
"shx": "0.4.0",
"sinon": "22.0.0",
"typescript": "6.0.3"
},
"scripts": {
"vscode:prepublish": "npm prune --production",
Expand Down
2 changes: 1 addition & 1 deletion extensions/analyticsdx-vscode-core/src/util/sfdx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { JsonArray, JsonMap } from '@salesforce/ts-types';
import * as path from 'path';
import * as semver from 'semver';
import * as vscode from 'vscode';
import * as which from 'which';
import which from 'which';
import {
BaseSfdxCommandletExecutor,
CliCommandExecutor,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class MockExtensionContext implements vscode.ExtensionContext {
public globalStorageUri!: vscode.ExtensionContext['globalStorageUri'];
public logUri!: vscode.ExtensionContext['logUri'];
public extension!: vscode.ExtensionContext['extension'];
public languageModelAccessInformation!: vscode.ExtensionContext['languageModelAccessInformation'];
public subscriptions = [];
public workspaceState!: vscode.ExtensionContext['workspaceState'];
public globalState!: vscode.ExtensionContext['globalState'];
Expand Down
3 changes: 3 additions & 0 deletions extensions/analyticsdx-vscode-core/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"declarationMap": true,
"declaration": true,
"moduleResolution": "node",
"ignoreDeprecations": "6.0",
"esModuleInterop": true,
"types": ["mocha", "node"],
"noImplicitAny": true,
"noUnusedLocals": true,
"rootDir": ".",
Expand Down
34 changes: 17 additions & 17 deletions extensions/analyticsdx-vscode-templates/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,40 +19,40 @@
},
"license": "BSD-3-Clause",
"engines": {
"vscode": "^1.82.0"
"vscode": "^1.120.0"
},
"categories": [
"Other"
],
"dependencies": {
"@salesforce/analyticsdx-template-lint": "1.2.1",
"@salesforce/salesforcedx-utils-vscode": "file:../../lib/salesforcedx-utils-vscode.tgz",
"jsonc-parser": "3.2.0",
"jsonc-parser": "3.3.1",
"lodash.isequal": "4.5.0",
"request-light": "0.7.0",
"request-light": "0.8.0",
"vscode-json-languageserver": "1.3.4",
"vscode-languageclient": "8.1.0"
"vscode-languageclient": "9.0.1"
},
"devDependencies": {
"@salesforce/analyticsdx-test-utils-vscode": "1.2.1",
"@types/chai": "4.3.11",
"@types/chai": "4.3.20",
"@types/lodash.isequal": "4.5.8",
"@types/mocha": "10.0.6",
"@types/node": "18.11.9",
"@types/sinon": "17.0.2",
"@types/mocha": "10.0.10",
"@types/node": "22.17.2",
"@types/sinon": "21.0.1",
"@types/tmp": "0.2.6",
"@types/vscode": "1.82.0",
"chai": "4.3.10",
"cross-env": "7.0.3",
"mocha": "10.2.0",
"@types/vscode": "1.120.0",
"chai": "4.5.0",
"cross-env": "10.1.0",
"mocha": "11.7.5",
"mocha-junit-reporter": "2.2.1",
"mocha-multi-reporters": "1.5.1",
"nyc": "15.1.0",
"nyc": "18.0.0",
"readdirp": "3.6.0",
"shx": "0.3.4",
"sinon": "17.0.1",
"tmp": "0.2.1",
"typescript": "5.2.2"
"shx": "0.4.0",
"sinon": "22.0.0",
"tmp": "0.2.5",
"typescript": "6.0.3"
},
"scripts": {
"vscode:prepublish": "npm prune --production",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export class TemplateLinterManager extends Disposable {
vscode.languages.createDiagnosticCollection('analyticsdx-templates')
);

private timer: NodeJS.Timer | undefined;
private timer: ReturnType<typeof setTimeout> | undefined;
private _isLinting = false;
private templateInfoQueue = new Set<vscode.TextDocument>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class MockExtensionContext implements vscode.ExtensionContext {
public globalStorageUri!: vscode.ExtensionContext['globalStorageUri'];
public logUri!: vscode.ExtensionContext['logUri'];
public extension!: vscode.ExtensionContext['extension'];
public languageModelAccessInformation!: vscode.ExtensionContext['languageModelAccessInformation'];
public subscriptions = [];
public workspaceState!: vscode.ExtensionContext['workspaceState'];
public globalState!: vscode.ExtensionContext['globalState'];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,10 @@ export async function getCodeActions(uri: vscode.Uri, range: vscode.Range): Prom
if (!result) {
expect.fail('Expected vscode.CodeAction[], got undefined');
}
return result!;
// Filter out built-in VS Code AI/Copilot actions (e.g. "Fix", "Explain", "Modify") that are
// injected by VS Code 1.120+ on diagnostics, keeping only our extension's quick fix actions.
const builtinActionTitles = new Set(['Fix', 'Explain', 'Modify']);
return result!.filter(a => !builtinActionTitles.has(a.title));
}

export async function getHovers(uri: vscode.Uri, range: vscode.Position): Promise<vscode.Hover[]> {
Expand Down
3 changes: 3 additions & 0 deletions extensions/analyticsdx-vscode-templates/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"declarationMap": true,
"declaration": true,
"moduleResolution": "node",
"ignoreDeprecations": "6.0",
"esModuleInterop": true,
"types": ["mocha", "node"],
"noImplicitAny": true,
"noUnusedLocals": true,
"rootDir": ".",
Expand Down
4 changes: 2 additions & 2 deletions extensions/analyticsdx-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
},
"license": "BSD-3-Clause",
"engines": {
"vscode": "^1.82.0"
"vscode": "^1.120.0"
},
"devDependencies": {
"shx": "0.3.4"
"shx": "0.4.0"
},
"scripts": {
"clean": "shx rm -f analyticsdx-vscode-*.vsix",
Expand Down
Loading
Loading