Skip to content

Update IJ Aspects #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guw wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Update IJ Aspects #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4270aba
Update IJ Aspects
guw Feb 18, 2026
0530d0e
Update MODULE.bazel.lock file
guw Feb 18, 2026
610460d
Clean server
guw Feb 18, 2026
524d3f6
Add missing template
guw Feb 18, 2026
f3f674b
Fix test
guw Feb 18, 2026
9f5aac3
Of course one needed to be special
guw Feb 18, 2026
6e792b0
Re-install extension
guw Feb 18, 2026
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 bundles/com.salesforce.bazel.sdk/aspects/import/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.3.1
8.5.1
51 changes: 24 additions & 27 deletions bundles/com.salesforce.bazel.sdk/aspects/import/MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bundles/com.salesforce.bazel.sdk/aspects/import/import-and-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fi
# 2. check it builds (dependencies exist)
# 3. update com.salesforce.bazel.sdk.aspects.intellij.IntellijAspects.ASPECTS_VERSION
#
git_sha="3f0edce7702ced14ed26c026b79ae1cd26467749"
git_sha="87d40e651676a170fcb8dad5bcf2b1e3ffb376da"
git_sha_short=${git_sha::6}

# abort if file already exists
Expand Down
34 changes: 9 additions & 25 deletions ...m.salesforce.bazel.sdk/src/com/salesforce/bazel/sdk/aspects/intellij/IntellijAspects.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public boolean isPrefixOf(String outputGroupName) {

public static final String OUTPUT_GROUP_JAVA_RUNTIME_CLASSPATH = "runtime_classpath";

public static final String ASPECTS_VERSION = "3f0edc";
public static final String ASPECTS_VERSION = "87d40e";
public static final Predicate<String> ASPECT_OUTPUT_FILE_PREDICATE = str -> str.endsWith(".intellij-info.txt");

private static String getLanguageSuffix(LanguageClass language) {
Expand Down Expand Up @@ -139,36 +139,20 @@ public void copyIntoWorkspace(Path workspaceRoot, BazelVersion bazelVersion) thr

// copy templates
var templateOptions = getTemplateOptions(bazelVersion);
writeTemplateToWorkspace(
targetDirectory,
"java_info.bzl",
ASPECT_TEMPLATE_DIRECTORY,
"java_info.template.bzl",
templateOptions);
writeTemplateToWorkspace(
targetDirectory,
"python_info.bzl",
ASPECT_TEMPLATE_DIRECTORY,
"python_info.template.bzl",
templateOptions);
for (var name : List.of("java_info", "scala_info", "python_info", "code_generator_info", "cc_info")) {
writeTemplateToWorkspace(
targetDirectory,
name + ".bzl",
ASPECT_TEMPLATE_DIRECTORY,
name + ".template.bzl",
templateOptions);
}
writeTemplateToWorkspace(
targetDirectory,
"intellij_info_bundled.bzl",
ASPECT_TEMPLATE_DIRECTORY,
"intellij_info.template.bzl",
templateOptions);
writeTemplateToWorkspace(
targetDirectory,
"code_generator_info.bzl",
ASPECT_TEMPLATE_DIRECTORY,
"code_generator_info.template.bzl",
templateOptions);
writeTemplateToWorkspace(
targetDirectory,
"cc_info.bzl",
ASPECT_TEMPLATE_DIRECTORY,
"cc_info.template.bzl",
templateOptions);
}

String getAspectsArchiveLocation() {
Expand Down
34 changes: 17 additions & 17 deletions vscode/.vscode-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
const { defineConfig } = require('@vscode/test-cli');

module.exports = defineConfig([
{
installExtensions: ['redhat.java@prerelease'],
workspaceFolder: 'test/projects/small',
files: 'out/test/**/*.test.js',
mocha: {
ui: 'tdd',
timeout: 60000,
reporter: 'json',
reporterOptions: {
output: './test/result/extension.test.json',
reportDir: './test/result',
reportFilename: "[status]_[datetime]-[name]-report",
reportTitle: 'Bazel Eclipse Extension Tests',
reportPageTitle: 'Bazel Eclipse Extension Tests',
},
}
}
{
installExtensions: ['redhat.java@prerelease'],
workspaceFolder: 'test/projects/small',
files: 'out/test/**/*.test.js',
mocha: {
ui: 'tdd',
timeout: 60000,
reporter: 'json',
reporterOptions: {
output: './test/result/extension.test.json',
reportDir: './test/result',
reportFilename: '[status]_[datetime]-[name]-report',
reportTitle: 'Bazel Eclipse Extension Tests',
reportPageTitle: 'Bazel Eclipse Extension Tests',
},
},
},
]);
7 changes: 4 additions & 3 deletions vscode/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"bugs": "https://github.com/eclipseguru/bazel-eclipse/issues",
"preview": true,
"engines": {
"node": "^22.20.0",
"vscode": "^1.106.0"
"node": "^22.21.1",
"vscode": "^1.109.0"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -326,7 +326,7 @@
"vscode:prepublish": "run-s clean esbuild:base -- --minify",
"build": "run-s clean build:server esbuild:base",
"build:server": "node scripts/index.mjs build-or-download",
"clean": "npx rimraf out meta.json stats.html *.vsix test/result",
"clean": "npx rimraf out meta.json stats.html *.vsix test/result server",
"esbuild:base": "tsx build.ts",
"esbuild:watch": "npm run esbuild:base -- --sourcemap --watch",
"analyze": "npm run esbuild:base -- --minify --metafile --analyze && esbuild-visualizer --metadata ./meta.json --open",
Expand All @@ -336,6 +336,7 @@
"test:compile": "tsc -b ./test/tsconfig.json",
"test:lint": "eslint --ext .js,.ts,.tsx src",
"test:repo": "node scripts/index.mjs repo-check",
"test:bazel-example-works": "cd test/projects/small && bazel test //...",
"test:extension": "vscode-test",
"package": "run-s clean build vsce:package",
"vsce:package": "npx vsce package --no-dependencies"
Expand Down
Loading
Loading