refactor(build): unify VS Code packaging and release profiles

.github/ci-modules.yml

@@ -40,6 +40,7 @@ package:
   - "editors/vscode/scripts/**"
   - "editors/vscode/src/**"
   - "editors/vscode/syntaxes/**"
+  - "xtask/**"
   - "packages/vide-extension-shared/**"
   - "playground/package.json"
   - "playground/package-lock.json"

.github/workflows/ci.yml

@@ -236,24 +236,21 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: editors/vscode/server/${{ matrix.target }}/${{ env.SERVER_BIN }}
-          key: bundled-server-${{ matrix.target }}-${{ hashFiles('Cargo.toml', 'Cargo.lock', 'build.rs', 'rust-toolchain.toml', 'src/**', 'crates/**') }}
+          key: bundled-server-${{ matrix.target }}-${{ hashFiles('Cargo.toml', 'Cargo.lock', 'build.rs', 'rust-toolchain.toml', 'src/**', 'crates/**', 'xtask/**') }}
       - name: Install Rust
-        if: steps.bundled-server-cache.outputs.cache-hit != 'true'
         uses: ./.github/actions/setup-rust
         with:
           components: rustfmt
       - name: Setup sccache
-        if: steps.bundled-server-cache.outputs.cache-hit != 'true'
         uses: ./.github/actions/setup-sccache
         with:
           cmake-launcher: "true"
       - name: Rust Cache
-        if: steps.bundled-server-cache.outputs.cache-hit != 'true'
         uses: Swatinem/rust-cache@v2
         continue-on-error: true
         with:
           shared-key: rust-${{ runner.os }}
-          key: package-${{ hashFiles('Cargo.toml', 'Cargo.lock', 'build.rs', 'rust-toolchain.toml', 'src/**', 'crates/**') }}
+          key: package-${{ hashFiles('Cargo.toml', 'Cargo.lock', 'build.rs', 'rust-toolchain.toml', 'src/**', 'crates/**', 'xtask/**') }}
           cache-workspace-crates: true
           cache-on-failure: true
       - name: Setup Node
@@ -274,7 +271,7 @@ jobs:
           echo "VIDE_EXTENSION_COMMIT_HASH=${commit_hash}" >> "$GITHUB_ENV"
           echo "VIDE_EXTENSION_BUILD_DATE=$(date -u +'%Y%m%dT%H%M%SZ')" >> "$GITHUB_ENV"
       - name: Package extension
-        run: npm run package:debug -- ${{ matrix.target }} ${{ steps.bundled-server-cache.outputs.cache-hit == 'true' && '--server=prebuilt' || '--server=build' }}
+        run: npm run package:vsix:debug -- --target ${{ matrix.target }} ${{ steps.bundled-server-cache.outputs.cache-hit == 'true' && '--server=prebuilt' || '--server=build' }}
       - name: Save bundled server cache
         if: steps.bundled-server-cache.outputs.cache-hit != 'true'
         uses: actions/cache/save@v4
@@ -394,7 +391,7 @@ jobs:
           echo "VIDE_EXTENSION_COMMIT_HASH=${commit_hash}" >> "$GITHUB_ENV"
           echo "VIDE_EXTENSION_BUILD_DATE=$(date -u +'%Y%m%dT%H%M%SZ')" >> "$GITHUB_ENV"
       - name: Package extension
-        run: npm run package:web
+        run: npm run package:vsix:web
       - name: Upload dev VSIX
         uses: actions/upload-artifact@v4
         with:
@@ -437,28 +434,25 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: editors/vscode/server/${{ matrix.target }}/${{ env.SERVER_BIN }}
-          key: bundled-server-${{ matrix.target }}-${{ hashFiles('Cargo.toml', 'Cargo.lock', 'build.rs', 'rust-toolchain.toml', 'src/**', 'crates/**') }}
+          key: bundled-server-${{ matrix.target }}-${{ hashFiles('Cargo.toml', 'Cargo.lock', 'build.rs', 'rust-toolchain.toml', 'src/**', 'crates/**', 'xtask/**') }}
 
       - name: Install Rust
-        if: steps.bundled-server-cache.outputs.cache-hit != 'true'
         uses: ./.github/actions/setup-rust
         with:
           components: rustfmt
           targets: ${{ matrix.rust-target }}
 
       - name: Setup sccache
