7b1da21c99
For a delegated property `var x: Int by ResourceDelegate()` the two
frontend paths anchor the synthesised delegate locations differently:
- K1 (-language-version 1.9) starts them at the `by` keyword.
- K2 (default) starts them at the delegate expression itself
(e.g. `ResourceDelegate()`), three columns later (`by ` excluded).
The `by` keyword is syntactic glue joining the property to its delegate,
not part of the expression that is evaluated and stored, so K2's narrower
range is the more intuitive one. An existing remap already converged the
delegated-accessor *body* expressions onto the K2 span; this commit
converges the two remaining sites.
1. The `$delegate` backing field. `getDelegateFieldLocation` recovers the
delegate expression's range from the enclosing `KtProperty` via PSI
(available under K1; null under K2, where the raw offsets already
exclude `by`) and is used both for the field's declaration location
(extractField) and for its initializer assignment / lhs access
(extractFieldInitializer's declLocId). It fires only for a delegated
property's own backing field (`isDelegated` and `backingField === f`).
2. Local delegated properties. The `provideDelegate(...)` call and its
`KProperty` argument in the delegate variable's initializer span the
whole `by <expr>` range under K1; the `IrLocalDelegatedProperty`
branch now applies the same `scopedOffsetRemap` used for accessor
bodies while extracting that variable.
The shared PSI walk is factored into `getEnclosingKtProperty` and a
`KtProperty`-keyed `getDelegateExpressionOffsetRemap` overload.
Result: test-kotlin1 and test-kotlin2 exprs/delegatedProperties.expected
and exprs/funcExprs.expected are now byte-identical. exprs/exprs.expected
and methods/exprs.expected have their delegate rows converged (remaining
diffs in those two files are unrelated mechanisms: implicit-cast nodes and
the property-type / setter-parameter spans, addressed separately). All
3333 tests pass in both suites (K1 2.3.20 / lang 1.9 and K2 2.4.0 /
lang 2.0).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CodeQL
This open source repository contains the standard CodeQL libraries and queries that power GitHub Advanced Security and the other application security products that GitHub makes available to its customers worldwide.
How do I learn CodeQL and run queries?
There is extensive documentation about the CodeQL language, writing CodeQL using the CodeQL extension for Visual Studio Code and using the CodeQL CLI.
Contributing
We welcome contributions to our standard library and standard checks. Do you have an idea for a new check, or how to improve an existing query? Then please go ahead and open a pull request! Before you do, though, please take the time to read our contributing guidelines. You can also consult our style guides to learn how to format your code for consistency and clarity, how to write query metadata, and how to write query help documentation for your query.
For information on contributing to CodeQL documentation, see the "contributing guide" for docs.
License
The code in this repository is licensed under the MIT License by GitHub.
The CodeQL CLI (including the CodeQL engine) is hosted in a different repository and is licensed separately. If you'd like to use the CodeQL CLI to analyze closed-source code, you will need a separate commercial license; please contact us for further help.
Visual Studio Code integration
If you use Visual Studio Code to work in this repository, there are a few integration features to make development easier.
CodeQL for Visual Studio Code
You can install the CodeQL for Visual Studio Code extension to get syntax highlighting, IntelliSense, and code navigation for the QL language, as well as unit test support for testing CodeQL libraries and queries.
Tasks
The .vscode/tasks.json file defines custom tasks specific to working in this repository. To invoke one of these tasks, select the Terminal | Run Task... menu option, and then select the desired task from the dropdown. You can also invoke the Tasks: Run Task command from the command palette.