mirror of
https://github.com/abhigyanpatwari/GitNexus.git
synced 2026-08-28 05:25:25 +00:00
* fix(swift): preprocess indented conditional directives so class bodies survive parsing * fix(swift): make conditional-directive blanking comment-, string- and brace-aware (#2771) Addresses the review findings on PR #2771. The transform fired unconditionally, which turned valid Swift into parse errors while missing the most common shape it was written for. - The blank/keep decision now consults `blockCommentDepth`, so ` #endif */` — the result of commenting out a conditional block — keeps its comment terminator. Previously `hasError` went raw=false -> preprocessed=true and the rest of the file was swallowed. - The decision keys on the scanner's brace depth instead of indentation. A column-0 `#if` inside a class body is blanked (6 of 7 body shapes previously still lost the enclosing declaration) and an indented file-scope directive is not — matching what the doc comment already claimed. Bare-CR line endings, NBSP/ideographic indentation and a leading BOM are recognized too. - A group is blanked only when every branch is brace-balanced. An `#if`/`#else` that splits a declaration header leaves one unmatched `{` once both branches survive, which collapsed five top-level nodes into one and gave unrelated types fabricated `NetworkClient.` qualified names. Such a group now degrades to the pre-fix behavior. - Multiline strings honour `\"""` escapes, and a plain `"""` closes even when a `#` follows it, so the scanner no longer wedges in string state and silently stops blanking for the rest of the file. - The pound run is counted once per position and skipped. It was quadratic: 10.6s for one 64k-`#` line, well inside the 512 KB walker limit. - Extended regex literals (`#/.../#`) no longer open a phantom block comment. - Directive-free files return early, matching `stripUeMacros`. Worker parity: `emitSwiftScopeCaptures` and `emitCppScopeCaptures` re-apply their provider's `preprocessSource` on the parse-cache-miss path — Dart already did this — and the embedding parse in `ensureAndParse` applies the hook as well. Before this the worker and the scope-capture/embedding halves analyzed different programs, turning a consistent degradation into cold-run/warm-run non-determinism. A new parity test pins the equivalence for every provider that defines the hook. SCHEMA_BUMP 37 -> 38: this changes parse semantics, the chunk key hashes raw on-disk bytes, and `preprocessSource` runs after the key is computed — so a same-package-version warm cache would replay pre-fix Swift results verbatim, including across `--force`. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(ingestion): apply preprocessSource once in the scope bridge (#2771) Follow-up cleanup on the review fixes. The previous commit re-applied each provider's `preprocessSource` inside `emitSwiftScopeCaptures` and `emitCppScopeCaptures`, mirroring what Dart already did — three copies of the same rule, and a contract that asked every future emitter to remember it. `extractParsedFile` is the single funnel every `emitScopeCaptures` caller passes through (parse worker, scope-resolution run, Vue script extraction), and it already receives the provider. Applying the hook there on the cache-miss path covers all three languages and every future one, names no language in shared code, and drops Dart's unconditional transform on the cache-hit path. Verified the three emitters use `sourceText` for nothing but the parse, so the substitution is output-identical — which the parity test asserts directly. Also from the cleanup pass: - the parity test derives its language list from the provider registry, so a new provider adopting the hook fails until it adds a fixture - `ensureAndParse` resolves the provider from the language it already computed, instead of a second extension table (`getProviderForFile`) - the preprocessor returns `sourceText` unchanged when no group was blanked, which is the common case for files whose only directives are top-level - `split(/(\r\n|\n|\r)/)` replaces the hand-rolled line splitter, and the per-group brace bookkeeping is two scalars instead of an array - the hint regex is derived from the line regex so the two cannot drift - unit assertions compare the WHOLE preprocessed file against the expected blanking, replacing per-line spot checks; the pipeline tests share one `runFixture` helper and `getNodesForFile` in the resolver test helpers - `LanguageProvider.preprocessSource` documents the real call sites and says plainly that the set is not closed — `populateRangeBindings` still hands language helpers raw text Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * chore(autofix): apply prettier + eslint fixes via /autofix command --------- Co-authored-by: Gergő Magyar <gergomagyar@icloud.com> Co-authored-by: Gergo Magyar <gergomagyar0@gmail.com> Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
87 lines
3.2 KiB
TypeScript
87 lines
3.2 KiB
TypeScript
import { describe, expect, it } from 'vitest';
|
|
import { SupportedLanguages } from 'gitnexus-shared';
|
|
import { providers, getProvider } from '../../src/core/ingestion/languages/index.js';
|
|
import { extractParsedFile } from '../../src/core/ingestion/scope-extractor-bridge.js';
|
|
import { isLanguageAvailable } from '../../src/core/tree-sitter/parser-loader.js';
|
|
import { ensureAndParse } from '../../src/core/embeddings/ast-utils.js';
|
|
|
|
/**
|
|
* Every provider that defines `preprocessSource` must produce the same
|
|
* `ParsedFile` whether it is handed raw source or already-preprocessed source.
|
|
*
|
|
* The parse worker applies the hook, but `emitScopeCaptures` re-parses on a
|
|
* parse-cache miss and the embedding pipeline parses independently — so unless
|
|
* those paths see the same transform the halves of the pipeline analyze
|
|
* different programs and the graph depends on whether the run was warm (#2771).
|
|
*
|
|
* Fixtures are keyed by language and cross-checked against the registry, so a
|
|
* new provider adopting the hook fails here until it adds one.
|
|
*/
|
|
const FIXTURES: Partial<Record<SupportedLanguages, { filePath: string; source: string }>> = {
|
|
[SupportedLanguages.Swift]: {
|
|
filePath: 'Fixture.swift',
|
|
source: [
|
|
'class Outer {',
|
|
' enum A { case x }',
|
|
' #if os(iOS)',
|
|
' enum B { case y }',
|
|
' #endif',
|
|
'}',
|
|
'',
|
|
].join('\n'),
|
|
},
|
|
[SupportedLanguages.CPlusPlus]: {
|
|
filePath: 'Actor.cpp',
|
|
source: [
|
|
'UCLASS()',
|
|
'class MYGAME_API AGameActor : public AActor {',
|
|
' GENERATED_BODY()',
|
|
'public:',
|
|
' UPROPERTY(EditAnywhere) int Health;',
|
|
' UFUNCTION(BlueprintCallable) void Tick(float DeltaTime) { Health = 1; }',
|
|
'};',
|
|
'',
|
|
].join('\n'),
|
|
},
|
|
[SupportedLanguages.Dart]: {
|
|
filePath: 'meters.dart',
|
|
source: ['extension type Meters(int value) {', ' int get raw => value;', '}', ''].join('\n'),
|
|
},
|
|
};
|
|
|
|
const languagesWithHook = Object.entries(providers)
|
|
.filter(([, provider]) => provider.preprocessSource !== undefined)
|
|
.map(([language]) => language)
|
|
.sort();
|
|
|
|
describe('LanguageProvider.preprocessSource parity', () => {
|
|
it('has a fixture for every provider defining the hook', () => {
|
|
expect(Object.keys(FIXTURES).sort()).toEqual(languagesWithHook);
|
|
});
|
|
|
|
describe.each(languagesWithHook)('%s', (language) => {
|
|
const provider = getProvider(language as SupportedLanguages);
|
|
const { filePath, source } = FIXTURES[language as SupportedLanguages]!;
|
|
|
|
describe.skipIf(!isLanguageAvailable(language as SupportedLanguages))(
|
|
'with the grammar',
|
|
() => {
|
|
it('extracts the same ParsedFile from raw and preprocessed source', () => {
|
|
const preprocessed = provider.preprocessSource!(source, filePath);
|
|
|
|
expect(preprocessed).not.toBe(source);
|
|
expect(preprocessed).toHaveLength(source.length);
|
|
expect(extractParsedFile(provider, source, filePath, () => {})).toEqual(
|
|
extractParsedFile(provider, preprocessed, filePath, () => {}),
|
|
);
|
|
});
|
|
|
|
it('parses the preprocessed text on the embedding path too', async () => {
|
|
const tree = await ensureAndParse(source, filePath);
|
|
|
|
expect(tree.rootNode.hasError).toBe(false);
|
|
});
|
|
},
|
|
);
|
|
});
|
|
});
|