-        if: steps.bundled-server-cache.outputs.cache-hit != 'true'
         uses: ./.github/actions/setup-sccache
         with:
           cmake-launcher: "true"
 
       - name: Rust Cache
-        if: steps.bundled-server-cache.outputs.cache-hit != 'true'
         uses: Swatinem/rust-cache@v2
         continue-on-error: true
         with:
           shared-key: rust-${{ runner.os }}-${{ matrix.target }}
-          key: package-${{ hashFiles('Cargo.toml', 'Cargo.lock', 'build.rs', 'rust-toolchain.toml', 'src/**', 'crates/**') }}
+          key: package-${{ hashFiles('Cargo.toml', 'Cargo.lock', 'build.rs', 'rust-toolchain.toml', 'src/**', 'crates/**', 'xtask/**') }}
           cache-workspace-crates: true
           cache-on-failure: true
 
@@ -484,7 +478,7 @@ jobs:
           echo "VIDE_EXTENSION_BUILD_DATE=$(date -u +'%Y%m%dT%H%M%SZ')" >> "$GITHUB_ENV"
 
       - name: Package extension
-        run: npm run package:debug -- ${{ matrix.target }} ${{ steps.bundled-server-cache.outputs.cache-hit == 'true' && '--server=prebuilt' || '--server=build' }}
+        run: npm run package:vsix:debug -- --target ${{ matrix.target }} ${{ steps.bundled-server-cache.outputs.cache-hit == 'true' && '--server=prebuilt' || '--server=build' }}
 
       - name: Save bundled server cache
         if: steps.bundled-server-cache.outputs.cache-hit != 'true'

.github/workflows/release.yml

@@ -15,6 +15,7 @@ concurrency:
 
 env:
   EMSDK_VERSION: 5.0.2
+  CARGO_PROFILE_RELEASE_INCREMENTAL: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && 'false' || 'true' }}
 
 jobs:
   changelog:
@@ -81,7 +82,7 @@ jobs:
         continue-on-error: true
         with:
           shared-key: rust-${{ runner.os }}
-          key: package-${{ hashFiles('Cargo.toml', 'Cargo.lock', 'build.rs', 'rust-toolchain.toml', 'src/**', 'crates/**') }}
+          key: package-${{ hashFiles('Cargo.toml', 'Cargo.lock', 'build.rs', 'rust-toolchain.toml', 'src/**', 'crates/**', 'xtask/**') }}
           cache-workspace-crates: true
           cache-on-failure: true
 
@@ -92,6 +93,20 @@ jobs:
           cache: npm
           cache-dependency-path: editors/vscode/package-lock.json
 
+      - name: Setup Rust
+        uses: ./.github/actions/setup-rust
+        with:
+          components: rustfmt
+
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+        continue-on-error: true
+        with:
+          shared-key: rust-${{ runner.os }}
+          key: package-linux-x64-prebuilt-${{ hashFiles('Cargo.toml', 'Cargo.lock', 'build.rs', 'rust-toolchain.toml', 'src/**', 'crates/**', 'xtask/**') }}
+          cache-workspace-crates: true
+          cache-on-failure: true
+
       - name: Install JS dependencies
         working-directory: editors/vscode
         run: npm ci
@@ -109,7 +124,7 @@ jobs:
 
       - name: Build VSIX
         working-directory: editors/vscode
-        run: npm run package:${{ matrix.target }}
+        run: npm run package:vsix -- --target ${{ matrix.target }}
 
       - name: Upload VSIX
         uses: actions/upload-artifact@v4
@@ -192,6 +207,7 @@ jobs:
 
           docker run --rm \
             -e CARGO_TARGET_DIR="${CARGO_TARGET_DIR}" \
+            -e CARGO_PROFILE_RELEASE_INCREMENTAL="${CARGO_PROFILE_RELEASE_INCREMENTAL}" \
             -v "${GITHUB_WORKSPACE}:/workspace" \
             -v "${build_script}:/tmp/build-linux-x64-manylinux2014.sh:ro" \
             -w /workspace \
@@ -247,9 +263,7 @@ jobs:
 
       - name: Build VSIX
         working-directory: editors/vscode
-        run: |
-          npm run compile
-          ./node_modules/.bin/tsx scripts/package.ts linux-x64 --server=prebuilt
+        run: npm run package:vsix -- --target linux-x64 --server=prebuilt
 
       - name: Upload VSIX
         uses: actions/upload-artifact@v4
@@ -302,7 +316,7 @@ jobs:
         continue-on-error: true
         with:
           shared-key: rust-${{ runner.os }}-${{ matrix.target }}
-          key: package-${{ hashFiles('Cargo.toml', 'Cargo.lock', 'build.rs', 'rust-toolchain.toml', 'src/**', 'crates/**') }}
+          key: package-${{ hashFiles('Cargo.toml', 'Cargo.lock', 'build.rs', 'rust-toolchain.toml', 'src/**', 'crates/**', 'xtask/**') }}
           cache-workspace-crates: true
           cache-on-failure: true
 
@@ -330,7 +344,7 @@ jobs:
 
       - name: Build VSIX
         working-directory: editors/vscode
-        run: npm run package:${{ matrix.target }}
+        run: npm run package:vsix -- --target ${{ matrix.target }}
 
       - name: Upload VSIX
         uses: actions/upload-artifact@v4
@@ -450,7 +464,7 @@ jobs:
           fi
 
       - name: Build VSIX
-        run: npm run package:web
+        run: npm run package:vsix:web
 
       - name: Upload VSIX
         uses: actions/upload-artifact@v4

Cargo.toml

@@ -27,7 +27,7 @@ vfs.workspace = true
 
 always-assert.workspace = true
 anyhow.workspace = true
-clap = { version = "4.4.6", features = ["derive"] }
+clap.workspace = true
 const_format.workspace = true
 crossbeam-channel.workspace = true
 dunce.workspace = true
@@ -46,7 +46,7 @@ schemars = { version = "1.2.1", features = ["preserve_order"], optional = true }
 thiserror.workspace = true
 toml.workspace = true
 tracing-subscriber = { version = "0.3.17", default-features = false, features = ["registry", "fmt", "tracing-log",] }
-tracing-chrome = "0.7.2"
+tracing-chrome = { version = "0.7.2", optional = true }
 tracing.workspace = true
 triomphe.workspace = true
 
@@ -68,6 +68,7 @@ always-assert = "0.1.3"
 anyhow = "1.0.75"
 bitflags = "2.9.0"
 camino = "1.1.6"
+clap = { version = "4.4.6", features = ["derive"] }
 const_format = "0.2.31"
 crossbeam-channel = "0.5.8"
 dunce = "1.0.5"
@@ -115,6 +116,8 @@ salsa.opt-level = 3
 incremental = true
 debug = 0
 strip = "symbols"
+lto = "thin"
+codegen-units = 1
 
 [profile.release-lto]
 inherits = "release"
@@ -127,4 +130,5 @@ winapi.workspace = true
 utils = { workspace = true, features = ["test-support"] }
 
 [features]
+profile-trace = ["dep:tracing-chrome"]
 user-config-schema = ["dep:schemars"]

crates/hir/Cargo.toml

@@ -14,6 +14,7 @@ salsa.workspace = true
 smallvec.workspace = true
 smol_str.workspace = true
 syntax.workspace = true
+toml.workspace = true
 tracing.workspace = true
 triomphe.workspace = true
 utils.workspace = true

crates/hir/src/base_db/compilation_plan.rs

@@ -1,4 +1,4 @@
-use preproc::source::{MacroIncludeTarget, SourcePreprocModel};
+use preproc::source::{MacroIncludeTarget, SourcePreprocError, SourcePreprocModel};
 use rustc_hash::FxHashSet;
 use syntax::{SyntaxTree, SyntaxTreeBuffer, SyntaxTreeOptions};
 use utils::{
@@ -24,6 +24,19 @@ pub struct CompilationPlan {
     pub include_dirs: Vec<AbsPathBuf>,
     pub top_modules: Vec<String>,
     pub predefines: Vec<String>,
+    pub include_scan_issues: Vec<IncludeScanIssue>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct IncludeScanIssue {
+    pub file_id: FileId,
+    pub reason: IncludeScanIssueReason,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum IncludeScanIssueReason {
+    TraceUnavailable,
+    Model(SourcePreprocError),
 }
 
 impl CompilationPlan {
@@ -59,10 +72,18 @@ impl CompilationPlan {
         include_dirs: Vec<AbsPathBuf>,
         predefines: Vec<String>,
     ) -> Self {
-        let include_only =
+        let (include_only, include_scan_issues) =
             include_targets_for_source_roots(db, &source_roots, &include_dirs, &predefines);
         let roots = compile_roots_for_source_roots(db, &source_roots, &include_only);
-        CompilationPlan { source_roots, roots, include_only, include_dirs, top_modules, predefines }
+        CompilationPlan {
+            source_roots,
+            roots,
+            include_only,
+            include_dirs,
+            top_modules,
+            predefines,
+            include_scan_issues,
+        }
     }
 }
 
@@ -140,17 +161,13 @@ fn profile_inputs(
             profile.source_roots.clone(),
             profile.top_modules.clone(),
             profile.preprocess.include_dirs.clone(),
-            profile.preprocess.predefines.clone(),
+            profile.preprocess.predefine_strings(),
         );
     }
 
     let preprocess = project_config.preprocess_for_profile(profile_id);
-    (
-        root_scoped_source_root.into_iter().collect(),
-        Vec::new(),
-        preprocess.include_dirs,
-        preprocess.predefines,
-    )
+    let predefines = preprocess.predefine_strings();
+    (root_scoped_source_root.into_iter().collect(), Vec::new(), preprocess.include_dirs, predefines)
 }
 
 fn all_non_ignored_roots(db: &dyn SourceRootDb) -> Vec<SourceRootId> {
@@ -216,9 +233,10 @@ fn include_targets_for_source_roots(
     roots: &[SourceRootId],
     include_dirs: &[AbsPathBuf],
     predefines: &[String],
-) -> FxHashSet<FileId> {
+) -> (FxHashSet<FileId>, Vec<IncludeScanIssue>) {
     let path_file_ids = path_file_ids(db);
     let mut included = FxHashSet::default();
+    let mut issues = Vec::new();
     let mut scanned = FxHashSet::default();
     let mut pending = Vec::new();
     for root_id in roots {
@@ -243,7 +261,14 @@ fn include_targets_for_source_roots(
             continue;
         };
 
-        for include in literal_include_targets(db, file_id, predefines) {
+        let include_targets = match literal_include_targets(db, file_id, predefines) {
+            Ok(targets) => targets,
+            Err(issue) => {
+                issues.push(issue);
+                continue;
+            }
+        };
+        for include in include_targets {
             let MacroIncludeTarget::Literal { path, .. } = &include.target else {
                 continue;
             };
@@ -256,19 +281,19 @@ fn include_targets_for_source_roots(
         }
     }
 
-    included
+    (included, issues)
 }
 
 fn literal_include_targets(
     db: &dyn SourceRootDb,
     file_id: FileId,
     predefines: &[String],
-) -> Vec<preproc::source::SourceMacroInclude> {
+) -> Result<Vec<preproc::source::SourceMacroInclude>, IncludeScanIssue> {
     if !matches!(
         db.file_kind(file_id),
         SourceFileKind::SystemVerilog | SourceFileKind::IncludeHeader
     ) {
-        return Vec::new();
+        return Ok(Vec::new());
     }
 
     let path = db.file_path(file_id).map(|path| path.to_string()).unwrap_or_default();
@@ -277,15 +302,18 @@ fn literal_include_targets(
         predefines: predefines.to_vec(),
         ..SyntaxTreeOptions::without_include_expansion()
     };
-    let Some(trace) =
-        SyntaxTree::preprocessor_trace(&db.file_text(file_id), &name, &path, &options)
-    else {
-        return Vec::new();
-    };
-    let Ok(model) = SourcePreprocModel::from_trace(trace) else {
-        return Vec::new();
+    let parsed = SyntaxTree::from_text_with_options_and_trace(
+        &db.file_text(file_id),
+        &name,
+        &path,
+        &options,
+    );
+    let Some(trace) = parsed.preprocessor_trace else {
+        return Err(IncludeScanIssue { file_id, reason: IncludeScanIssueReason::TraceUnavailable });
     };
-    model.includes().to_vec()
+    let model = SourcePreprocModel::from_trace(trace)
+        .map_err(|err| IncludeScanIssue { file_id, reason: IncludeScanIssueReason::Model(err) })?;
+    Ok(model.includes().to_vec())
 }
 
 fn resolve_include_target(