Compare commits
31
Commits
3ef68d8bb4
..
1.2.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
75723adbbc | ||
|
|
b7fe04d65f | ||
|
|
ec28b219f3 | ||
|
|
6fa57c8197 | ||
|
|
2d2a74656c | ||
|
|
80933c287d | ||
|
|
017111827d | ||
|
|
d2632cb99e | ||
|
|
474293cfe3 | ||
|
|
9924d02cb4 | ||
|
|
1efa96a990 | ||
|
|
f6deabaa38 | ||
|
|
8f04b25fcb | ||
|
|
6b957ae6a3 | ||
|
|
827df9c8cd | ||
|
|
7ab439d949 | ||
|
|
91e6ae29ce | ||
|
|
b9831a422a | ||
|
|
10b7cb2db2 | ||
|
|
1931384116 | ||
|
|
2acb60697d | ||
|
|
c12804a806 | ||
|
|
1d089db9ff | ||
|
|
2ce6d8e482 | ||
|
|
eda34c1b3d | ||
|
|
2c0a6c7b34 | ||
|
|
fe5dded7af | ||
|
|
aba0048a83 | ||
|
|
fdc044d1e0 | ||
|
|
44675b976d | ||
|
|
3941ddee40 |
No files matched your search
@@ -26,3 +26,4 @@ debug.log
|
|||||||
/check_output.txt
|
/check_output.txt
|
||||||
/compile_jvm_output.txt
|
/compile_jvm_output.txt
|
||||||
/compile_metadata_output.txt
|
/compile_metadata_output.txt
|
||||||
|
test_output*.txt
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
# Lyng Project Guidelines
|
||||||
|
|
||||||
|
This project uses the Lyng scripting language for multiplatform scripting.
|
||||||
|
|
||||||
|
## Coding in Lyng
|
||||||
|
When writing, refactoring, or analyzing Lyng code:
|
||||||
|
- **Reference**: Always use `LYNG_AI_SPEC.md` in the project root as the primary source of truth for syntax and idioms.
|
||||||
|
- **File Extensions**: Use `.lyng` for all script files.
|
||||||
|
- **Implicit Coroutines**: Remember that all Lyng functions are implicitly coroutines; do not look for `async/await`.
|
||||||
|
- **Everything is an Expression**: Leverage the fact that blocks, if-statements, and loops return values.
|
||||||
|
- **Maps vs Blocks**: Be careful: `{}` is a block/lambda, use `Map()` for an empty map.
|
||||||
@@ -21,6 +21,12 @@
|
|||||||
- MI Satisfaction: Abstract requirements are automatically satisfied by matching concrete members found later in the C3 MRO chain without requiring explicit proxy methods.
|
- MI Satisfaction: Abstract requirements are automatically satisfied by matching concrete members found later in the C3 MRO chain without requiring explicit proxy methods.
|
||||||
- Integration: Updated highlighters (lynglib, lyngweb, IDEA plugin), IDEA completion, and Grazie grammar checking.
|
- Integration: Updated highlighters (lynglib, lyngweb, IDEA plugin), IDEA completion, and Grazie grammar checking.
|
||||||
- Documentation: Updated `docs/OOP.md` with sections on "Abstract Classes and Members", "Interfaces", and "Overriding and Virtual Dispatch".
|
- Documentation: Updated `docs/OOP.md` with sections on "Abstract Classes and Members", "Interfaces", and "Overriding and Virtual Dispatch".
|
||||||
|
- IDEA plugin: Improved natural language support and spellchecking
|
||||||
|
- Disabled the limited built-in English and Technical dictionaries.
|
||||||
|
- Enforced usage of the platform's standard Natural Languages (Grazie) and Spellchecker components.
|
||||||
|
- Integrated `SpellCheckerManager` for word suggestions and validation, respecting users' personal and project dictionaries.
|
||||||
|
- Added project-specific "learned words" support via `Lyng Formatter` settings and quick-fixes.
|
||||||
|
- Enhanced fallback spellchecker for technical terms and Lyng-specific vocabulary.
|
||||||
|
|
||||||
- Language: Class properties with accessors
|
- Language: Class properties with accessors
|
||||||
- Support for `val` (read-only) and `var` (read-write) properties in classes.
|
- Support for `val` (read-only) and `var` (read-write) properties in classes.
|
||||||
|
|||||||
+105
@@ -0,0 +1,105 @@
|
|||||||
|
# Lyng Language AI Specification (V1.3)
|
||||||
|
|
||||||
|
High-density specification for LLMs. Reference this for all Lyng code generation.
|
||||||
|
|
||||||
|
## 1. Core Philosophy & Syntax
|
||||||
|
- **Everything is an Expression**: Blocks, `if`, `when`, `for`, `while`, `do-while` return their last expression (or `void`).
|
||||||
|
- **Loops with `else`**: `for`, `while`, and `do-while` support an optional `else` block.
|
||||||
|
- `else` executes **only if** the loop finishes normally (without a `break`).
|
||||||
|
- `break <value>` exits the loop and sets its return value.
|
||||||
|
- Loop Return Value:
|
||||||
|
1. Value from `break <value>`.
|
||||||
|
2. Result of `else` block (if loop finished normally and `else` exists).
|
||||||
|
3. Result of the last iteration (if loop finished normally and no `else`).
|
||||||
|
4. `void` (if loop body never executed and no `else`).
|
||||||
|
- **Implicit Coroutines**: All functions are coroutines. No `async/await`. Use `launch { ... }` (returns `Deferred`) or `flow { ... }`.
|
||||||
|
- **Variables**: `val` (read-only), `var` (mutable). Supports late-init `val` in classes (must be assigned in `init` or body).
|
||||||
|
- **Null Safety**: `?` (nullable type), `?.` (safe access), `?( )` (safe invoke), `?{ }` (safe block invoke), `?[ ]` (safe index), `?:` or `??` (elvis), `?=` (assign-if-null).
|
||||||
|
- **Equality**: `==` (equals), `!=` (not equals), `===` (ref identity), `!==` (ref not identity).
|
||||||
|
- **Comparison**: `<`, `>`, `<=`, `>=`, `<=>` (shuttle/spaceship, returns -1, 0, 1).
|
||||||
|
- **Destructuring**: `val [a, b, rest...] = list`. Supports nested `[a, [b, c]]` and splats.
|
||||||
|
|
||||||
|
## 2. Object-Oriented Programming (OOP)
|
||||||
|
- **Multiple Inheritance**: Supported with **C3 MRO** (Python-style). Diamond-safe.
|
||||||
|
- **Header Arguments**: `class Foo(a, b) : Base(a)` defines fields `a`, `b` and passes `a` to `Base`.
|
||||||
|
- **Members**: `fun name(args) { ... }`, `val`, `var`, `static val`, `static fun`.
|
||||||
|
- **Properties (Get/Set)**: Pure accessors, no auto-backing fields.
|
||||||
|
```lyng
|
||||||
|
var age
|
||||||
|
get() = _age
|
||||||
|
private set(v) { if(v >= 0) _age = v }
|
||||||
|
// Laconic syntax:
|
||||||
|
val area get = π * r * r
|
||||||
|
```
|
||||||
|
- **Mandatory `override`**: Required for all members existing in the ancestor chain.
|
||||||
|
- **Visibility**: `public` (default), `protected` (subclasses), `private` (this class instance only). `private set` / `protected set` allowed on properties.
|
||||||
|
- **Disambiguation**: `this@Base.member()` or `(obj as Base).member()`. `as` returns a qualified view.
|
||||||
|
- **Abstract/Interface**: `interface` is a synonym for `abstract class`. Both support state and constructors.
|
||||||
|
- **Extensions**: `fun Class.ext()` or `val Class.ext get = ...`. Scope-isolated.
|
||||||
|
|
||||||
|
## 3. Delegation (`by`)
|
||||||
|
Unified model for `val`, `var`, and `fun`.
|
||||||
|
```lyng
|
||||||
|
val x by MyDelegate()
|
||||||
|
var y by Map() // Uses "y" as key in map
|
||||||
|
fn f(a, b) by RemoteProxy() // Calls Proxy.invoke(thisRef, "f", a, b)
|
||||||
|
```
|
||||||
|
Delegate Methods:
|
||||||
|
- `getValue(thisRef, name)`: for `val`/`var`.
|
||||||
|
- `setValue(thisRef, name, val)`: for `var`.
|
||||||
|
- `invoke(thisRef, name, args...)`: for `fn` (called if `getValue` is absent).
|
||||||
|
- `bind(name, access, thisRef)`: optional hook called at declaration/binding time. `access` is `DelegateAccess.Val`, `Var`, or `Callable`.
|
||||||
|
|
||||||
|
## 4. Standard Library & Functional Built-ins
|
||||||
|
- **Scope Functions**:
|
||||||
|
- `obj.let { it... }`: result of block. `it` is `obj`.
|
||||||
|
- `obj.apply { this... }`: returns `obj`. `this` is `obj`.
|
||||||
|
- `obj.also { it... }`: returns `obj`. `it` is `obj`.
|
||||||
|
- `obj.run { this... }`: result of block. `this` is `obj`.
|
||||||
|
- `with(obj, { ... })`: result of block. `this` is `obj`.
|
||||||
|
- **Functional**: `forEach`, `map`, `filter`, `any`, `all`, `sum`, `count`, `sortedBy`, `flatten`, `flatMap`, `associateBy`.
|
||||||
|
- **Lazy**: `val x = cached { expensive() }` (call as `x()`) or `val x by lazy { ... }`.
|
||||||
|
- **Collections**: `List` ( `[a, b]` ), `Map` ( `Map(k => v)` ), `Set` ( `Set(a, b)` ). `MapEntry` ( `k => v` ).
|
||||||
|
|
||||||
|
## 5. Patterns & Shorthands
|
||||||
|
- **Map Literals**: `{ key: value, identifier: }` (identifier shorthand `x:` is `x: x`). Empty map is `Map()`.
|
||||||
|
- **Named Arguments**: `fun(y: 10, x: 5)`. Shorthand: `Point(x:, y:)`.
|
||||||
|
- **Varargs & Splats**: `fun f(args...)`, `f(...otherList)`.
|
||||||
|
- **Labels**: `loop@ for(x in list) { if(x == 0) break@loop }`.
|
||||||
|
- **Dynamic**: `val d = dynamic { get { name -> ... } }` allows `d.anyName`.
|
||||||
|
|
||||||
|
## 6. Operators & Methods to Overload
|
||||||
|
| Op | Method | Op | Method |
|
||||||
|
| :--- | :--- | :--- | :--- |
|
||||||
|
| `+` | `plus` | `==` | `equals` |
|
||||||
|
| `-` | `minus` | `<=>` | `compareTo` |
|
||||||
|
| `*` | `mul` | `[]` | `getAt` / `putAt` |
|
||||||
|
| `/` | `div` | `!` | `logicalNot` |
|
||||||
|
| `%` | `mod` | `-` | `negate` (unary) |
|
||||||
|
| `=~` | `operatorMatch` | `+=` | `plusAssign` |
|
||||||
|
|
||||||
|
## 7. Common Snippets
|
||||||
|
```lyng
|
||||||
|
// Multiple Inheritance and Properties
|
||||||
|
class Warrior(id, hp) : Character(id), HealthPool(hp) {
|
||||||
|
override fun toString() = "Warrior #%s (%s HP)"(id, hp)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Map entry and merging
|
||||||
|
val m = Map("a" => 1) + ("b" => 2)
|
||||||
|
m += "c" => 3
|
||||||
|
|
||||||
|
// Destructuring with splat
|
||||||
|
val [first, middle..., last] = [1, 2, 3, 4, 5]
|
||||||
|
|
||||||
|
// Safe Navigation and Elvis
|
||||||
|
val companyName = person?.job?.company?.name ?? "Freelancer"
|
||||||
|
```
|
||||||
|
|
||||||
|
## 8. Standard Library Discovery
|
||||||
|
To collect data on the standard library and available APIs, AI should inspect:
|
||||||
|
- **Global Symbols**: `lynglib/src/commonMain/kotlin/net/sergeych/lyng/Script.kt` (root functions like `println`, `sqrt`, `assert`).
|
||||||
|
- **Core Type Members**: `lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/*.kt` (e.g., `ObjList.kt`, `ObjString.kt`, `ObjMap.kt`) for methods on built-in types.
|
||||||
|
- **Lyng-side Extensions**: `lynglib/stdlib/lyng/root.lyng` for high-level functional APIs (e.g., `map`, `filter`, `any`, `lazy`).
|
||||||
|
- **I/O & Processes**: `lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/` for `fs` and `process` modules.
|
||||||
|
- **Documentation**: `docs/*.md` (e.g., `tutorial.md`, `lyngio.md`) for high-level usage and module overviews.
|
||||||
@@ -76,7 +76,7 @@ Now you can import lyng and use it:
|
|||||||
### Execute script:
|
### Execute script:
|
||||||
|
|
||||||
```kotlin
|
```kotlin
|
||||||
import net.sergeyh.lyng.*
|
import net.sergeych.lyng.*
|
||||||
|
|
||||||
// we need a coroutine to start, as Lyng
|
// we need a coroutine to start, as Lyng
|
||||||
// is a coroutine based language, async topdown
|
// is a coroutine based language, async topdown
|
||||||
@@ -92,9 +92,7 @@ Script is executed over some `Scope`. Create instance,
|
|||||||
add your specific vars and functions to it, and call:
|
add your specific vars and functions to it, and call:
|
||||||
|
|
||||||
```kotlin
|
```kotlin
|
||||||
|
import net.sergeych.lyng.*
|
||||||
import com.sun.source.tree.Scope
|
|
||||||
import new.sergeych.lyng.*
|
|
||||||
|
|
||||||
// simple function
|
// simple function
|
||||||
val scope = Script.newScope().apply {
|
val scope = Script.newScope().apply {
|
||||||
@@ -142,6 +140,12 @@ Tips:
|
|||||||
- After a dot, globals are intentionally suppressed (e.g., `lines().Path` is not valid), only the receiver’s members are suggested.
|
- After a dot, globals are intentionally suppressed (e.g., `lines().Path` is not valid), only the receiver’s members are suggested.
|
||||||
- If completion seems sparse, make sure related modules are imported (e.g., `import lyng.io.fs` so that `Path` and its methods are known).
|
- If completion seems sparse, make sure related modules are imported (e.g., `import lyng.io.fs` so that `Path` and its methods are known).
|
||||||
|
|
||||||
|
## AI Assistant Support
|
||||||
|
|
||||||
|
To help AI assistants (like Cursor, Windsurf, or GitHub Copilot) understand Lyng with minimal effort, we provide a high-density language specification:
|
||||||
|
|
||||||
|
- **[LYNG_AI_SPEC.md](LYNG_AI_SPEC.md)**: A concise guide for AI models to learn Lyng syntax, idioms, and core philosophy. We recommend pointing your AI tool to this file or including it in your project's custom instructions.
|
||||||
|
|
||||||
## Why?
|
## Why?
|
||||||
|
|
||||||
Designed to add scripting to kotlin multiplatform application in easy and efficient way. This is attempt to achieve what Lua is for C/++.
|
Designed to add scripting to kotlin multiplatform application in easy and efficient way. This is attempt to achieve what Lua is for C/++.
|
||||||
@@ -173,6 +177,7 @@ Ready features:
|
|||||||
- [x] ranges, lists, strings, interfaces: Iterable, Iterator, Collection, Array
|
- [x] ranges, lists, strings, interfaces: Iterable, Iterator, Collection, Array
|
||||||
- [x] when(value), if-then-else
|
- [x] when(value), if-then-else
|
||||||
- [x] exception handling: throw, try-catch-finally, exception classes.
|
- [x] exception handling: throw, try-catch-finally, exception classes.
|
||||||
|
- [x] user-defined exception classes
|
||||||
- [x] multiplatform maven publication
|
- [x] multiplatform maven publication
|
||||||
- [x] documentation for the current state
|
- [x] documentation for the current state
|
||||||
- [x] maps, sets and sequences (flows?)
|
- [x] maps, sets and sequences (flows?)
|
||||||
@@ -196,6 +201,7 @@ Ready features:
|
|||||||
- [x] late-init vals in classes
|
- [x] late-init vals in classes
|
||||||
- [x] properties with getters and setters
|
- [x] properties with getters and setters
|
||||||
- [x] assign-if-null operator `?=`
|
- [x] assign-if-null operator `?=`
|
||||||
|
- [x] user-defined exception classes
|
||||||
|
|
||||||
All of this is documented in the [language site](https://lynglang.com) and locally [docs/language.md](docs/tutorial.md). the current nightly builds published on the site and in the private maven repository.
|
All of this is documented in the [language site](https://lynglang.com) and locally [docs/language.md](docs/tutorial.md). the current nightly builds published on the site and in the private maven repository.
|
||||||
|
|
||||||
|
|||||||
Executable
+40
@@ -0,0 +1,40 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
#
|
||||||
|
# Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#
|
||||||
|
#
|
||||||
|
|
||||||
|
set -e
|
||||||
|
echo "publishing all artifacts"
|
||||||
|
echo
|
||||||
|
./gradlew publishToMavenLocal
|
||||||
|
./gradlew publish
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "Creating plugin"
|
||||||
|
echo
|
||||||
|
./gradlew buildInstallablePlugin
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "building CLI tools"
|
||||||
|
echo
|
||||||
|
bin/local_jrelease
|
||||||
|
bin/local_release
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "Deploying site"
|
||||||
|
echo
|
||||||
|
./bin/deploy_site
|
||||||
Executable
+26
@@ -0,0 +1,26 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
#
|
||||||
|
# Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#
|
||||||
|
#
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "Creating plugin"
|
||||||
|
echo
|
||||||
|
./gradlew buildInstallablePlugin
|
||||||
|
deploy_site -u
|
||||||
+38
-26
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
# Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -17,6 +17,14 @@
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|
||||||
|
upload_only=false
|
||||||
|
for arg in "$@"; do
|
||||||
|
if [[ "$arg" == "-u" || "$arg" == "--upload-only" ]]; then
|
||||||
|
upload_only=true
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
function checkState() {
|
function checkState() {
|
||||||
if [[ $? != 0 ]]; then
|
if [[ $? != 0 ]]; then
|
||||||
echo
|
echo
|
||||||
@@ -24,9 +32,10 @@ function checkState() {
|
|||||||
echo
|
echo
|
||||||
exit 100
|
exit 100
|
||||||
fi
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Update docs/idea_plugin.md to point to the latest built IDEA plugin zip
|
# Update docs/idea_plugin.md to point to the latest built IDEA plugin zip
|
||||||
# from ./distributables before building the site. The change is temporary and
|
# from ./distributables before building the site. The change is temporary and
|
||||||
# the original file is restored right after the build.
|
# the original file is restored right after the build.
|
||||||
@@ -107,28 +116,28 @@ function refreshTextmateZip() {
|
|||||||
(cd editors && zip -rq ../distributables/lyng-textmate.zip .)
|
(cd editors && zip -rq ../distributables/lyng-textmate.zip .)
|
||||||
}
|
}
|
||||||
|
|
||||||
# Update the IDEA plugin download link in docs (temporarily), then build, then restore the doc
|
|
||||||
refreshTextmateZip
|
|
||||||
updateIdeaPluginDownloadLink || echo "WARN: proceeding without updating IDEA plugin download link"
|
|
||||||
|
|
||||||
./gradlew site:jsBrowserDistribution
|
if [[ "$upload_only" == false ]]; then
|
||||||
BUILD_RC=$?
|
# Update the IDEA plugin download link in docs (temporarily), then build, then restore the doc
|
||||||
|
refreshTextmateZip
|
||||||
|
updateIdeaPluginDownloadLink || echo "WARN: proceeding without updating IDEA plugin download link"
|
||||||
|
|
||||||
# Always restore original doc if backup exists
|
./gradlew site:jsBrowserDistribution
|
||||||
if [[ -f "$DOC_IDEA_PLUGIN_BACKUP" ]]; then
|
BUILD_RC=$?
|
||||||
mv -f "$DOC_IDEA_PLUGIN_BACKUP" "$DOC_IDEA_PLUGIN"
|
|
||||||
|
# Always restore original doc if backup exists
|
||||||
|
if [[ -f "$DOC_IDEA_PLUGIN_BACKUP" ]]; then
|
||||||
|
mv -f "$DOC_IDEA_PLUGIN_BACKUP" "$DOC_IDEA_PLUGIN"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $BUILD_RC -ne 0 ]]; then
|
||||||
|
echo
|
||||||
|
echo -- build failed. deploy aborted.
|
||||||
|
echo
|
||||||
|
exit 100
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $BUILD_RC -ne 0 ]]; then
|
|
||||||
echo
|
|
||||||
echo -- build failed. deploy aborted.
|
|
||||||
echo
|
|
||||||
exit 100
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#exit 0
|
|
||||||
|
|
||||||
# Prepare working dir
|
# Prepare working dir
|
||||||
ssh -p ${SSH_PORT} ${SSH_HOST} "
|
ssh -p ${SSH_PORT} ${SSH_HOST} "
|
||||||
cd ${ROOT}
|
cd ${ROOT}
|
||||||
@@ -143,12 +152,15 @@ ssh -p ${SSH_PORT} ${SSH_HOST} "
|
|||||||
fi
|
fi
|
||||||
";
|
";
|
||||||
|
|
||||||
# sync files
|
if [[ "$upload_only" == false ]]; then
|
||||||
SRC=./site/build/dist/js/productionExecutable
|
# sync files
|
||||||
rsync -e "ssh -p ${SSH_PORT}" -avz -r -d --delete ${SRC}/* ${SSH_HOST}:${ROOT}/build/dist
|
SRC=./site/build/dist/js/productionExecutable
|
||||||
checkState
|
rsync -e "ssh -p ${SSH_PORT}" -avz -r -d --delete ${SRC}/* ${SSH_HOST}:${ROOT}/build/dist
|
||||||
#rsync -e "ssh -p ${SSH_PORT}" -avz ./static/* ${SSH_HOST}:${ROOT}/build/dist
|
checkState
|
||||||
#checkState
|
#rsync -e "ssh -p ${SSH_PORT}" -avz ./static/* ${SSH_HOST}:${ROOT}/build/dist
|
||||||
|
#checkState
|
||||||
|
fi
|
||||||
|
|
||||||
rsync -e "ssh -p ${SSH_PORT}" -avz -r -d --delete distributables/* ${SSH_HOST}:${ROOT}/build/dist/distributables
|
rsync -e "ssh -p ${SSH_PORT}" -avz -r -d --delete distributables/* ${SSH_HOST}:${ROOT}/build/dist/distributables
|
||||||
checkState
|
checkState
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -23,11 +23,11 @@ There are a lo of ways to construct a buffer:
|
|||||||
assertEquals( 5, Buffer("hello").size )
|
assertEquals( 5, Buffer("hello").size )
|
||||||
|
|
||||||
// from bytes, e.g. integers in range 0..255
|
// from bytes, e.g. integers in range 0..255
|
||||||
assertEquals( 255, Buffer(1,2,3,255).last() )
|
assertEquals( 255, Buffer(1,2,3,255).last )
|
||||||
|
|
||||||
// from whatever iterable that produces bytes, e.g.
|
// from whatever iterable that produces bytes, e.g.
|
||||||
// integers in 0..255 range:
|
// integers in 0..255 range:
|
||||||
assertEquals( 129, Buffer([1,2,129]).last() )
|
assertEquals( 129, Buffer([1,2,129]).last )
|
||||||
|
|
||||||
// Empty buffer of fixed size:
|
// Empty buffer of fixed size:
|
||||||
assertEquals(100, Buffer(100).size)
|
assertEquals(100, Buffer(100).size)
|
||||||
|
|||||||
+134
-13
@@ -119,8 +119,9 @@ Properties allow you to define member accessors that look like fields but execut
|
|||||||
|
|
||||||
### Basic Syntax
|
### Basic Syntax
|
||||||
|
|
||||||
Properties are declared using `val` (read-only) or `var` (read-write) followed by a name and `get()`/`set()` blocks:
|
Properties are declared using `val` (read-only) or `var` (read-write) followed by a name and a `get` (and optionally `set`) accessor. Unlike fields, properties do not have automatic storage and must compute their values or delegate to other members.
|
||||||
|
|
||||||
|
The standard syntax uses parentheses:
|
||||||
```lyng
|
```lyng
|
||||||
class Person(private var _age: Int) {
|
class Person(private var _age: Int) {
|
||||||
// Read-only property
|
// Read-only property
|
||||||
@@ -136,21 +137,17 @@ class Person(private var _age: Int) {
|
|||||||
if (value >= 0) _age = value
|
if (value >= 0) _age = value
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val p = Person(15)
|
|
||||||
assertEquals("Minor", p.ageCategory)
|
|
||||||
p.age = 20
|
|
||||||
assertEquals("Adult", p.ageCategory)
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### Laconic Expression Shorthand
|
### Laconic Syntax (Optional Parentheses)
|
||||||
|
|
||||||
For simple accessors and methods, you can use the `=` shorthand for a more elegant and laconic form:
|
For even cleaner code, you can omit the parentheses for `get` and `set`. This is especially useful for simple expression shorthand:
|
||||||
|
|
||||||
```lyng
|
```lyng
|
||||||
class Circle(val radius: Real) {
|
class Circle(val radius: Real) {
|
||||||
val area get() = π * radius * radius
|
// Laconic expression shorthand
|
||||||
val circumference get() = 2 * π * radius
|
val area get = π * radius * radius
|
||||||
|
val circumference get = 2 * π * radius
|
||||||
|
|
||||||
fun diameter() = radius * 2
|
fun diameter() = radius * 2
|
||||||
}
|
}
|
||||||
@@ -159,15 +156,16 @@ fun median(a, b) = (a + b) / 2
|
|||||||
|
|
||||||
class Counter {
|
class Counter {
|
||||||
private var _count = 0
|
private var _count = 0
|
||||||
var count get() = _count set(v) = _count = v
|
var count get = _count set(v) = _count = v
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
### Key Rules
|
### Key Rules
|
||||||
|
|
||||||
- **`val` properties** must have a `get()` accessor and cannot have a `set()`.
|
- **`val` properties** must have a `get` accessor (with or without parentheses) and cannot have a `set`.
|
||||||
- **`var` properties** must have both `get()` and `set()` accessors.
|
- **`var` properties** must have both `get` and `set` accessors.
|
||||||
- **Functions and methods** can use the `=` shorthand to return the result of a single expression.
|
- **Functions and methods** can use the `=` shorthand to return the result of a single expression.
|
||||||
|
- **`override` is mandatory**: If you are overriding a member from a base class, you MUST use the `override` keyword.
|
||||||
- **No Backing Fields**: There is no magic `field` identifier. If you need to store state, you must declare a separate (usually `private`) field.
|
- **No Backing Fields**: There is no magic `field` identifier. If you need to store state, you must declare a separate (usually `private`) field.
|
||||||
- **Type Inference**: You can omit the type declaration if it can be inferred or if you don't need strict typing.
|
- **Type Inference**: You can omit the type declaration if it can be inferred or if you don't need strict typing.
|
||||||
|
|
||||||
@@ -224,6 +222,19 @@ A delegate is any object that provides the following methods (all optional depen
|
|||||||
- `invoke(thisRef, name, args...)`: Called when a delegated `fun` is invoked.
|
- `invoke(thisRef, name, args...)`: Called when a delegated `fun` is invoked.
|
||||||
- `bind(name, access, thisRef)`: Called once during initialization to configure or validate the delegate.
|
- `bind(name, access, thisRef)`: Called once during initialization to configure or validate the delegate.
|
||||||
|
|
||||||
|
### Map as a Delegate
|
||||||
|
|
||||||
|
Maps can also be used as delegates. When delegated to a property, the map uses the property name as the key:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
val settings = { "theme": "dark", "fontSize": 14 }
|
||||||
|
val theme by settings
|
||||||
|
var fontSize by settings
|
||||||
|
|
||||||
|
println(theme) // "dark"
|
||||||
|
fontSize = 16 // Updates settings["fontSize"]
|
||||||
|
```
|
||||||
|
|
||||||
For more details and advanced patterns (like `lazy`, `observable`, and shared stateless delegates), see the [Delegation Guide](delegation.md).
|
For more details and advanced patterns (like `lazy`, `observable`, and shared stateless delegates), see the [Delegation Guide](delegation.md).
|
||||||
|
|
||||||
## Instance initialization: init block
|
## Instance initialization: init block
|
||||||
@@ -531,6 +542,99 @@ class Critical {
|
|||||||
|
|
||||||
Attempting to override a `closed` member results in a compile-time error.
|
Attempting to override a `closed` member results in a compile-time error.
|
||||||
|
|
||||||
|
## Operator Overloading
|
||||||
|
|
||||||
|
Lyng allows you to overload standard operators by defining specific named methods in your classes. When an operator expression is evaluated, Lyng delegates the operation to these methods if they are available.
|
||||||
|
|
||||||
|
### Binary Operators
|
||||||
|
|
||||||
|
To overload a binary operator, define the corresponding method that takes one argument:
|
||||||
|
|
||||||
|
| Operator | Method Name |
|
||||||
|
| :--- | :--- |
|
||||||
|
| `a + b` | `plus(other)` |
|
||||||
|
| `a - b` | `minus(other)` |
|
||||||
|
| `a * b` | `mul(other)` |
|
||||||
|
| `a / b` | `div(other)` |
|
||||||
|
| `a % b` | `mod(other)` |
|
||||||
|
| `a && b` | `logicalAnd(other)` |
|
||||||
|
| `a \|\| b` | `logicalOr(other)` |
|
||||||
|
| `a =~ b` | `operatorMatch(other)` |
|
||||||
|
| `a & b` | `bitAnd(other)` |
|
||||||
|
| `a \| b` | `bitOr(other)` |
|
||||||
|
| `a ^ b` | `bitXor(other)` |
|
||||||
|
| `a << b` | `shl(other)` |
|
||||||
|
| `a >> b` | `shr(other)` |
|
||||||
|
|
||||||
|
Example:
|
||||||
|
```lyng
|
||||||
|
class Vector(val x, val y) {
|
||||||
|
fun plus(other) = Vector(x + other.x, y + other.y)
|
||||||
|
override fun toString() = "Vector(${x}, ${y})"
|
||||||
|
}
|
||||||
|
|
||||||
|
val v1 = Vector(1, 2)
|
||||||
|
val v2 = Vector(3, 4)
|
||||||
|
assertEquals(Vector(4, 6), v1 + v2)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Unary Operators
|
||||||
|
|
||||||
|
Unary operators are overloaded by defining methods with no arguments:
|
||||||
|
|
||||||
|
| Operator | Method Name |
|
||||||
|
| :--- | :--- |
|
||||||
|
| `-a` | `negate()` |
|
||||||
|
| `!a` | `logicalNot()` |
|
||||||
|
| `~a` | `bitNot()` |
|
||||||
|
|
||||||
|
### Assignment Operators
|
||||||
|
|
||||||
|
Assignment operators like `+=` first attempt to call a specific assignment method. If that method is not defined, they fall back to a combination of the binary operator and a regular assignment (e.g., `a = a + b`).
|
||||||
|
|
||||||
|
| Operator | Method Name | Fallback |
|
||||||
|
| :--- | :--- | :--- |
|
||||||
|
| `a += b` | `plusAssign(other)` | `a = a + b` |
|
||||||
|
| `a -= b` | `minusAssign(other)` | `a = a - b` |
|
||||||
|
| `a *= b` | `mulAssign(other)` | `a = a * b` |
|
||||||
|
| `a /= b` | `divAssign(other)` | `a = a / b` |
|
||||||
|
| `a %= b` | `modAssign(other)` | `a = a % b` |
|
||||||
|
|
||||||
|
Example of in-place mutation:
|
||||||
|
```lyng
|
||||||
|
class Counter(var value) {
|
||||||
|
fun plusAssign(n) {
|
||||||
|
value = value + n
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val c = Counter(10)
|
||||||
|
c += 5
|
||||||
|
assertEquals(15, c.value)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Comparison Operators
|
||||||
|
|
||||||
|
Comparison operators use `compareTo` and `equals`.
|
||||||
|
|
||||||
|
| Operator | Method Name |
|
||||||
|
| :--- | :--- |
|
||||||
|
| `a == b`, `a != b` | `equals(other)` |
|
||||||
|
| `<`, `>`, `<=`, `>=`, `<=>` | `compareTo(other)` |
|
||||||
|
|
||||||
|
- `compareTo` should return:
|
||||||
|
- `0` if `a == b`
|
||||||
|
- A negative integer if `a < b`
|
||||||
|
- A positive integer if `a > b`
|
||||||
|
- The `<=>` (shuttle) operator returns the result of `compareTo` directly.
|
||||||
|
- `equals` returns a `Bool`. If `equals` is not explicitly defined, Lyng falls back to `compareTo(other) == 0`.
|
||||||
|
|
||||||
|
> **Note**: Methods that are already defined in the base `Obj` class (like `equals`, `toString`, or `contains`) require the `override` keyword when redefined in your class or as an extension. Other operator methods (like `plus` or `negate`) do not require `override` unless they are already present in your class's hierarchy.
|
||||||
|
|
||||||
|
### Increment and Decrement
|
||||||
|
|
||||||
|
`++` and `--` operators are implemented using `plus(1)` or `minus(1)` combined with an assignment back to the variable. If the variable is a field or local variable, it will be updated with the result of the operation.
|
||||||
|
|
||||||
Compatibility notes:
|
Compatibility notes:
|
||||||
|
|
||||||
- Existing single‑inheritance code continues to work unchanged; its resolution order reduces to the single base.
|
- Existing single‑inheritance code continues to work unchanged; its resolution order reduces to the single base.
|
||||||
@@ -614,6 +718,23 @@ Notes and limitations (current version):
|
|||||||
- `name` and `ordinal` are read‑only properties of an entry.
|
- `name` and `ordinal` are read‑only properties of an entry.
|
||||||
- `entries` is a read‑only list owned by the enum type.
|
- `entries` is a read‑only list owned by the enum type.
|
||||||
|
|
||||||
|
## Exception Classes
|
||||||
|
|
||||||
|
You can define your own exception classes by inheriting from the built-in `Exception` class. User-defined exceptions are regular classes and can have their own properties and methods.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class MyError(val code, m) : Exception(m)
|
||||||
|
|
||||||
|
try {
|
||||||
|
throw MyError(500, "Internal Server Error")
|
||||||
|
}
|
||||||
|
catch(e: MyError) {
|
||||||
|
println("Error " + e.code + ": " + e.message)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
For more details on error handling, see the [Exceptions Handling Guide](exceptions_handling.md).
|
||||||
|
|
||||||
## fields and visibility
|
## fields and visibility
|
||||||
|
|
||||||
It is possible to add non-constructor fields:
|
It is possible to add non-constructor fields:
|
||||||
|
|||||||
@@ -151,6 +151,24 @@ fun test() {
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### 6. Map as a Delegate
|
||||||
|
|
||||||
|
Maps can be used as delegates for `val` and `var` properties. When a map is used as a delegate, it uses the property name as a key to read from or write to the map.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
val m = { "a": 1, "b": 2 }
|
||||||
|
val a by m
|
||||||
|
var b by m
|
||||||
|
|
||||||
|
println(a) // 1
|
||||||
|
println(b) // 2
|
||||||
|
|
||||||
|
b = 42
|
||||||
|
println(m["b"]) // 42
|
||||||
|
```
|
||||||
|
|
||||||
|
Because `Map` implements `getValue` and `setValue`, it works seamlessly with any object that needs to store its properties in a map (e.g., when implementing dynamic schemas or JSON-backed objects).
|
||||||
|
|
||||||
## The `bind` Hook
|
## The `bind` Hook
|
||||||
|
|
||||||
The `bind(name, access, thisRef)` method is called exactly once when the member is being initialized. It allows the delegate to:
|
The `bind(name, access, thisRef)` method is called exactly once when the member is being initialized. It allows the delegate to:
|
||||||
|
|||||||
@@ -103,6 +103,11 @@ scope.addVoidFn("log") {
|
|||||||
println(items.joinToString(" ") { it.toString(this).value })
|
println(items.joinToString(" ") { it.toString(this).value })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// When adding a member function to a class, you can use isOverride = true
|
||||||
|
// myClass.addFn("toString", isOverride = true) {
|
||||||
|
// ObjString("Custom string representation")
|
||||||
|
// }
|
||||||
|
|
||||||
// Call them from Lyng
|
// Call them from Lyng
|
||||||
scope.eval("val y = inc(41); log('Answer:', y)")
|
scope.eval("val y = inc(41); log('Answer:', y)")
|
||||||
```
|
```
|
||||||
@@ -122,6 +127,9 @@ myClass.createField("version", ObjString("1.0.0"), isMutable = false)
|
|||||||
// Add a mutable field with an initial value
|
// Add a mutable field with an initial value
|
||||||
myClass.createField("count", ObjInt(0), isMutable = true)
|
myClass.createField("count", ObjInt(0), isMutable = true)
|
||||||
|
|
||||||
|
// If you are overriding a field from a base class, use isOverride = true
|
||||||
|
// myClass.createField("someBaseField", ObjInt(42), isOverride = true)
|
||||||
|
|
||||||
scope.addConst("MyClass", myClass)
|
scope.addConst("MyClass", myClass)
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -153,6 +161,16 @@ myClass.addProperty(
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// You can also create an ObjProperty explicitly
|
||||||
|
val explicitProp = ObjProperty(
|
||||||
|
name = "hexValue",
|
||||||
|
getter = statement { ObjString(internalValue.toString(16)) }
|
||||||
|
)
|
||||||
|
myClass.addProperty("hexValue", prop = explicitProp)
|
||||||
|
|
||||||
|
// Use isOverride = true when overriding a property from a base class
|
||||||
|
// myClass.addProperty("baseProp", getter = { ... }, isOverride = true)
|
||||||
|
|
||||||
scope.addConst("MyClass", myClass)
|
scope.addConst("MyClass", myClass)
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -286,6 +304,46 @@ val isolated = net.sergeych.lyng.Scope.new()
|
|||||||
- When registering packages, names must be unique. Register before you compile/evaluate scripts that import them.
|
- When registering packages, names must be unique. Register before you compile/evaluate scripts that import them.
|
||||||
- To debug scope content, `scope.toString()` and `scope.trace()` can help during development.
|
- To debug scope content, `scope.toString()` and `scope.trace()` can help during development.
|
||||||
|
|
||||||
|
### 12) Handling and serializing exceptions
|
||||||
|
|
||||||
|
When Lyng code throws an exception, it is caught in Kotlin as an `ExecutionError`. This error wraps the actual Lyng `Obj` that was thrown (which could be a built-in `ObjException` or a user-defined `ObjInstance`).
|
||||||
|
|
||||||
|
To simplify handling these objects from Kotlin, several extension methods are provided on the `Obj` class. These methods work uniformly regardless of whether the exception is built-in or user-defined.
|
||||||
|
|
||||||
|
#### Uniform Exception API
|
||||||
|
|
||||||
|
| Method | Description |
|
||||||
|
| :--- | :--- |
|
||||||
|
| `obj.isLyngException()` | Returns `true` if the object is an instance of `Exception`. |
|
||||||
|
| `obj.isInstanceOf("ClassName")` | Returns `true` if the object is an instance of the named Lyng class or its ancestors. |
|
||||||
|
| `obj.getLyngExceptionMessage(scope?=null)` | Returns the exception message as a Kotlin `String`. |
|
||||||
|
| `obj.getLyngExceptionMessageWithStackTrace(scope?=null)` | Returns a detailed message with a formatted stack trace. |
|
||||||
|
| `obj.getLyngExceptionString(scope)` | Returns a formatted string including the class name, message, and primary throw site. |
|
||||||
|
| `obj.getLyngExceptionStackTrace(scope)` | Returns the stack trace as an `ObjList` of `StackTraceEntry`. |
|
||||||
|
| `obj.getLyngExceptionExtraData(scope)` | Returns the extra data associated with the exception. |
|
||||||
|
| `obj.raiseAsExecutionError(scope?=null)` | Rethrows the object as a Kotlin `ExecutionError`. |
|
||||||
|
|
||||||
|
#### Example: Serialization and Rethrowing
|
||||||
|
|
||||||
|
You can serialize Lyng exception objects using `Lynon` to transmit them across boundaries and then rethrow them.
|
||||||
|
|
||||||
|
```kotlin
|
||||||
|
try {
|
||||||
|
scope.eval("throw MyUserException(404, \"Not Found\")")
|
||||||
|
} catch (e: ExecutionError) {
|
||||||
|
// 1. Serialize the Lyng exception object
|
||||||
|
val encoded: UByteArray = lynonEncodeAny(scope, e.errorObject)
|
||||||
|
|
||||||
|
// ... (transmit 'encoded' byte array) ...
|
||||||
|
|
||||||
|
// 2. Deserialize it back to an Obj in a different context
|
||||||
|
val decoded: Obj = lynonDecodeAny(scope, encoded)
|
||||||
|
|
||||||
|
// 3. Properly rethrow it on the Kotlin side using the uniform API
|
||||||
|
decoded.raiseAsExecutionError(scope)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
That’s it. You now have Lyng embedded in your Kotlin app: you can expose your app’s API, evaluate user scripts, and organize your own packages to import from Lyng code.
|
That’s it. You now have Lyng embedded in your Kotlin app: you can expose your app’s API, evaluate user scripts, and organize your own packages to import from Lyng code.
|
||||||
@@ -128,9 +128,11 @@ Serializable class that conveys information about the exception. Important membe
|
|||||||
|
|
||||||
| name | description |
|
| name | description |
|
||||||
|-------------------|--------------------------------------------------------|
|
|-------------------|--------------------------------------------------------|
|
||||||
| message | String message |
|
| message | String message |
|
||||||
| stackTrace | lyng stack trace, list of `StackTraceEntry`, see below |
|
| stackTrace() | lyng stack trace, list of `StackTraceEntry`, see below |
|
||||||
| printStackTrace() | format and print stack trace using println() |
|
| printStackTrace() | format and print stack trace using println() |
|
||||||
|
|
||||||
|
> **Note for Kotlin users**: When working with Lyng exceptions from Kotlin, you can use extension methods like `getLyngExceptionMessageWithStackTrace()`. See [Embedding Lyng](embedding.md#12-handling-and-serializing-exceptions) for the full API.
|
||||||
|
|
||||||
## StackTraceEntry
|
## StackTraceEntry
|
||||||
|
|
||||||
@@ -150,24 +152,103 @@ class StackTraceEntry(
|
|||||||
|
|
||||||
# Custom error classes
|
# Custom error classes
|
||||||
|
|
||||||
_this functionality is not yet released_
|
You can define your own exception classes by inheriting from the built-in `Exception` class. This allows you to create specific error types for your application logic and catch them specifically.
|
||||||
|
|
||||||
|
## Defining a custom exception
|
||||||
|
|
||||||
|
To define a custom exception, create a class that inherits from `Exception`:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class MyUserException : Exception("something went wrong")
|
||||||
|
```
|
||||||
|
|
||||||
|
You can also pass the message dynamically:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class MyUserException(m) : Exception(m)
|
||||||
|
|
||||||
|
throw MyUserException("custom error message")
|
||||||
|
```
|
||||||
|
|
||||||
|
If you don't provide a message to the `Exception` constructor, the class name will be used as the default message:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class SimpleException : Exception
|
||||||
|
|
||||||
|
val e = SimpleException()
|
||||||
|
assertEquals("SimpleException", e.message)
|
||||||
|
```
|
||||||
|
|
||||||
|
## Throwing and catching custom exceptions
|
||||||
|
|
||||||
|
Custom exceptions are thrown using the `throw` keyword and can be caught using `catch` blocks, just like standard exceptions:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class ValidationException(m) : Exception(m)
|
||||||
|
|
||||||
|
try {
|
||||||
|
throw ValidationException("Invalid input")
|
||||||
|
}
|
||||||
|
catch(e: ValidationException) {
|
||||||
|
println("Caught validation error: " + e.message)
|
||||||
|
}
|
||||||
|
catch(e: Exception) {
|
||||||
|
println("Caught other exception: " + e.message)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Since user exceptions are real classes, inheritance works as expected:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class BaseError : Exception
|
||||||
|
class DerivedError : BaseError
|
||||||
|
|
||||||
|
try {
|
||||||
|
throw DerivedError()
|
||||||
|
}
|
||||||
|
catch(e: BaseError) {
|
||||||
|
// This will catch DerivedError as well
|
||||||
|
assert(e is DerivedError)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Accessing extra data
|
||||||
|
|
||||||
|
You can add your own fields to custom exception classes to carry additional information:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class NetworkException(m, val statusCode) : Exception(m)
|
||||||
|
|
||||||
|
try {
|
||||||
|
throw NetworkException("Not Found", 404)
|
||||||
|
}
|
||||||
|
catch(e: NetworkException) {
|
||||||
|
println("Error " + e.statusCode + ": " + e.message)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
# Standard exception classes
|
# Standard exception classes
|
||||||
|
|
||||||
| class | notes |
|
| class | notes |
|
||||||
|----------------------------|-------------------------------------------------------|
|
|----------------------------|-------------------------------------------------------|
|
||||||
| Exception | root of al throwable objects |
|
| Exception | root of all throwable objects |
|
||||||
| NullReferenceException | |
|
| NullReferenceException | |
|
||||||
| AssertionFailedException | |
|
| AssertionFailedException | |
|
||||||
| ClassCastException | |
|
| ClassCastException | |
|
||||||
| IndexOutOfBoundsException | |
|
| IndexOutOfBoundsException | |
|
||||||
| IllegalArgumentException | |
|
| IllegalArgumentException | |
|
||||||
|
| IllegalStateException | |
|
||||||
|
| NoSuchElementException | |
|
||||||
| IllegalAssignmentException | assigning to val, etc. |
|
| IllegalAssignmentException | assigning to val, etc. |
|
||||||
| SymbolNotDefinedException | |
|
| SymbolNotDefinedException | |
|
||||||
| IterationEndException | attempt to read iterator past end, `hasNext == false` |
|
| IterationEndException | attempt to read iterator past end, `hasNext == false` |
|
||||||
| IllegalAccessException | attempt to access private members or like |
|
| IllegalAccessException | attempt to access private members or like |
|
||||||
| UnknownException | unexpected kotlin exception caught |
|
| UnknownException | unexpected internal exception caught |
|
||||||
| | |
|
| NotFoundException | |
|
||||||
|
| IllegalOperationException | |
|
||||||
|
| UnsetException | access to uninitialized late-init val |
|
||||||
|
| NotImplementedException | used by `TODO()` |
|
||||||
|
| SyntaxError | |
|
||||||
|
|
||||||
|
|
||||||
### Symbol resolution errors
|
### Symbol resolution errors
|
||||||
|
|||||||
+5
-7
@@ -226,13 +226,11 @@ Future work: introduce thread‑safe pooling (e.g., per‑thread pools or confin
|
|||||||
|
|
||||||
Closures executed by `launch { ... }` and `flow { ... }` resolve names using the `ClosureScope` rules:
|
Closures executed by `launch { ... }` and `flow { ... }` resolve names using the `ClosureScope` rules:
|
||||||
|
|
||||||
1. Closure frame locals/arguments
|
1. **Current frame locals and arguments**: Variables defined within the current closure execution.
|
||||||
2. Captured receiver instance/class members
|
2. **Captured lexical ancestry**: Outer local variables captured at the site where the closure was defined (the "lexical environment").
|
||||||
3. Closure ancestry locals + each frame’s `this` members (cycle‑safe)
|
3. **Captured receiver members**: If the closure was defined within a class or explicitly bound to an object, it checks members of that object (`this`), following MRO and respecting visibility.
|
||||||
4. Caller `this` members
|
4. **Caller environment**: Falls back to the calling context (e.g., the caller's `this` or local variables).
|
||||||
5. Caller ancestry locals + each frame’s `this` members (cycle‑safe)
|
5. **Global/Module fallbacks**: Final check for module-level constants and global functions.
|
||||||
6. Module pseudo‑symbols (e.g., `__PACKAGE__`)
|
|
||||||
7. Direct module/global fallback (nearest `ModuleScope` and its parent/root)
|
|
||||||
|
|
||||||
Implications:
|
Implications:
|
||||||
- Outer locals (e.g., `counter`) stay visible across suspension points.
|
- Outer locals (e.g., `counter`) stay visible across suspension points.
|
||||||
|
|||||||
+1
-1
@@ -33,7 +33,7 @@ PerfProfiles.restore(snap) // restore previous flags
|
|||||||
- `ARG_BUILDER` — Efficient argument building: small‑arity no‑alloc and pooled builder on JVM (ON JVM default).
|
- `ARG_BUILDER` — Efficient argument building: small‑arity no‑alloc and pooled builder on JVM (ON JVM default).
|
||||||
- `ARG_SMALL_ARITY_12` — Extends small‑arity no‑alloc call paths from 0–8 to 0–12 arguments (JVM‑first exploration; OFF by default). Use for codebases with many 9–12 arg calls; A/B before enabling.
|
- `ARG_SMALL_ARITY_12` — Extends small‑arity no‑alloc call paths from 0–8 to 0–12 arguments (JVM‑first exploration; OFF by default). Use for codebases with many 9–12 arg calls; A/B before enabling.
|
||||||
- `SKIP_ARGS_ON_NULL_RECEIVER` — Early return on optional‑null receivers before building args (semantics‑compatible). A/B only.
|
- `SKIP_ARGS_ON_NULL_RECEIVER` — Early return on optional‑null receivers before building args (semantics‑compatible). A/B only.
|
||||||
- `SCOPE_POOL` — Scope frame pooling for calls (JVM, per‑thread ThreadLocal pool). ON by default on JVM; togglable at runtime.
|
- `SCOPE_POOL` — Scope frame pooling for calls (per‑thread ThreadLocal pool on JVM/Android/Native; global deque on JS/Wasm). ON by default on all platforms; togglable at runtime.
|
||||||
- `FIELD_PIC` — 2‑entry polymorphic inline cache for field reads/writes keyed by `(classId, layoutVersion)` (ON JVM default).
|
- `FIELD_PIC` — 2‑entry polymorphic inline cache for field reads/writes keyed by `(classId, layoutVersion)` (ON JVM default).
|
||||||
- `METHOD_PIC` — 2‑entry PIC for instance method calls keyed by `(classId, layoutVersion)` (ON JVM default).
|
- `METHOD_PIC` — 2‑entry PIC for instance method calls keyed by `(classId, layoutVersion)` (ON JVM default).
|
||||||
- `FIELD_PIC_SIZE_4` — Increases Field PIC size from 2 to 4 entries (JVM-first tuning; OFF by default). Use for sites with >2 receiver shapes.
|
- `FIELD_PIC_SIZE_4` — Increases Field PIC size from 2 to 4 entries (JVM-first tuning; OFF by default). Use for sites with >2 receiver shapes.
|
||||||
|
|||||||
@@ -0,0 +1,63 @@
|
|||||||
|
// Sample: Operator Overloading in Lyng
|
||||||
|
|
||||||
|
class Vector(val x, val y) {
|
||||||
|
// Overload +
|
||||||
|
fun plus(other) = Vector(x + other.x, y + other.y)
|
||||||
|
|
||||||
|
// Overload -
|
||||||
|
fun minus(other) = Vector(x - other.x, y - other.y)
|
||||||
|
|
||||||
|
// Overload unary -
|
||||||
|
fun negate() = Vector(-x, -y)
|
||||||
|
|
||||||
|
// Overload ==
|
||||||
|
fun equals(other) {
|
||||||
|
if (other is Vector) x == other.x && y == other.y
|
||||||
|
else false
|
||||||
|
}
|
||||||
|
|
||||||
|
// Overload * (scalar multiplication)
|
||||||
|
fun mul(scalar) = Vector(x * scalar, y * scalar)
|
||||||
|
|
||||||
|
override fun toString() = "Vector(${x}, ${y})"
|
||||||
|
}
|
||||||
|
|
||||||
|
val v1 = Vector(10, 20)
|
||||||
|
val v2 = Vector(5, 5)
|
||||||
|
|
||||||
|
println("v1: " + v1)
|
||||||
|
println("v2: " + v2)
|
||||||
|
|
||||||
|
// Test binary +
|
||||||
|
val v3 = v1 + v2
|
||||||
|
println("v1 + v2 = " + v3)
|
||||||
|
assertEquals(Vector(15, 25), v3)
|
||||||
|
|
||||||
|
// Test unary -
|
||||||
|
val v4 = -v1
|
||||||
|
println("-v1 = " + v4)
|
||||||
|
assertEquals(Vector(-10, -20), v4)
|
||||||
|
|
||||||
|
// Test scalar multiplication
|
||||||
|
val v5 = v1 * 2
|
||||||
|
println("v1 * 2 = " + v5)
|
||||||
|
assertEquals(Vector(20, 40), v5)
|
||||||
|
|
||||||
|
// Test += (falls back to plus)
|
||||||
|
var v6 = Vector(1, 1)
|
||||||
|
v6 += Vector(2, 2)
|
||||||
|
println("v6 += (2,2) -> " + v6)
|
||||||
|
assertEquals(Vector(3, 3), v6)
|
||||||
|
|
||||||
|
// Test in-place mutation with plusAssign
|
||||||
|
class Counter(var count) {
|
||||||
|
fun plusAssign(n) {
|
||||||
|
count = count + n
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val c = Counter(0)
|
||||||
|
c += 10
|
||||||
|
c += 5
|
||||||
|
println("Counter: " + c.count)
|
||||||
|
assertEquals(15, c.count)
|
||||||
@@ -8,16 +8,13 @@ Name lookup across nested scopes and closures can accidentally form recursive re
|
|||||||
## Resolution order in ClosureScope
|
## Resolution order in ClosureScope
|
||||||
When evaluating an identifier `name` inside a closure, `ClosureScope.get(name)` resolves in this order:
|
When evaluating an identifier `name` inside a closure, `ClosureScope.get(name)` resolves in this order:
|
||||||
|
|
||||||
1. Closure frame locals and arguments
|
1. **Current frame locals and arguments**: Variables defined within the current closure execution.
|
||||||
2. Captured receiver (`closureScope.thisObj`) instance/class members
|
2. **Captured lexical ancestry**: Outer local variables captured at the site where the closure was defined (the "lexical environment").
|
||||||
3. Closure ancestry locals + each frame’s `thisObj` members (cycle‑safe)
|
3. **Captured receiver members**: If the closure was defined within a class or explicitly bound to an object, it checks members of that object (`this`). This includes both instance fields/methods and class-level static members, following the MRO (C3) and respecting visibility rules (private members are only visible if the closure was defined in their class).
|
||||||
4. Caller `this` members
|
4. **Caller environment**: If not found lexically, it falls back to the calling context (e.g., the DSL's `this` or the caller's local variables).
|
||||||
5. Caller ancestry locals + each frame’s `thisObj` members (cycle‑safe)
|
5. **Global/Module fallbacks**: Final check for module-level constants and global functions.
|
||||||
6. Module pseudo‑symbols (e.g., `__PACKAGE__`) from the nearest `ModuleScope`
|
|
||||||
7. Direct module/global fallback (nearest `ModuleScope` and its parent/root scope)
|
|
||||||
8. Final fallback: base local/parent lookup for the current frame
|
|
||||||
|
|
||||||
This preserves intuitive visibility (locals → captured receiver → closure chain → caller members → caller chain → module/root) while preventing infinite recursion between scope types.
|
This ensures that closures primarily interact with their defining environment (lexical capture) while still being able to participate in DSL-style calling contexts.
|
||||||
|
|
||||||
## Use raw‑chain helpers for ancestry walks
|
## Use raw‑chain helpers for ancestry walks
|
||||||
When authoring new scope types or advanced lookups, avoid calling virtual `get` while walking parents. Instead, use the non‑dispatch helpers on `Scope`:
|
When authoring new scope types or advanced lookups, avoid calling virtual `get` while walking parents. Instead, use the non‑dispatch helpers on `Scope`:
|
||||||
|
|||||||
+9
-3
@@ -1252,7 +1252,7 @@ The same with `--`:
|
|||||||
sum
|
sum
|
||||||
>>> 5050
|
>>> 5050
|
||||||
|
|
||||||
There are self-assigning version for operators too:
|
There is a self-assigning version for operators too:
|
||||||
|
|
||||||
var count = 100
|
var count = 100
|
||||||
var sum = 0
|
var sum = 0
|
||||||
@@ -1471,7 +1471,13 @@ Part match:
|
|||||||
assert( "foo" == $~.value )
|
assert( "foo" == $~.value )
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
Typical set of String functions includes:
|
Repeating the fragment:
|
||||||
|
|
||||||
|
assertEquals("hellohello", "hello"*2)
|
||||||
|
assertEquals("", "hello"*0)
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
A typical set of String functions includes:
|
||||||
|
|
||||||
| fun/prop | description / notes |
|
| fun/prop | description / notes |
|
||||||
|----------------------|------------------------------------------------------------|
|
|----------------------|------------------------------------------------------------|
|
||||||
@@ -1494,7 +1500,7 @@ Typical set of String functions includes:
|
|||||||
| s1 += s2 | self-modifying concatenation |
|
| s1 += s2 | self-modifying concatenation |
|
||||||
| toReal() | attempts to parse string as a Real value |
|
| toReal() | attempts to parse string as a Real value |
|
||||||
| toInt() | parse string to Int value |
|
| toInt() | parse string to Int value |
|
||||||
| characters() | create [List] of characters (1) |
|
| characters | create [List] of characters (1) |
|
||||||
| encodeUtf8() | returns [Buffer] with characters encoded to utf8 |
|
| encodeUtf8() | returns [Buffer] with characters encoded to utf8 |
|
||||||
| matches(re) | matches the regular expression (2) |
|
| matches(re) | matches the regular expression (2) |
|
||||||
| | |
|
| | |
|
||||||
|
|||||||
@@ -139,6 +139,20 @@ var name by Observable("initial") { n, old, new ->
|
|||||||
|
|
||||||
The system features a unified interface (`getValue`, `setValue`, `invoke`) and a `bind` hook for initialization-time validation and configuration. See the [Delegation Guide](delegation.md) for more.
|
The system features a unified interface (`getValue`, `setValue`, `invoke`) and a `bind` hook for initialization-time validation and configuration. See the [Delegation Guide](delegation.md) for more.
|
||||||
|
|
||||||
|
### User-Defined Exception Classes
|
||||||
|
You can now create custom exception types by inheriting from the built-in `Exception` class. Custom exceptions are real classes that can have their own fields and methods, and they work seamlessly with `throw` and `try-catch` blocks.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class ValidationException(val field, m) : Exception(m)
|
||||||
|
|
||||||
|
try {
|
||||||
|
throw ValidationException("email", "Invalid format")
|
||||||
|
}
|
||||||
|
catch(e: ValidationException) {
|
||||||
|
println("Error in " + e.field + ": " + e.message)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
### Assign-if-null Operator (`?=`)
|
### Assign-if-null Operator (`?=`)
|
||||||
The new `?=` operator provides a concise way to assign a value only if the target is `null`. It is especially useful for setting default values or lazy initialization.
|
The new `?=` operator provides a concise way to assign a value only if the target is `null`. It is especially useful for setting default values or lazy initialization.
|
||||||
|
|
||||||
@@ -169,3 +183,6 @@ lyng fmt --check MyFile.lyng # Check if file needs formatting
|
|||||||
Experimental lightweight autocompletion is now available in the IntelliJ plugin. It features type-aware member suggestions and inheritance-aware completion.
|
Experimental lightweight autocompletion is now available in the IntelliJ plugin. It features type-aware member suggestions and inheritance-aware completion.
|
||||||
|
|
||||||
You can enable it in **Settings | Lyng Formatter | Enable Lyng autocompletion**.
|
You can enable it in **Settings | Lyng Formatter | Enable Lyng autocompletion**.
|
||||||
|
|
||||||
|
### Kotlin API: Exception Handling
|
||||||
|
The `Obj.getLyngExceptionMessageWithStackTrace()` extension method has been added to simplify retrieving detailed error information from Lyng exception objects in Kotlin. Additionally, `getLyngExceptionMessage()` and `raiseAsExecutionError()` now accept an optional `Scope`, making it easier to use them when a scope is not immediately available.
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm")
|
kotlin("jvm")
|
||||||
id("org.jetbrains.intellij") version "1.17.3"
|
id("org.jetbrains.intellij") version "1.17.4"
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "net.sergeych.lyng"
|
group = "net.sergeych.lyng"
|
||||||
@@ -45,12 +45,14 @@ dependencies {
|
|||||||
// Tests for IntelliJ Platform fixtures rely on JUnit 3/4 API (junit.framework.TestCase)
|
// Tests for IntelliJ Platform fixtures rely on JUnit 3/4 API (junit.framework.TestCase)
|
||||||
// Add JUnit 4 which contains the JUnit 3 compatibility classes used by BasePlatformTestCase/UsefulTestCase
|
// Add JUnit 4 which contains the JUnit 3 compatibility classes used by BasePlatformTestCase/UsefulTestCase
|
||||||
testImplementation("junit:junit:4.13.2")
|
testImplementation("junit:junit:4.13.2")
|
||||||
|
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.10.2")
|
||||||
|
testImplementation("org.opentest4j:opentest4j:1.3.0")
|
||||||
}
|
}
|
||||||
|
|
||||||
intellij {
|
intellij {
|
||||||
type.set("IC")
|
type.set("IC")
|
||||||
// Build against a modern baseline. Install range is controlled by since/until below.
|
// Build against a modern baseline. Install range is controlled by since/until below.
|
||||||
version.set("2024.3.1")
|
version.set("2024.1.6")
|
||||||
// We manage <idea-version> ourselves in plugin.xml to keep it open-ended (no upper cap)
|
// We manage <idea-version> ourselves in plugin.xml to keep it open-ended (no upper cap)
|
||||||
updateSinceUntilBuild.set(false)
|
updateSinceUntilBuild.set(false)
|
||||||
// Include only available bundled plugins for this IDE build
|
// Include only available bundled plugins for this IDE build
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
package net.sergeych.lyng.idea
|
||||||
|
|
||||||
|
import com.intellij.openapi.fileTypes.FileTypeConsumer
|
||||||
|
import com.intellij.openapi.fileTypes.FileTypeFactory
|
||||||
|
import com.intellij.openapi.fileTypes.WildcardFileNameMatcher
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Legacy way to register file type matchers, used here to robustly match *.lyng.d
|
||||||
|
* without conflicting with standard .d extensions from other plugins.
|
||||||
|
*/
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
|
class LyngFileTypeFactory : FileTypeFactory() {
|
||||||
|
override fun createFileTypes(consumer: FileTypeConsumer) {
|
||||||
|
// Register the multi-dot pattern explicitly
|
||||||
|
consumer.consume(LyngFileType, WildcardFileNameMatcher("*.lyng.d"))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,144 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng.idea.actions
|
||||||
|
|
||||||
|
import com.intellij.execution.filters.TextConsoleBuilderFactory
|
||||||
|
import com.intellij.execution.ui.ConsoleView
|
||||||
|
import com.intellij.execution.ui.ConsoleViewContentType
|
||||||
|
import com.intellij.openapi.actionSystem.AnAction
|
||||||
|
import com.intellij.openapi.actionSystem.AnActionEvent
|
||||||
|
import com.intellij.openapi.actionSystem.CommonDataKeys
|
||||||
|
import com.intellij.openapi.project.Project
|
||||||
|
import com.intellij.openapi.wm.ToolWindow
|
||||||
|
import com.intellij.openapi.wm.ToolWindowAnchor
|
||||||
|
import com.intellij.openapi.wm.ToolWindowId
|
||||||
|
import com.intellij.openapi.wm.ToolWindowManager
|
||||||
|
import com.intellij.psi.PsiFile
|
||||||
|
import com.intellij.psi.PsiManager
|
||||||
|
import com.intellij.ui.content.ContentFactory
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.SupervisorJob
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
import net.sergeych.lyng.ExecutionError
|
||||||
|
import net.sergeych.lyng.Script
|
||||||
|
import net.sergeych.lyng.Source
|
||||||
|
import net.sergeych.lyng.idea.LyngIcons
|
||||||
|
import net.sergeych.lyng.obj.ObjVoid
|
||||||
|
import net.sergeych.lyng.obj.getLyngExceptionMessageWithStackTrace
|
||||||
|
|
||||||
|
class RunLyngScriptAction : AnAction(LyngIcons.FILE) {
|
||||||
|
private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
|
||||||
|
|
||||||
|
private fun getPsiFile(e: AnActionEvent): PsiFile? {
|
||||||
|
val project = e.project ?: return null
|
||||||
|
return e.getData(CommonDataKeys.PSI_FILE) ?: run {
|
||||||
|
val vf = e.getData(CommonDataKeys.VIRTUAL_FILE)
|
||||||
|
if (vf != null) PsiManager.getInstance(project).findFile(vf) else null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun update(e: AnActionEvent) {
|
||||||
|
val psiFile = getPsiFile(e)
|
||||||
|
val isLyng = psiFile?.name?.endsWith(".lyng") == true
|
||||||
|
e.presentation.isEnabledAndVisible = isLyng
|
||||||
|
if (isLyng) {
|
||||||
|
e.presentation.text = "Run '${psiFile.name}'"
|
||||||
|
} else {
|
||||||
|
e.presentation.text = "Run Lyng Script"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun actionPerformed(e: AnActionEvent) {
|
||||||
|
val project = e.project ?: return
|
||||||
|
val psiFile = getPsiFile(e) ?: return
|
||||||
|
val text = psiFile.text
|
||||||
|
val fileName = psiFile.name
|
||||||
|
|
||||||
|
val (console, toolWindow) = getConsoleAndToolWindow(project)
|
||||||
|
console.clear()
|
||||||
|
|
||||||
|
toolWindow.show {
|
||||||
|
scope.launch {
|
||||||
|
try {
|
||||||
|
val lyngScope = Script.newScope()
|
||||||
|
lyngScope.addFn("print") {
|
||||||
|
val sb = StringBuilder()
|
||||||
|
for ((i, arg) in args.list.withIndex()) {
|
||||||
|
if (i > 0) sb.append(" ")
|
||||||
|
sb.append(arg.toString(this).value)
|
||||||
|
}
|
||||||
|
console.print(sb.toString(), ConsoleViewContentType.NORMAL_OUTPUT)
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
lyngScope.addFn("println") {
|
||||||
|
val sb = StringBuilder()
|
||||||
|
for ((i, arg) in args.list.withIndex()) {
|
||||||
|
if (i > 0) sb.append(" ")
|
||||||
|
sb.append(arg.toString(this).value)
|
||||||
|
}
|
||||||
|
console.print(sb.toString() + "\n", ConsoleViewContentType.NORMAL_OUTPUT)
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
|
||||||
|
console.print("--- Running $fileName ---\n", ConsoleViewContentType.SYSTEM_OUTPUT)
|
||||||
|
val result = lyngScope.eval(Source(fileName, text))
|
||||||
|
console.print("\n--- Finished with result: ${result.inspect(lyngScope)} ---\n", ConsoleViewContentType.SYSTEM_OUTPUT)
|
||||||
|
} catch (t: Throwable) {
|
||||||
|
console.print("\n--- Error ---\n", ConsoleViewContentType.ERROR_OUTPUT)
|
||||||
|
if( t is ExecutionError ) {
|
||||||
|
val m = t.errorObject.getLyngExceptionMessageWithStackTrace()
|
||||||
|
console.print(m, ConsoleViewContentType.ERROR_OUTPUT)
|
||||||
|
}
|
||||||
|
else
|
||||||
|
console.print(t.message ?: t.toString(), ConsoleViewContentType.ERROR_OUTPUT)
|
||||||
|
console.print("\n", ConsoleViewContentType.ERROR_OUTPUT)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getConsoleAndToolWindow(project: Project): Pair<ConsoleView, ToolWindow> {
|
||||||
|
val toolWindowManager = ToolWindowManager.getInstance(project)
|
||||||
|
var toolWindow = toolWindowManager.getToolWindow(ToolWindowId.RUN)
|
||||||
|
if (toolWindow == null) {
|
||||||
|
toolWindow = toolWindowManager.getToolWindow(ToolWindowId.MESSAGES_WINDOW)
|
||||||
|
}
|
||||||
|
if (toolWindow == null) {
|
||||||
|
toolWindow = toolWindowManager.getToolWindow("Lyng")
|
||||||
|
}
|
||||||
|
val actualToolWindow = toolWindow ?: run {
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
|
toolWindowManager.registerToolWindow("Lyng", true, ToolWindowAnchor.BOTTOM)
|
||||||
|
}
|
||||||
|
|
||||||
|
val contentManager = actualToolWindow.contentManager
|
||||||
|
val existingContent = contentManager.findContent("Lyng Run")
|
||||||
|
if (existingContent != null) {
|
||||||
|
val console = existingContent.component as ConsoleView
|
||||||
|
contentManager.setSelectedContent(existingContent)
|
||||||
|
return console to actualToolWindow
|
||||||
|
}
|
||||||
|
|
||||||
|
val console = TextConsoleBuilderFactory.getInstance().createBuilder(project).console
|
||||||
|
val content = ContentFactory.getInstance().createContent(console.component, "Lyng Run", false)
|
||||||
|
contentManager.addContent(content)
|
||||||
|
contentManager.setSelectedContent(content)
|
||||||
|
return console to actualToolWindow
|
||||||
|
}
|
||||||
|
}
|
||||||
+136
-158
@@ -25,9 +25,6 @@ import com.intellij.openapi.progress.ProgressManager
|
|||||||
import com.intellij.openapi.util.Key
|
import com.intellij.openapi.util.Key
|
||||||
import com.intellij.openapi.util.TextRange
|
import com.intellij.openapi.util.TextRange
|
||||||
import com.intellij.psi.PsiFile
|
import com.intellij.psi.PsiFile
|
||||||
import kotlinx.coroutines.runBlocking
|
|
||||||
import net.sergeych.lyng.Compiler
|
|
||||||
import net.sergeych.lyng.ScriptError
|
|
||||||
import net.sergeych.lyng.Source
|
import net.sergeych.lyng.Source
|
||||||
import net.sergeych.lyng.binding.Binder
|
import net.sergeych.lyng.binding.Binder
|
||||||
import net.sergeych.lyng.binding.SymbolKind
|
import net.sergeych.lyng.binding.SymbolKind
|
||||||
@@ -35,7 +32,7 @@ import net.sergeych.lyng.highlight.HighlightKind
|
|||||||
import net.sergeych.lyng.highlight.SimpleLyngHighlighter
|
import net.sergeych.lyng.highlight.SimpleLyngHighlighter
|
||||||
import net.sergeych.lyng.highlight.offsetOf
|
import net.sergeych.lyng.highlight.offsetOf
|
||||||
import net.sergeych.lyng.idea.highlight.LyngHighlighterColors
|
import net.sergeych.lyng.idea.highlight.LyngHighlighterColors
|
||||||
import net.sergeych.lyng.idea.util.IdeLenientImportProvider
|
import net.sergeych.lyng.idea.util.LyngAstManager
|
||||||
import net.sergeych.lyng.miniast.*
|
import net.sergeych.lyng.miniast.*
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -43,54 +40,33 @@ import net.sergeych.lyng.miniast.*
|
|||||||
* and applies semantic highlighting comparable with the web highlighter.
|
* and applies semantic highlighting comparable with the web highlighter.
|
||||||
*/
|
*/
|
||||||
class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, LyngExternalAnnotator.Result>() {
|
class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, LyngExternalAnnotator.Result>() {
|
||||||
data class Input(val text: String, val modStamp: Long, val previousSpans: List<Span>?)
|
data class Input(val text: String, val modStamp: Long, val previousSpans: List<Span>?, val file: PsiFile)
|
||||||
|
|
||||||
data class Span(val start: Int, val end: Int, val key: com.intellij.openapi.editor.colors.TextAttributesKey)
|
data class Span(val start: Int, val end: Int, val key: com.intellij.openapi.editor.colors.TextAttributesKey)
|
||||||
data class Error(val start: Int, val end: Int, val message: String)
|
data class Error(val start: Int, val end: Int, val message: String)
|
||||||
data class Result(val modStamp: Long, val spans: List<Span>, val error: Error? = null,
|
data class Result(val modStamp: Long, val spans: List<Span>, val error: Error? = null)
|
||||||
val spellIdentifiers: List<IntRange> = emptyList(),
|
|
||||||
val spellComments: List<IntRange> = emptyList(),
|
|
||||||
val spellStrings: List<IntRange> = emptyList())
|
|
||||||
|
|
||||||
override fun collectInformation(file: PsiFile): Input? {
|
override fun collectInformation(file: PsiFile): Input? {
|
||||||
val doc: Document = file.viewProvider.document ?: return null
|
val doc: Document = file.viewProvider.document ?: return null
|
||||||
val cached = file.getUserData(CACHE_KEY)
|
val cached = file.getUserData(CACHE_KEY)
|
||||||
// Fast fix (1): reuse cached spans only if they were computed for the same modification stamp
|
val combinedStamp = LyngAstManager.getCombinedStamp(file)
|
||||||
val prev = if (cached != null && cached.modStamp == doc.modificationStamp) cached.spans else null
|
|
||||||
return Input(doc.text, doc.modificationStamp, prev)
|
val prev = if (cached != null && cached.modStamp == combinedStamp) cached.spans else null
|
||||||
|
return Input(doc.text, combinedStamp, prev, file)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun doAnnotate(collectedInfo: Input?): Result? {
|
override fun doAnnotate(collectedInfo: Input?): Result? {
|
||||||
if (collectedInfo == null) return null
|
if (collectedInfo == null) return null
|
||||||
ProgressManager.checkCanceled()
|
ProgressManager.checkCanceled()
|
||||||
val text = collectedInfo.text
|
val text = collectedInfo.text
|
||||||
// Build Mini-AST using the same mechanism as web highlighter
|
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
||||||
val sink = MiniAstBuilder()
|
|
||||||
val source = Source("<ide>", text)
|
// Use LyngAstManager to get the (potentially merged) Mini-AST
|
||||||
try {
|
val mini = LyngAstManager.getMiniAst(collectedInfo.file)
|
||||||
// Call suspend API from blocking context
|
?: return Result(collectedInfo.modStamp, collectedInfo.previousSpans ?: emptyList())
|
||||||
val provider = IdeLenientImportProvider.create()
|
|
||||||
runBlocking { Compiler.compileWithMini(source, provider, sink) }
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
if (e is com.intellij.openapi.progress.ProcessCanceledException) throw e
|
|
||||||
// On script parse error: keep previous spans and report the error location
|
|
||||||
if (e is ScriptError) {
|
|
||||||
val off = try { source.offsetOf(e.pos) } catch (_: Throwable) { -1 }
|
|
||||||
val start0 = off.coerceIn(0, text.length.coerceAtLeast(0))
|
|
||||||
val (start, end) = expandErrorRange(text, start0)
|
|
||||||
// Fast fix (5): clear cached highlighting after the error start position
|
|
||||||
val trimmed = collectedInfo.previousSpans?.filter { it.end <= start } ?: emptyList()
|
|
||||||
return Result(
|
|
||||||
collectedInfo.modStamp,
|
|
||||||
trimmed,
|
|
||||||
Error(start, end, e.errorMessage)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
// Other failures: keep previous spans without error
|
|
||||||
return Result(collectedInfo.modStamp, collectedInfo.previousSpans ?: emptyList(), null)
|
|
||||||
}
|
|
||||||
ProgressManager.checkCanceled()
|
ProgressManager.checkCanceled()
|
||||||
val mini = sink.build() ?: return Result(collectedInfo.modStamp, collectedInfo.previousSpans ?: emptyList())
|
val source = Source(collectedInfo.file.name, text)
|
||||||
|
|
||||||
val out = ArrayList<Span>(256)
|
val out = ArrayList<Span>(256)
|
||||||
|
|
||||||
@@ -118,7 +94,8 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Declarations
|
// Declarations
|
||||||
for (d in mini.declarations) {
|
mini.declarations.forEach { d ->
|
||||||
|
if (d.nameStart.source != source) return@forEach
|
||||||
when (d) {
|
when (d) {
|
||||||
is MiniFunDecl -> putName(d.nameStart, d.name, LyngHighlighterColors.FUNCTION_DECLARATION)
|
is MiniFunDecl -> putName(d.nameStart, d.name, LyngHighlighterColors.FUNCTION_DECLARATION)
|
||||||
is MiniClassDecl -> putName(d.nameStart, d.name, LyngHighlighterColors.TYPE)
|
is MiniClassDecl -> putName(d.nameStart, d.name, LyngHighlighterColors.TYPE)
|
||||||
@@ -132,19 +109,31 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Imports: each segment as namespace/path
|
// Imports: each segment as namespace/path
|
||||||
for (imp in mini.imports) {
|
mini.imports.forEach { imp ->
|
||||||
for (seg in imp.segments) putMiniRange(seg.range, LyngHighlighterColors.NAMESPACE)
|
if (imp.range.start.source != source) return@forEach
|
||||||
|
imp.segments.forEach { seg -> putMiniRange(seg.range, LyngHighlighterColors.NAMESPACE) }
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parameters
|
// Parameters
|
||||||
for (fn in mini.declarations.filterIsInstance<MiniFunDecl>()) {
|
fun addParams(params: List<MiniParam>) {
|
||||||
for (p in fn.params) putName(p.nameStart, p.name, LyngHighlighterColors.PARAMETER)
|
params.forEach { p ->
|
||||||
|
if (p.nameStart.source == source)
|
||||||
|
putName(p.nameStart, p.name, LyngHighlighterColors.PARAMETER)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
mini.declarations.forEach { d ->
|
||||||
|
when (d) {
|
||||||
|
is MiniFunDecl -> addParams(d.params)
|
||||||
|
is MiniClassDecl -> d.members.filterIsInstance<MiniMemberFunDecl>().forEach { addParams(it.params) }
|
||||||
|
else -> {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Type name segments (including generics base & args)
|
// Type name segments (including generics base & args)
|
||||||
fun addTypeSegments(t: MiniTypeRef?) {
|
fun addTypeSegments(t: MiniTypeRef?) {
|
||||||
when (t) {
|
when (t) {
|
||||||
is MiniTypeName -> t.segments.forEach { seg ->
|
is MiniTypeName -> t.segments.forEach { seg ->
|
||||||
|
if (seg.range.start.source != source) return@forEach
|
||||||
val s = source.offsetOf(seg.range.start)
|
val s = source.offsetOf(seg.range.start)
|
||||||
putRange(s, (s + seg.name.length).coerceAtMost(text.length), LyngHighlighterColors.TYPE)
|
putRange(s, (s + seg.name.length).coerceAtMost(text.length), LyngHighlighterColors.TYPE)
|
||||||
}
|
}
|
||||||
@@ -158,12 +147,14 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
addTypeSegments(t.returnType)
|
addTypeSegments(t.returnType)
|
||||||
}
|
}
|
||||||
is MiniTypeVar -> { /* name is in range; could be highlighted as TYPE as well */
|
is MiniTypeVar -> { /* name is in range; could be highlighted as TYPE as well */
|
||||||
putMiniRange(t.range, LyngHighlighterColors.TYPE)
|
if (t.range.start.source == source)
|
||||||
|
putMiniRange(t.range, LyngHighlighterColors.TYPE)
|
||||||
}
|
}
|
||||||
null -> {}
|
null -> {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (d in mini.declarations) {
|
fun addDeclTypeSegments(d: MiniDecl) {
|
||||||
|
if (d.nameStart.source != source) return
|
||||||
when (d) {
|
when (d) {
|
||||||
is MiniFunDecl -> {
|
is MiniFunDecl -> {
|
||||||
addTypeSegments(d.returnType)
|
addTypeSegments(d.returnType)
|
||||||
@@ -177,10 +168,23 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
is MiniClassDecl -> {
|
is MiniClassDecl -> {
|
||||||
d.ctorFields.forEach { addTypeSegments(it.type) }
|
d.ctorFields.forEach { addTypeSegments(it.type) }
|
||||||
d.classFields.forEach { addTypeSegments(it.type) }
|
d.classFields.forEach { addTypeSegments(it.type) }
|
||||||
|
for (m in d.members) {
|
||||||
|
when (m) {
|
||||||
|
is MiniMemberFunDecl -> {
|
||||||
|
addTypeSegments(m.returnType)
|
||||||
|
m.params.forEach { addTypeSegments(it.type) }
|
||||||
|
}
|
||||||
|
is MiniMemberValDecl -> {
|
||||||
|
addTypeSegments(m.type)
|
||||||
|
}
|
||||||
|
else -> {}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
is MiniEnumDecl -> {}
|
is MiniEnumDecl -> {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
mini.declarations.forEach { d -> addDeclTypeSegments(d) }
|
||||||
|
|
||||||
ProgressManager.checkCanceled()
|
ProgressManager.checkCanceled()
|
||||||
|
|
||||||
@@ -190,7 +194,7 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
|
|
||||||
// Map declaration ranges to avoid duplicating them as usages
|
// Map declaration ranges to avoid duplicating them as usages
|
||||||
val declKeys = HashSet<Pair<Int, Int>>(binding.symbols.size * 2)
|
val declKeys = HashSet<Pair<Int, Int>>(binding.symbols.size * 2)
|
||||||
for (sym in binding.symbols) declKeys += (sym.declStart to sym.declEnd)
|
binding.symbols.forEach { sym -> declKeys += (sym.declStart to sym.declEnd) }
|
||||||
|
|
||||||
fun keyForKind(k: SymbolKind) = when (k) {
|
fun keyForKind(k: SymbolKind) = when (k) {
|
||||||
SymbolKind.Function -> LyngHighlighterColors.FUNCTION
|
SymbolKind.Function -> LyngHighlighterColors.FUNCTION
|
||||||
@@ -203,48 +207,65 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
// Track covered ranges to not override later heuristics
|
// Track covered ranges to not override later heuristics
|
||||||
val covered = HashSet<Pair<Int, Int>>()
|
val covered = HashSet<Pair<Int, Int>>()
|
||||||
|
|
||||||
for (ref in binding.references) {
|
binding.references.forEach { ref ->
|
||||||
val key = ref.start to ref.end
|
val key = ref.start to ref.end
|
||||||
if (declKeys.contains(key)) continue
|
if (!declKeys.contains(key)) {
|
||||||
val sym = binding.symbols.firstOrNull { it.id == ref.symbolId } ?: continue
|
val sym = binding.symbols.firstOrNull { it.id == ref.symbolId }
|
||||||
val color = keyForKind(sym.kind)
|
if (sym != null) {
|
||||||
putRange(ref.start, ref.end, color)
|
val color = keyForKind(sym.kind)
|
||||||
covered += key
|
putRange(ref.start, ref.end, color)
|
||||||
|
covered += key
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Heuristics on top of binder: function call-sites and simple name-based roles
|
// Heuristics on top of binder: function call-sites and simple name-based roles
|
||||||
ProgressManager.checkCanceled()
|
ProgressManager.checkCanceled()
|
||||||
|
|
||||||
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
|
||||||
|
|
||||||
// Build simple name -> role map for top-level vals/vars and parameters
|
// Build simple name -> role map for top-level vals/vars and parameters
|
||||||
val nameRole = HashMap<String, com.intellij.openapi.editor.colors.TextAttributesKey>(8)
|
val nameRole = HashMap<String, com.intellij.openapi.editor.colors.TextAttributesKey>(8)
|
||||||
for (d in mini.declarations) when (d) {
|
mini.declarations.forEach { d ->
|
||||||
is MiniValDecl -> nameRole[d.name] = if (d.mutable) LyngHighlighterColors.VARIABLE else LyngHighlighterColors.VALUE
|
when (d) {
|
||||||
is MiniFunDecl -> d.params.forEach { p -> nameRole[p.name] = LyngHighlighterColors.PARAMETER }
|
is MiniValDecl -> nameRole[d.name] =
|
||||||
else -> {}
|
if (d.mutable) LyngHighlighterColors.VARIABLE else LyngHighlighterColors.VALUE
|
||||||
|
|
||||||
|
is MiniFunDecl -> d.params.forEach { p -> nameRole[p.name] = LyngHighlighterColors.PARAMETER }
|
||||||
|
is MiniClassDecl -> {
|
||||||
|
d.members.forEach { m ->
|
||||||
|
if (m is MiniMemberFunDecl) {
|
||||||
|
m.params.forEach { p -> nameRole[p.name] = LyngHighlighterColors.PARAMETER }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else -> {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (s in tokens) if (s.kind == HighlightKind.Identifier) {
|
tokens.forEach { s ->
|
||||||
val start = s.range.start
|
if (s.kind == HighlightKind.Identifier) {
|
||||||
val end = s.range.endExclusive
|
val start = s.range.start
|
||||||
val key = start to end
|
val end = s.range.endExclusive
|
||||||
if (key in covered || key in declKeys) continue
|
val key = start to end
|
||||||
|
if (key !in covered && key !in declKeys) {
|
||||||
// Call-site detection first so it wins over var/param role
|
// Call-site detection first so it wins over var/param role
|
||||||
if (isFollowedByParenOrBlock(end)) {
|
if (isFollowedByParenOrBlock(end)) {
|
||||||
putRange(start, end, LyngHighlighterColors.FUNCTION)
|
putRange(start, end, LyngHighlighterColors.FUNCTION)
|
||||||
covered += key
|
covered += key
|
||||||
continue
|
} else {
|
||||||
}
|
// Simple role by known names
|
||||||
|
val ident = try {
|
||||||
// Simple role by known names
|
text.substring(start, end)
|
||||||
val ident = try { text.substring(start, end) } catch (_: Throwable) { null }
|
} catch (_: Throwable) {
|
||||||
if (ident != null) {
|
null
|
||||||
val roleKey = nameRole[ident]
|
}
|
||||||
if (roleKey != null) {
|
if (ident != null) {
|
||||||
putRange(start, end, roleKey)
|
val roleKey = nameRole[ident]
|
||||||
covered += key
|
if (roleKey != null) {
|
||||||
|
putRange(start, end, roleKey)
|
||||||
|
covered += key
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -255,32 +276,37 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
|
|
||||||
// Add annotation/label coloring using token highlighter
|
// Add annotation/label coloring using token highlighter
|
||||||
run {
|
run {
|
||||||
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
tokens.forEach { s ->
|
||||||
for (s in tokens) if (s.kind == HighlightKind.Label) {
|
if (s.kind == HighlightKind.Label) {
|
||||||
val start = s.range.start
|
val start = s.range.start
|
||||||
val end = s.range.endExclusive
|
val end = s.range.endExclusive
|
||||||
if (start in 0..end && end <= text.length && start < end) {
|
if (start in 0..end && end <= text.length && start < end) {
|
||||||
val lexeme = try { text.substring(start, end) } catch (_: Throwable) { null }
|
val lexeme = try {
|
||||||
if (lexeme != null) {
|
text.substring(start, end)
|
||||||
// Heuristic: if it starts with @ and follows a control keyword, it's likely a label
|
} catch (_: Throwable) {
|
||||||
// Otherwise if it starts with @ it's an annotation.
|
null
|
||||||
// If it ends with @ it's a loop label.
|
}
|
||||||
when {
|
if (lexeme != null) {
|
||||||
lexeme.endsWith("@") -> putRange(start, end, LyngHighlighterColors.LABEL)
|
// Heuristic: if it starts with @ and follows a control keyword, it's likely a label
|
||||||
lexeme.startsWith("@") -> {
|
// Otherwise if it starts with @ it's an annotation.
|
||||||
// Try to see if it's an exit label
|
// If it ends with @ it's a loop label.
|
||||||
val prevNonWs = prevNonWs(text, start)
|
when {
|
||||||
val prevWord = if (prevNonWs >= 0) {
|
lexeme.endsWith("@") -> putRange(start, end, LyngHighlighterColors.LABEL)
|
||||||
var wEnd = prevNonWs + 1
|
lexeme.startsWith("@") -> {
|
||||||
var wStart = prevNonWs
|
// Try to see if it's an exit label
|
||||||
while (wStart > 0 && text[wStart - 1].isLetter()) wStart--
|
val prevNonWs = prevNonWs(text, start)
|
||||||
text.substring(wStart, wEnd)
|
val prevWord = if (prevNonWs >= 0) {
|
||||||
} else null
|
var wEnd = prevNonWs + 1
|
||||||
|
var wStart = prevNonWs
|
||||||
|
while (wStart > 0 && text[wStart - 1].isLetter()) wStart--
|
||||||
|
text.substring(wStart, wEnd)
|
||||||
|
} else null
|
||||||
|
|
||||||
if (prevWord in setOf("return", "break", "continue") || isFollowedByParenOrBlock(end)) {
|
if (prevWord in setOf("return", "break", "continue") || isFollowedByParenOrBlock(end)) {
|
||||||
putRange(start, end, LyngHighlighterColors.LABEL)
|
putRange(start, end, LyngHighlighterColors.LABEL)
|
||||||
} else {
|
} else {
|
||||||
putRange(start, end, LyngHighlighterColors.ANNOTATION)
|
putRange(start, end, LyngHighlighterColors.ANNOTATION)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -289,10 +315,8 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Map Enum constants from token highlighter to IDEA enum constant color
|
tokens.forEach { s ->
|
||||||
run {
|
if (s.kind == HighlightKind.EnumConstant) {
|
||||||
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
|
||||||
for (s in tokens) if (s.kind == HighlightKind.EnumConstant) {
|
|
||||||
val start = s.range.start
|
val start = s.range.start
|
||||||
val end = s.range.endExclusive
|
val end = s.range.endExclusive
|
||||||
if (start in 0..end && end <= text.length && start < end) {
|
if (start in 0..end && end <= text.length && start < end) {
|
||||||
@@ -301,65 +325,19 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build spell index payload: identifiers from symbols + references; comments/strings from simple highlighter
|
return Result(collectedInfo.modStamp, out, null)
|
||||||
val idRanges = mutableSetOf<IntRange>()
|
|
||||||
try {
|
|
||||||
val binding = Binder.bind(text, mini)
|
|
||||||
for (sym in binding.symbols) {
|
|
||||||
val s = sym.declStart; val e = sym.declEnd
|
|
||||||
if (s in 0..e && e <= text.length && s < e) idRanges += (s until e)
|
|
||||||
}
|
|
||||||
for (ref in binding.references) {
|
|
||||||
val s = ref.start; val e = ref.end
|
|
||||||
if (s in 0..e && e <= text.length && s < e) idRanges += (s until e)
|
|
||||||
}
|
|
||||||
} catch (_: Throwable) {
|
|
||||||
// Best-effort; no identifiers if binder fails
|
|
||||||
}
|
|
||||||
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
|
||||||
val commentRanges = tokens.filter { it.kind == HighlightKind.Comment }.map { it.range.start until it.range.endExclusive }
|
|
||||||
val stringRanges = tokens.filter { it.kind == HighlightKind.String }.map { it.range.start until it.range.endExclusive }
|
|
||||||
|
|
||||||
return Result(collectedInfo.modStamp, out, null,
|
|
||||||
spellIdentifiers = idRanges.toList(),
|
|
||||||
spellComments = commentRanges,
|
|
||||||
spellStrings = stringRanges)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
override fun apply(file: PsiFile, annotationResult: Result?, holder: AnnotationHolder) {
|
override fun apply(file: PsiFile, annotationResult: Result?, holder: AnnotationHolder) {
|
||||||
if (annotationResult == null) return
|
if (annotationResult == null) return
|
||||||
// Skip if cache is up-to-date
|
// Skip if cache is up-to-date
|
||||||
val doc = file.viewProvider.document
|
val combinedStamp = LyngAstManager.getCombinedStamp(file)
|
||||||
val currentStamp = doc?.modificationStamp
|
|
||||||
val cached = file.getUserData(CACHE_KEY)
|
val cached = file.getUserData(CACHE_KEY)
|
||||||
val result = if (cached != null && currentStamp != null && cached.modStamp == currentStamp) cached else annotationResult
|
val result = if (cached != null && cached.modStamp == combinedStamp) cached else annotationResult
|
||||||
file.putUserData(CACHE_KEY, result)
|
file.putUserData(CACHE_KEY, result)
|
||||||
|
|
||||||
// Store spell index for spell/grammar engines to consume (suspend until ready)
|
val doc = file.viewProvider.document
|
||||||
val ids = result.spellIdentifiers.map { TextRange(it.first, it.last + 1) }
|
|
||||||
val coms = result.spellComments.map { TextRange(it.first, it.last + 1) }
|
|
||||||
val strs = result.spellStrings.map { TextRange(it.first, it.last + 1) }
|
|
||||||
net.sergeych.lyng.idea.spell.LyngSpellIndex.store(file,
|
|
||||||
net.sergeych.lyng.idea.spell.LyngSpellIndex.Data(
|
|
||||||
modStamp = result.modStamp,
|
|
||||||
identifiers = ids,
|
|
||||||
comments = coms,
|
|
||||||
strings = strs
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
// Optional diagnostic overlay: visualize the ranges we will feed to spellcheckers
|
|
||||||
val settings = net.sergeych.lyng.idea.settings.LyngFormatterSettings.getInstance(file.project)
|
|
||||||
if (settings.debugShowSpellFeed) {
|
|
||||||
fun paint(r: TextRange, label: String) {
|
|
||||||
holder.newAnnotation(HighlightSeverity.WEAK_WARNING, "spell-feed: $label")
|
|
||||||
.range(r)
|
|
||||||
.create()
|
|
||||||
}
|
|
||||||
ids.forEach { paint(it, "id") }
|
|
||||||
coms.forEach { paint(it, "comment") }
|
|
||||||
if (settings.spellCheckStringLiterals) strs.forEach { paint(it, "string") }
|
|
||||||
}
|
|
||||||
|
|
||||||
for (s in result.spans) {
|
for (s in result.spans) {
|
||||||
holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
|
holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
|
||||||
|
|||||||
+131
-84
@@ -102,7 +102,7 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
|
|
||||||
// Delegate computation to the shared engine to keep behavior in sync with tests
|
// Delegate computation to the shared engine to keep behavior in sync with tests
|
||||||
val engineItems = try {
|
val engineItems = try {
|
||||||
runBlocking { CompletionEngineLight.completeSuspend(text, caret) }
|
runBlocking { CompletionEngineLight.completeSuspend(text, caret, mini, binding) }
|
||||||
} catch (t: Throwable) {
|
} catch (t: Throwable) {
|
||||||
if (DEBUG_COMPLETION) log.warn("[LYNG_DEBUG] Engine completion failed: ${t.message}")
|
if (DEBUG_COMPLETION) log.warn("[LYNG_DEBUG] Engine completion failed: ${t.message}")
|
||||||
emptyList()
|
emptyList()
|
||||||
@@ -116,7 +116,7 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
if (memberDotPos != null && engineItems.isEmpty()) {
|
if (memberDotPos != null && engineItems.isEmpty()) {
|
||||||
if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Fallback: engine returned 0 in member context; trying local inference")
|
if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Fallback: engine returned 0 in member context; trying local inference")
|
||||||
// Build imported modules from text (lenient) + stdlib; avoid heavy MiniAst here
|
// Build imported modules from text (lenient) + stdlib; avoid heavy MiniAst here
|
||||||
val fromText = extractImportsFromText(text)
|
val fromText = DocLookupUtils.extractImportsFromText(text)
|
||||||
val imported = LinkedHashSet<String>().apply {
|
val imported = LinkedHashSet<String>().apply {
|
||||||
fromText.forEach { add(it) }
|
fromText.forEach { add(it) }
|
||||||
add("lyng.stdlib")
|
add("lyng.stdlib")
|
||||||
@@ -167,12 +167,16 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
.withIcon(AllIcons.Nodes.Field)
|
.withIcon(AllIcons.Nodes.Field)
|
||||||
.let { b -> if (!ci.typeText.isNullOrBlank()) b.withTypeText(ci.typeText, true) else b }
|
.let { b -> if (!ci.typeText.isNullOrBlank()) b.withTypeText(ci.typeText, true) else b }
|
||||||
}
|
}
|
||||||
emit(builder)
|
if (ci.priority != 0.0) {
|
||||||
|
emit(PrioritizedLookupElement.withPriority(builder, ci.priority))
|
||||||
|
} else {
|
||||||
|
emit(builder)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// In member context, ensure stdlib extension-like methods (e.g., String.re) are present
|
// In member context, ensure stdlib extension-like methods (e.g., String.re) are present
|
||||||
if (memberDotPos != null) {
|
if (memberDotPos != null) {
|
||||||
val existing = engineItems.map { it.name }.toMutableSet()
|
val existing = engineItems.map { it.name }.toMutableSet()
|
||||||
val fromText = extractImportsFromText(text)
|
val fromText = DocLookupUtils.extractImportsFromText(text)
|
||||||
val imported = LinkedHashSet<String>().apply {
|
val imported = LinkedHashSet<String>().apply {
|
||||||
fromText.forEach { add(it) }
|
fromText.forEach { add(it) }
|
||||||
add("lyng.stdlib")
|
add("lyng.stdlib")
|
||||||
@@ -185,33 +189,51 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
?: DocLookupUtils.guessReturnClassAcrossKnownCallees(text, memberDotPos, imported, mini)
|
?: DocLookupUtils.guessReturnClassAcrossKnownCallees(text, memberDotPos, imported, mini)
|
||||||
?: DocLookupUtils.guessReceiverClass(text, memberDotPos, imported, mini)
|
?: DocLookupUtils.guessReceiverClass(text, memberDotPos, imported, mini)
|
||||||
if (!inferredClass.isNullOrBlank()) {
|
if (!inferredClass.isNullOrBlank()) {
|
||||||
val ext = BuiltinDocRegistry.extensionMemberNamesFor(inferredClass)
|
val ext = DocLookupUtils.collectExtensionMemberNames(imported, inferredClass, mini)
|
||||||
if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Post-engine extension check for $inferredClass: ${'$'}{ext}")
|
if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Post-engine extension check for $inferredClass: ${ext}")
|
||||||
for (name in ext) {
|
for (name in ext) {
|
||||||
if (existing.contains(name)) continue
|
if (existing.contains(name)) continue
|
||||||
val resolved = DocLookupUtils.resolveMemberWithInheritance(imported, inferredClass, name, mini)
|
val resolved = DocLookupUtils.resolveMemberWithInheritance(imported, inferredClass, name, mini)
|
||||||
if (resolved != null) {
|
if (resolved != null) {
|
||||||
when (val member = resolved.second) {
|
val m = resolved.second
|
||||||
|
val builder = when (m) {
|
||||||
is MiniMemberFunDecl -> {
|
is MiniMemberFunDecl -> {
|
||||||
val params = member.params.joinToString(", ") { it.name }
|
val params = m.params.joinToString(", ") { it.name }
|
||||||
val ret = typeOf(member.returnType)
|
val ret = typeOf(m.returnType)
|
||||||
val builder = LookupElementBuilder.create(name)
|
LookupElementBuilder.create(name)
|
||||||
.withIcon(AllIcons.Nodes.Method)
|
.withIcon(AllIcons.Nodes.Method)
|
||||||
.withTailText("(${ '$' }params)", true)
|
.withTailText("($params)", true)
|
||||||
|
.withTypeText(ret, true)
|
||||||
|
.withInsertHandler(ParenInsertHandler)
|
||||||
|
}
|
||||||
|
is MiniFunDecl -> {
|
||||||
|
val params = m.params.joinToString(", ") { it.name }
|
||||||
|
val ret = typeOf(m.returnType)
|
||||||
|
LookupElementBuilder.create(name)
|
||||||
|
.withIcon(AllIcons.Nodes.Method)
|
||||||
|
.withTailText("($params)", true)
|
||||||
.withTypeText(ret, true)
|
.withTypeText(ret, true)
|
||||||
.withInsertHandler(ParenInsertHandler)
|
.withInsertHandler(ParenInsertHandler)
|
||||||
emit(builder)
|
|
||||||
existing.add(name)
|
|
||||||
}
|
}
|
||||||
is MiniMemberValDecl -> {
|
is MiniMemberValDecl -> {
|
||||||
val builder = LookupElementBuilder.create(name)
|
LookupElementBuilder.create(name)
|
||||||
.withIcon(if (member.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field)
|
.withIcon(if (m.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field)
|
||||||
.withTypeText(typeOf(member.type), true)
|
.withTypeText(typeOf(m.type), true)
|
||||||
emit(builder)
|
}
|
||||||
existing.add(name)
|
is MiniValDecl -> {
|
||||||
|
LookupElementBuilder.create(name)
|
||||||
|
.withIcon(if (m.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field)
|
||||||
|
.withTypeText(typeOf(m.type), true)
|
||||||
|
}
|
||||||
|
else -> {
|
||||||
|
LookupElementBuilder.create(name)
|
||||||
|
.withIcon(AllIcons.Nodes.Method)
|
||||||
|
.withTailText("()", true)
|
||||||
|
.withInsertHandler(ParenInsertHandler)
|
||||||
}
|
}
|
||||||
is MiniInitDecl -> {}
|
|
||||||
}
|
}
|
||||||
|
emit(builder)
|
||||||
|
existing.add(name)
|
||||||
} else {
|
} else {
|
||||||
// Fallback: emit simple method name without detailed types
|
// Fallback: emit simple method name without detailed types
|
||||||
val builder = LookupElementBuilder.create(name)
|
val builder = LookupElementBuilder.create(name)
|
||||||
@@ -227,7 +249,7 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
// If in member context and engine items are suspiciously sparse, try to enrich via local inference + offerMembers
|
// If in member context and engine items are suspiciously sparse, try to enrich via local inference + offerMembers
|
||||||
if (memberDotPos != null && engineItems.size < 3) {
|
if (memberDotPos != null && engineItems.size < 3) {
|
||||||
if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Engine produced only ${engineItems.size} items in member context — trying enrichment")
|
if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Engine produced only ${engineItems.size} items in member context — trying enrichment")
|
||||||
val fromText = extractImportsFromText(text)
|
val fromText = DocLookupUtils.extractImportsFromText(text)
|
||||||
val imported = LinkedHashSet<String>().apply {
|
val imported = LinkedHashSet<String>().apply {
|
||||||
fromText.forEach { add(it) }
|
fromText.forEach { add(it) }
|
||||||
add("lyng.stdlib")
|
add("lyng.stdlib")
|
||||||
@@ -383,18 +405,23 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
}
|
}
|
||||||
supplementPreferredBases(className)
|
supplementPreferredBases(className)
|
||||||
|
|
||||||
fun emitGroup(map: LinkedHashMap<String, MutableList<MiniMemberDecl>>) {
|
fun emitGroup(map: LinkedHashMap<String, MutableList<MiniMemberDecl>>, groupPriority: Double) {
|
||||||
val keys = map.keys.sortedBy { it.lowercase() }
|
val keys = map.keys.sortedBy { it.lowercase() }
|
||||||
for (name in keys) {
|
for (name in keys) {
|
||||||
val list = map[name] ?: continue
|
val list = map[name] ?: continue
|
||||||
// Choose a representative for display:
|
// Choose a representative for display:
|
||||||
// 1) Prefer a method with a known return type
|
// 1) Prefer a method with return type AND parameters
|
||||||
// 2) Else any method
|
// 2) Prefer a method with parameters
|
||||||
// 3) Else the first variant
|
// 3) Prefer a method with return type
|
||||||
|
// 4) Else any method
|
||||||
|
// 5) Else the first variant
|
||||||
val rep =
|
val rep =
|
||||||
list.asSequence()
|
list.asSequence().filterIsInstance<MiniMemberFunDecl>()
|
||||||
.filterIsInstance<MiniMemberFunDecl>()
|
.firstOrNull { it.returnType != null && it.params.isNotEmpty() }
|
||||||
.firstOrNull { it.returnType != null }
|
?: list.asSequence().filterIsInstance<MiniMemberFunDecl>()
|
||||||
|
.firstOrNull { it.params.isNotEmpty() }
|
||||||
|
?: list.asSequence().filterIsInstance<MiniMemberFunDecl>()
|
||||||
|
.firstOrNull { it.returnType != null }
|
||||||
?: list.firstOrNull { it is MiniMemberFunDecl }
|
?: list.firstOrNull { it is MiniMemberFunDecl }
|
||||||
?: list.first()
|
?: list.first()
|
||||||
when (rep) {
|
when (rep) {
|
||||||
@@ -410,7 +437,11 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
.withTailText(tail, true)
|
.withTailText(tail, true)
|
||||||
.withTypeText(ret, true)
|
.withTypeText(ret, true)
|
||||||
.withInsertHandler(ParenInsertHandler)
|
.withInsertHandler(ParenInsertHandler)
|
||||||
emit(builder)
|
if (groupPriority != 0.0) {
|
||||||
|
emit(PrioritizedLookupElement.withPriority(builder, groupPriority))
|
||||||
|
} else {
|
||||||
|
emit(builder)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
is MiniMemberValDecl -> {
|
is MiniMemberValDecl -> {
|
||||||
val icon = if (rep.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field
|
val icon = if (rep.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field
|
||||||
@@ -421,7 +452,11 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
val builder = LookupElementBuilder.create(name)
|
val builder = LookupElementBuilder.create(name)
|
||||||
.withIcon(icon)
|
.withIcon(icon)
|
||||||
.withTypeText(typeOf(chosen.type), true)
|
.withTypeText(typeOf(chosen.type), true)
|
||||||
emit(builder)
|
if (groupPriority != 0.0) {
|
||||||
|
emit(PrioritizedLookupElement.withPriority(builder, groupPriority))
|
||||||
|
} else {
|
||||||
|
emit(builder)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
is MiniInitDecl -> {}
|
is MiniInitDecl -> {}
|
||||||
}
|
}
|
||||||
@@ -429,8 +464,8 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Emit what we have first
|
// Emit what we have first
|
||||||
emitGroup(directMap)
|
emitGroup(directMap, 100.0)
|
||||||
emitGroup(inheritedMap)
|
emitGroup(inheritedMap, 0.0)
|
||||||
|
|
||||||
// If suggestions are suspiciously sparse for known container classes,
|
// If suggestions are suspiciously sparse for known container classes,
|
||||||
// try to conservatively supplement using a curated list resolved via docs registry.
|
// try to conservatively supplement using a curated list resolved via docs registry.
|
||||||
@@ -452,30 +487,47 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
for (name in common) {
|
for (name in common) {
|
||||||
if (name in already) continue
|
if (name in already) continue
|
||||||
// Try resolve across classes first to get types/params; if it fails, emit a synthetic safe suggestion.
|
// Try resolve across classes first to get types/params; if it fails, emit a synthetic safe suggestion.
|
||||||
val resolved = DocLookupUtils.findMemberAcrossClasses(imported, name)
|
val resolved = DocLookupUtils.findMemberAcrossClasses(imported, name, mini)
|
||||||
if (resolved != null) {
|
if (resolved != null) {
|
||||||
val member = resolved.second
|
val member = resolved.second
|
||||||
when (member) {
|
val builder = when (member) {
|
||||||
is MiniMemberFunDecl -> {
|
is MiniMemberFunDecl -> {
|
||||||
val params = member.params.joinToString(", ") { it.name }
|
val params = member.params.joinToString(", ") { it.name }
|
||||||
val ret = typeOf(member.returnType)
|
val ret = typeOf(member.returnType)
|
||||||
val builder = LookupElementBuilder.create(name)
|
LookupElementBuilder.create(name)
|
||||||
.withIcon(AllIcons.Nodes.Method)
|
.withIcon(AllIcons.Nodes.Method)
|
||||||
.withTailText("(${params})", true)
|
.withTailText("($params)", true)
|
||||||
|
.withTypeText(ret, true)
|
||||||
|
.withInsertHandler(ParenInsertHandler)
|
||||||
|
}
|
||||||
|
is MiniFunDecl -> {
|
||||||
|
val params = member.params.joinToString(", ") { it.name }
|
||||||
|
val ret = typeOf(member.returnType)
|
||||||
|
LookupElementBuilder.create(name)
|
||||||
|
.withIcon(AllIcons.Nodes.Method)
|
||||||
|
.withTailText("($params)", true)
|
||||||
.withTypeText(ret, true)
|
.withTypeText(ret, true)
|
||||||
.withInsertHandler(ParenInsertHandler)
|
.withInsertHandler(ParenInsertHandler)
|
||||||
emit(builder)
|
|
||||||
already.add(name)
|
|
||||||
}
|
}
|
||||||
is MiniMemberValDecl -> {
|
is MiniMemberValDecl -> {
|
||||||
val builder = LookupElementBuilder.create(name)
|
LookupElementBuilder.create(name)
|
||||||
.withIcon(AllIcons.Nodes.Field)
|
.withIcon(if (member.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field)
|
||||||
.withTypeText(typeOf(member.type), true)
|
.withTypeText(typeOf(member.type), true)
|
||||||
emit(builder)
|
|
||||||
already.add(name)
|
|
||||||
}
|
}
|
||||||
is MiniInitDecl -> {}
|
is MiniValDecl -> {
|
||||||
|
LookupElementBuilder.create(name)
|
||||||
|
.withIcon(if (member.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field)
|
||||||
|
.withTypeText(typeOf(member.type), true)
|
||||||
|
}
|
||||||
|
else -> {
|
||||||
|
LookupElementBuilder.create(name)
|
||||||
|
.withIcon(AllIcons.Nodes.Method)
|
||||||
|
.withTailText("()", true)
|
||||||
|
.withInsertHandler(ParenInsertHandler)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
emit(PrioritizedLookupElement.withPriority(builder, 50.0))
|
||||||
|
already.add(name)
|
||||||
} else {
|
} else {
|
||||||
// Synthetic fallback: method without detailed params/types to improve UX in absence of docs
|
// Synthetic fallback: method without detailed params/types to improve UX in absence of docs
|
||||||
val isProperty = name in setOf("size", "length")
|
val isProperty = name in setOf("size", "length")
|
||||||
@@ -488,7 +540,7 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
.withTailText("()", true)
|
.withTailText("()", true)
|
||||||
.withInsertHandler(ParenInsertHandler)
|
.withInsertHandler(ParenInsertHandler)
|
||||||
}
|
}
|
||||||
emit(builder)
|
emit(PrioritizedLookupElement.withPriority(builder, 50.0))
|
||||||
already.add(name)
|
already.add(name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -502,69 +554,64 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
for (name in ext) {
|
for (name in ext) {
|
||||||
if (already.contains(name)) continue
|
if (already.contains(name)) continue
|
||||||
// Try to resolve full signature via registry first to get params and return type
|
// Try to resolve full signature via registry first to get params and return type
|
||||||
val resolved = DocLookupUtils.resolveMemberWithInheritance(imported, className, name)
|
val resolved = DocLookupUtils.resolveMemberWithInheritance(imported, className, name, mini)
|
||||||
if (resolved != null) {
|
if (resolved != null) {
|
||||||
when (val member = resolved.second) {
|
val m = resolved.second
|
||||||
|
val builder = when (m) {
|
||||||
is MiniMemberFunDecl -> {
|
is MiniMemberFunDecl -> {
|
||||||
val params = member.params.joinToString(", ") { it.name }
|
val params = m.params.joinToString(", ") { it.name }
|
||||||
val ret = typeOf(member.returnType)
|
val ret = typeOf(m.returnType)
|
||||||
val builder = LookupElementBuilder.create(name)
|
LookupElementBuilder.create(name)
|
||||||
.withIcon(AllIcons.Nodes.Method)
|
.withIcon(AllIcons.Nodes.Method)
|
||||||
.withTailText("(${params})", true)
|
.withTailText("($params)", true)
|
||||||
|
.withTypeText(ret, true)
|
||||||
|
.withInsertHandler(ParenInsertHandler)
|
||||||
|
}
|
||||||
|
is MiniFunDecl -> {
|
||||||
|
val params = m.params.joinToString(", ") { it.name }
|
||||||
|
val ret = typeOf(m.returnType)
|
||||||
|
LookupElementBuilder.create(name)
|
||||||
|
.withIcon(AllIcons.Nodes.Method)
|
||||||
|
.withTailText("($params)", true)
|
||||||
.withTypeText(ret, true)
|
.withTypeText(ret, true)
|
||||||
.withInsertHandler(ParenInsertHandler)
|
.withInsertHandler(ParenInsertHandler)
|
||||||
emit(builder)
|
|
||||||
already.add(name)
|
|
||||||
continue
|
|
||||||
}
|
}
|
||||||
is MiniMemberValDecl -> {
|
is MiniMemberValDecl -> {
|
||||||
val builder = LookupElementBuilder.create(name)
|
LookupElementBuilder.create(name)
|
||||||
.withIcon(if (member.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field)
|
.withIcon(if (m.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field)
|
||||||
.withTypeText(typeOf(member.type), true)
|
.withTypeText(typeOf(m.type), true)
|
||||||
emit(builder)
|
}
|
||||||
already.add(name)
|
is MiniValDecl -> {
|
||||||
continue
|
LookupElementBuilder.create(name)
|
||||||
|
.withIcon(if (m.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field)
|
||||||
|
.withTypeText(typeOf(m.type), true)
|
||||||
|
}
|
||||||
|
else -> {
|
||||||
|
LookupElementBuilder.create(name)
|
||||||
|
.withIcon(AllIcons.Nodes.Method)
|
||||||
|
.withTailText("()", true)
|
||||||
|
.withInsertHandler(ParenInsertHandler)
|
||||||
}
|
}
|
||||||
is MiniInitDecl -> {}
|
|
||||||
}
|
}
|
||||||
|
emit(PrioritizedLookupElement.withPriority(builder, 50.0))
|
||||||
|
already.add(name)
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
// Fallback: emit without detailed types if we couldn't resolve
|
// Fallback: emit without detailed types if we couldn't resolve
|
||||||
val builder = LookupElementBuilder.create(name)
|
val builder = LookupElementBuilder.create(name)
|
||||||
.withIcon(AllIcons.Nodes.Method)
|
.withIcon(AllIcons.Nodes.Method)
|
||||||
.withTailText("()", true)
|
.withTailText("()", true)
|
||||||
.withInsertHandler(ParenInsertHandler)
|
.withInsertHandler(ParenInsertHandler)
|
||||||
emit(builder)
|
emit(PrioritizedLookupElement.withPriority(builder, 50.0))
|
||||||
already.add(name)
|
already.add(name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Lenient textual import extractor (duplicated from QuickDoc privately)
|
|
||||||
private fun extractImportsFromText(text: String): List<String> {
|
|
||||||
val result = LinkedHashSet<String>()
|
|
||||||
val re = Regex("^\\s*import\\s+([a-zA-Z_][a-zA-Z0-9_]*(?:\\.[a-zA-Z_][a-zA-Z0-9_]*)*)", RegexOption.MULTILINE)
|
|
||||||
re.findAll(text).forEach { m ->
|
|
||||||
val raw = m.groupValues.getOrNull(1)?.trim().orEmpty()
|
|
||||||
if (raw.isNotEmpty()) {
|
|
||||||
val canon = if (raw.startsWith("lyng.")) raw else "lyng.$raw"
|
|
||||||
result.add(canon)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result.toList()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun typeOf(t: MiniTypeRef?): String {
|
private fun typeOf(t: MiniTypeRef?): String {
|
||||||
return when (t) {
|
val s = DocLookupUtils.typeOf(t)
|
||||||
null -> ""
|
return if (s.isEmpty()) "" else ": $s"
|
||||||
is MiniTypeName -> t.segments.lastOrNull()?.name?.let { ": $it" } ?: ""
|
|
||||||
is MiniGenericType -> {
|
|
||||||
val base = typeOf(t.base).removePrefix(": ")
|
|
||||||
val args = t.args.joinToString(",") { typeOf(it).removePrefix(": ") }
|
|
||||||
": ${base}<${args}>"
|
|
||||||
}
|
|
||||||
is MiniFunctionType -> ": (fn)"
|
|
||||||
is MiniTypeVar -> ": ${t.name}"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+274
-162
@@ -24,13 +24,9 @@ import com.intellij.openapi.editor.Editor
|
|||||||
import com.intellij.openapi.util.TextRange
|
import com.intellij.openapi.util.TextRange
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import com.intellij.psi.PsiFile
|
import com.intellij.psi.PsiFile
|
||||||
import kotlinx.coroutines.runBlocking
|
|
||||||
import net.sergeych.lyng.Compiler
|
|
||||||
import net.sergeych.lyng.Pos
|
|
||||||
import net.sergeych.lyng.Source
|
|
||||||
import net.sergeych.lyng.highlight.offsetOf
|
import net.sergeych.lyng.highlight.offsetOf
|
||||||
import net.sergeych.lyng.idea.LyngLanguage
|
import net.sergeych.lyng.idea.LyngLanguage
|
||||||
import net.sergeych.lyng.idea.util.IdeLenientImportProvider
|
import net.sergeych.lyng.idea.util.LyngAstManager
|
||||||
import net.sergeych.lyng.idea.util.TextCtx
|
import net.sergeych.lyng.idea.util.TextCtx
|
||||||
import net.sergeych.lyng.miniast.*
|
import net.sergeych.lyng.miniast.*
|
||||||
|
|
||||||
@@ -69,80 +65,93 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
val ident = text.substring(idRange.startOffset, idRange.endOffset)
|
val ident = text.substring(idRange.startOffset, idRange.endOffset)
|
||||||
if (DEBUG_LOG) log.info("[LYNG_DEBUG] QuickDoc: ident='$ident' at ${idRange.startOffset}..${idRange.endOffset} in ${file.name}")
|
if (DEBUG_LOG) log.info("[LYNG_DEBUG] QuickDoc: ident='$ident' at ${idRange.startOffset}..${idRange.endOffset} in ${file.name}")
|
||||||
|
|
||||||
// Build MiniAst for this file (fast and resilient). Best-effort; on failure continue with partial AST.
|
// 1. Get merged mini-AST from Manager (handles local + .lyng.d merged declarations)
|
||||||
val sink = MiniAstBuilder()
|
val mini = LyngAstManager.getMiniAst(file) ?: return null
|
||||||
val provider = IdeLenientImportProvider.create()
|
val miniSource = mini.range.start.source
|
||||||
val src = Source("<ide>", text)
|
val imported = DocLookupUtils.canonicalImportedModules(mini, text)
|
||||||
val mini = try {
|
|
||||||
runBlocking { Compiler.compileWithMini(src, provider, sink) }
|
|
||||||
sink.build()
|
|
||||||
} catch (t: Throwable) {
|
|
||||||
if (DEBUG_LOG) log.warn("[LYNG_DEBUG] QuickDoc: compileWithMini produced partial AST: ${t.message}")
|
|
||||||
sink.build()
|
|
||||||
} ?: MiniScript(MiniRange(Pos(src, 1, 1), Pos(src, 1, 1)))
|
|
||||||
val source = src
|
|
||||||
|
|
||||||
// Try resolve to: function param at position, function/class/val declaration at position
|
// Try resolve to: function param at position, function/class/val declaration at position
|
||||||
// 1) Use unified declaration detection
|
// 1) Use unified declaration detection
|
||||||
DocLookupUtils.findDeclarationAt(mini, offset, ident)?.let { (name, kind) ->
|
DocLookupUtils.findDeclarationAt(mini, offset, ident)?.let { (name, kind) ->
|
||||||
if (DEBUG_LOG) log.info("[LYNG_DEBUG] QuickDoc: matched declaration '$name' kind=$kind")
|
if (DEBUG_LOG) log.info("[LYNG_DEBUG] QuickDoc: matched declaration '$name' kind=$kind")
|
||||||
// Find the actual declaration object to render
|
// Find the actual declaration object to render
|
||||||
for (d in mini.declarations) {
|
mini.declarations.forEach { d ->
|
||||||
if (d.name == name && source.offsetOf(d.nameStart) <= offset && source.offsetOf(d.nameStart) + d.name.length > offset) {
|
if (d.name == name) {
|
||||||
return renderDeclDoc(d)
|
val s: Int = miniSource.offsetOf(d.nameStart)
|
||||||
|
if (s <= offset && s + d.name.length > offset) {
|
||||||
|
return renderDeclDoc(d, text, mini, imported)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// Handle members if it was a member
|
// Handle members if it was a member
|
||||||
if (d is MiniClassDecl) {
|
if (d is MiniClassDecl) {
|
||||||
for (m in d.members) {
|
d.members.forEach { m ->
|
||||||
if (m.name == name && source.offsetOf(m.nameStart) <= offset && source.offsetOf(m.nameStart) + m.name.length > offset) {
|
if (m.name == name) {
|
||||||
return when (m) {
|
val s: Int = miniSource.offsetOf(m.nameStart)
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(d.name, m)
|
if (s <= offset && s + m.name.length > offset) {
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(d.name, m)
|
return when (m) {
|
||||||
is MiniInitDecl -> null
|
is MiniMemberFunDecl -> renderMemberFunDoc(d.name, m)
|
||||||
|
is MiniMemberValDecl -> renderMemberValDoc(d.name, m)
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (cf in d.ctorFields) {
|
d.ctorFields.forEach { cf ->
|
||||||
if (cf.name == name && source.offsetOf(cf.nameStart) <= offset && source.offsetOf(cf.nameStart) + cf.name.length > offset) {
|
if (cf.name == name) {
|
||||||
// Render as a member val
|
val s: Int = miniSource.offsetOf(cf.nameStart)
|
||||||
val mv = MiniMemberValDecl(
|
if (s <= offset && s + cf.name.length > offset) {
|
||||||
range = MiniRange(cf.nameStart, cf.nameStart), // dummy
|
// Render as a member val
|
||||||
name = cf.name,
|
val mv = MiniMemberValDecl(
|
||||||
mutable = cf.mutable,
|
range = MiniRange(cf.nameStart, cf.nameStart), // dummy
|
||||||
type = cf.type,
|
name = cf.name,
|
||||||
doc = null,
|
mutable = cf.mutable,
|
||||||
nameStart = cf.nameStart
|
type = cf.type,
|
||||||
)
|
initRange = null,
|
||||||
return renderMemberValDoc(d.name, mv)
|
doc = null,
|
||||||
|
nameStart = cf.nameStart
|
||||||
|
)
|
||||||
|
return renderMemberValDoc(d.name, mv)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (cf in d.classFields) {
|
d.classFields.forEach { cf ->
|
||||||
if (cf.name == name && source.offsetOf(cf.nameStart) <= offset && source.offsetOf(cf.nameStart) + cf.name.length > offset) {
|
if (cf.name == name) {
|
||||||
// Render as a member val
|
val s: Int = miniSource.offsetOf(cf.nameStart)
|
||||||
val mv = MiniMemberValDecl(
|
if (s <= offset && s + cf.name.length > offset) {
|
||||||
range = MiniRange(cf.nameStart, cf.nameStart), // dummy
|
// Render as a member val
|
||||||
name = cf.name,
|
val mv = MiniMemberValDecl(
|
||||||
mutable = cf.mutable,
|
range = MiniRange(cf.nameStart, cf.nameStart), // dummy
|
||||||
type = cf.type,
|
name = cf.name,
|
||||||
doc = null,
|
mutable = cf.mutable,
|
||||||
nameStart = cf.nameStart
|
type = cf.type,
|
||||||
)
|
initRange = null,
|
||||||
return renderMemberValDoc(d.name, mv)
|
doc = null,
|
||||||
|
nameStart = cf.nameStart
|
||||||
|
)
|
||||||
|
return renderMemberValDoc(d.name, mv)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (d is MiniEnumDecl) {
|
if (d is MiniEnumDecl) {
|
||||||
if (d.entries.contains(name) && offset >= source.offsetOf(d.range.start) && offset <= source.offsetOf(d.range.end)) {
|
if (d.entries.contains(name)) {
|
||||||
// For enum constant, we don't have detailed docs in MiniAst yet, but we can render a title
|
val s: Int = miniSource.offsetOf(d.range.start)
|
||||||
return "<div class='doc-title'>enum constant ${d.name}.${name}</div>"
|
val e: Int = miniSource.offsetOf(d.range.end)
|
||||||
|
if (offset >= s && offset <= e) {
|
||||||
|
// For enum constant, we don't have detailed docs in MiniAst yet, but we can render a title
|
||||||
|
return "<div class='doc-title'>enum constant ${d.name}.${name}</div>"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Check parameters
|
// Check parameters
|
||||||
for (fn in mini.declarations.filterIsInstance<MiniFunDecl>()) {
|
mini.declarations.filterIsInstance<MiniFunDecl>().forEach { fn ->
|
||||||
for (p in fn.params) {
|
fn.params.forEach { p ->
|
||||||
if (p.name == name && source.offsetOf(p.nameStart) <= offset && source.offsetOf(p.nameStart) + p.name.length > offset) {
|
if (p.name == name) {
|
||||||
return renderParamDoc(fn, p)
|
val s: Int = miniSource.offsetOf(p.nameStart)
|
||||||
|
if (s <= offset && s + p.name.length > offset) {
|
||||||
|
return renderParamDoc(fn, p)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -156,62 +165,77 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
val sym = binding.symbols.firstOrNull { it.id == ref.symbolId }
|
val sym = binding.symbols.firstOrNull { it.id == ref.symbolId }
|
||||||
if (sym != null) {
|
if (sym != null) {
|
||||||
// Find local declaration that matches this symbol
|
// Find local declaration that matches this symbol
|
||||||
val ds = mini.declarations.firstOrNull { decl ->
|
var dsFound: MiniDecl? = null
|
||||||
val s = source.offsetOf(decl.nameStart)
|
mini.declarations.forEach { decl ->
|
||||||
decl.name == sym.name && s == sym.declStart
|
if (decl.name == sym.name) {
|
||||||
|
val sOffset: Int = miniSource.offsetOf(decl.nameStart)
|
||||||
|
if (sOffset == sym.declStart) {
|
||||||
|
dsFound = decl
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (ds != null) return renderDeclDoc(ds)
|
if (dsFound != null) return renderDeclDoc(dsFound, text, mini, imported)
|
||||||
|
|
||||||
// Check parameters
|
// Check parameters
|
||||||
for (fn in mini.declarations.filterIsInstance<MiniFunDecl>()) {
|
mini.declarations.filterIsInstance<MiniFunDecl>().forEach { fn ->
|
||||||
for (p in fn.params) {
|
fn.params.forEach { p ->
|
||||||
val s = source.offsetOf(p.nameStart)
|
if (p.name == sym.name) {
|
||||||
if (p.name == sym.name && s == sym.declStart) {
|
val sOffset: Int = miniSource.offsetOf(p.nameStart)
|
||||||
return renderParamDoc(fn, p)
|
if (sOffset == sym.declStart) {
|
||||||
|
return renderParamDoc(fn, p)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check class members (fields/functions)
|
// Check class members (fields/functions)
|
||||||
for (cls in mini.declarations.filterIsInstance<MiniClassDecl>()) {
|
mini.declarations.filterIsInstance<MiniClassDecl>().forEach { cls ->
|
||||||
for (m in cls.members) {
|
cls.members.forEach { m ->
|
||||||
val s = source.offsetOf(m.nameStart)
|
if (m.name == sym.name) {
|
||||||
if (m.name == sym.name && s == sym.declStart) {
|
val sOffset: Int = miniSource.offsetOf(m.nameStart)
|
||||||
return when (m) {
|
if (sOffset == sym.declStart) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(cls.name, m)
|
return when (m) {
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(cls.name, m)
|
is MiniMemberFunDecl -> renderMemberFunDoc(cls.name, m)
|
||||||
is MiniInitDecl -> null
|
is MiniMemberValDecl -> renderMemberValDoc(cls.name, m)
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (cf in cls.ctorFields) {
|
cls.ctorFields.forEach { cf ->
|
||||||
val s = source.offsetOf(cf.nameStart)
|
if (cf.name == sym.name) {
|
||||||
if (cf.name == sym.name && s == sym.declStart) {
|
val sOffset: Int = miniSource.offsetOf(cf.nameStart)
|
||||||
// Render as a member val
|
if (sOffset == sym.declStart) {
|
||||||
val mv = MiniMemberValDecl(
|
// Render as a member val
|
||||||
range = MiniRange(cf.nameStart, cf.nameStart), // dummy
|
val mv = MiniMemberValDecl(
|
||||||
name = cf.name,
|
range = MiniRange(cf.nameStart, cf.nameStart), // dummy
|
||||||
mutable = cf.mutable,
|
name = cf.name,
|
||||||
type = cf.type,
|
mutable = cf.mutable,
|
||||||
doc = null,
|
type = cf.type,
|
||||||
nameStart = cf.nameStart
|
initRange = null,
|
||||||
)
|
doc = null,
|
||||||
return renderMemberValDoc(cls.name, mv)
|
nameStart = cf.nameStart
|
||||||
|
)
|
||||||
|
return renderMemberValDoc(cls.name, mv)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (cf in cls.classFields) {
|
cls.classFields.forEach { cf ->
|
||||||
val s = source.offsetOf(cf.nameStart)
|
if (cf.name == sym.name) {
|
||||||
if (cf.name == sym.name && s == sym.declStart) {
|
val sOffset: Int = miniSource.offsetOf(cf.nameStart)
|
||||||
// Render as a member val
|
if (sOffset == sym.declStart) {
|
||||||
val mv = MiniMemberValDecl(
|
// Render as a member val
|
||||||
range = MiniRange(cf.nameStart, cf.nameStart), // dummy
|
val mv = MiniMemberValDecl(
|
||||||
name = cf.name,
|
range = MiniRange(cf.nameStart, cf.nameStart), // dummy
|
||||||
mutable = cf.mutable,
|
name = cf.name,
|
||||||
type = cf.type,
|
mutable = cf.mutable,
|
||||||
doc = null,
|
type = cf.type,
|
||||||
nameStart = cf.nameStart
|
initRange = null,
|
||||||
)
|
doc = null,
|
||||||
return renderMemberValDoc(cls.name, mv)
|
nameStart = cf.nameStart
|
||||||
|
)
|
||||||
|
return renderMemberValDoc(cls.name, mv)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -260,35 +284,39 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
} else null
|
} else null
|
||||||
}
|
}
|
||||||
else -> {
|
else -> {
|
||||||
val guessed = DocLookupUtils.guessClassFromCallBefore(text, dotPos, importedModules)
|
DocLookupUtils.guessReceiverClassViaMini(mini, text, dotPos, importedModules)
|
||||||
if (guessed != null) guessed
|
?: DocLookupUtils.guessClassFromCallBefore(text, dotPos, importedModules, mini)
|
||||||
else {
|
?: run {
|
||||||
// handle this@Type or as Type
|
// handle this@Type or as Type
|
||||||
val i2 = TextCtx.prevNonWs(text, dotPos - 1)
|
val i2 = TextCtx.prevNonWs(text, dotPos - 1)
|
||||||
if (i2 >= 0) {
|
if (i2 >= 0) {
|
||||||
val identRange = TextCtx.wordRangeAt(text, i2 + 1)
|
val identRange = TextCtx.wordRangeAt(text, i2 + 1)
|
||||||
if (identRange != null) {
|
if (identRange != null) {
|
||||||
val id = text.substring(identRange.startOffset, identRange.endOffset)
|
val id = text.substring(identRange.startOffset, identRange.endOffset)
|
||||||
val k = TextCtx.prevNonWs(text, identRange.startOffset - 1)
|
val k = TextCtx.prevNonWs(text, identRange.startOffset - 1)
|
||||||
if (k >= 1 && text[k] == 's' && text[k-1] == 'a' && (k-1 == 0 || !text[k-2].isLetterOrDigit())) {
|
if (k >= 1 && text[k] == 's' && text[k - 1] == 'a' && (k - 1 == 0 || !text[k - 2].isLetterOrDigit())) {
|
||||||
id
|
id
|
||||||
} else if (k >= 0 && text[k] == '@') {
|
} else if (k >= 0 && text[k] == '@') {
|
||||||
val k2 = TextCtx.prevNonWs(text, k - 1)
|
val k2 = TextCtx.prevNonWs(text, k - 1)
|
||||||
if (k2 >= 3 && text.substring(k2 - 3, k2 + 1) == "this") id else null
|
if (k2 >= 3 && text.substring(k2 - 3, k2 + 1) == "this") id else null
|
||||||
|
} else null
|
||||||
} else null
|
} else null
|
||||||
} else null
|
} else null
|
||||||
} else null
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (DEBUG_LOG) log.info("[LYNG_DEBUG] QuickDoc: memberCtx dotPos=${dotPos} chBeforeDot='${if (dotPos>0) text[dotPos-1] else ' '}' classGuess=${className} imports=${importedModules}")
|
if (DEBUG_LOG) log.info("[LYNG_DEBUG] QuickDoc: memberCtx dotPos=${dotPos} chBeforeDot='${if (dotPos > 0) text[dotPos - 1] else ' '}' classGuess=${className} imports=${importedModules}")
|
||||||
if (className != null) {
|
if (className != null) {
|
||||||
DocLookupUtils.resolveMemberWithInheritance(importedModules, className, ident)?.let { (owner, member) ->
|
DocLookupUtils.resolveMemberWithInheritance(importedModules, className, ident, mini)?.let { (owner, member) ->
|
||||||
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] QuickDoc: literal/call '$ident' resolved to $owner.${member.name}")
|
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] QuickDoc: literal/call '$ident' resolved to $owner.${member.name}")
|
||||||
return when (member) {
|
return when (member) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
||||||
is MiniInitDecl -> null
|
is MiniInitDecl -> null
|
||||||
|
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
log.info("[LYNG_DEBUG] QuickDoc: resolve failed for ${className}.${ident}")
|
log.info("[LYNG_DEBUG] QuickDoc: resolve failed for ${className}.${ident}")
|
||||||
@@ -299,7 +327,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
// 4) As a fallback, if the caret is on an identifier text that matches any declaration name, show that
|
// 4) As a fallback, if the caret is on an identifier text that matches any declaration name, show that
|
||||||
mini.declarations.firstOrNull { it.name == ident }?.let {
|
mini.declarations.firstOrNull { it.name == ident }?.let {
|
||||||
log.info("[LYNG_DEBUG] QuickDoc: fallback by name '${it.name}' kind=${it::class.simpleName}")
|
log.info("[LYNG_DEBUG] QuickDoc: fallback by name '${it.name}' kind=${it::class.simpleName}")
|
||||||
return renderDeclDoc(it)
|
return renderDeclDoc(it, text, mini, imported)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 4) Consult BuiltinDocRegistry for imported modules (top-level and class members)
|
// 4) Consult BuiltinDocRegistry for imported modules (top-level and class members)
|
||||||
@@ -319,13 +347,13 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
if (arity != null && chosen.params.size != arity && matches.size > 1) {
|
if (arity != null && chosen.params.size != arity && matches.size > 1) {
|
||||||
return renderOverloads(ident, matches)
|
return renderOverloads(ident, matches)
|
||||||
}
|
}
|
||||||
return renderDeclDoc(chosen)
|
return renderDeclDoc(chosen, text, mini, imported)
|
||||||
}
|
}
|
||||||
// Also allow values/consts
|
// Also allow values/consts
|
||||||
docs.filterIsInstance<MiniValDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it) }
|
docs.filterIsInstance<MiniValDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it, text, mini, imported) }
|
||||||
// And classes/enums
|
// And classes/enums
|
||||||
docs.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it) }
|
docs.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it, text, mini, imported) }
|
||||||
docs.filterIsInstance<MiniEnumDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it) }
|
docs.filterIsInstance<MiniEnumDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it, text, mini, imported) }
|
||||||
}
|
}
|
||||||
// Defensive fallback: if nothing found and it's a well-known stdlib function, render minimal inline docs
|
// Defensive fallback: if nothing found and it's a well-known stdlib function, render minimal inline docs
|
||||||
if (ident == "println" || ident == "print") {
|
if (ident == "println" || ident == "print") {
|
||||||
@@ -339,12 +367,16 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
val lhs = previousWordBefore(text, idRange.startOffset)
|
val lhs = previousWordBefore(text, idRange.startOffset)
|
||||||
if (lhs != null && hasDotBetween(text, lhs.endOffset, idRange.startOffset)) {
|
if (lhs != null && hasDotBetween(text, lhs.endOffset, idRange.startOffset)) {
|
||||||
val className = text.substring(lhs.startOffset, lhs.endOffset)
|
val className = text.substring(lhs.startOffset, lhs.endOffset)
|
||||||
DocLookupUtils.resolveMemberWithInheritance(importedModules, className, ident)?.let { (owner, member) ->
|
DocLookupUtils.resolveMemberWithInheritance(importedModules, className, ident, mini)?.let { (owner, member) ->
|
||||||
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Inheritance resolved $className.$ident to $owner.${member.name}")
|
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Inheritance resolved $className.$ident to $owner.${member.name}")
|
||||||
return when (member) {
|
return when (member) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
||||||
is MiniInitDecl -> null
|
is MiniInitDecl -> null
|
||||||
|
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -355,15 +387,19 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
if (dotPos != null) {
|
if (dotPos != null) {
|
||||||
val guessed = when {
|
val guessed = when {
|
||||||
looksLikeListLiteralBefore(text, dotPos) -> "List"
|
looksLikeListLiteralBefore(text, dotPos) -> "List"
|
||||||
else -> DocLookupUtils.guessClassFromCallBefore(text, dotPos, importedModules)
|
else -> DocLookupUtils.guessClassFromCallBefore(text, dotPos, importedModules, mini)
|
||||||
}
|
}
|
||||||
if (guessed != null) {
|
if (guessed != null) {
|
||||||
DocLookupUtils.resolveMemberWithInheritance(importedModules, guessed, ident)?.let { (owner, member) ->
|
DocLookupUtils.resolveMemberWithInheritance(importedModules, guessed, ident, mini)?.let { (owner, member) ->
|
||||||
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Heuristic '$guessed.$ident' resolved via inheritance to $owner.${member.name}")
|
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Heuristic '$guessed.$ident' resolved via inheritance to $owner.${member.name}")
|
||||||
return when (member) {
|
return when (member) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
||||||
is MiniInitDecl -> null
|
is MiniInitDecl -> null
|
||||||
|
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -371,19 +407,23 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
run {
|
run {
|
||||||
val candidates = listOf("String", "Iterable", "Iterator", "List", "Collection", "Array", "Dict", "Regex")
|
val candidates = listOf("String", "Iterable", "Iterator", "List", "Collection", "Array", "Dict", "Regex")
|
||||||
for (c in candidates) {
|
for (c in candidates) {
|
||||||
DocLookupUtils.resolveMemberWithInheritance(importedModules, c, ident)?.let { (owner, member) ->
|
DocLookupUtils.resolveMemberWithInheritance(importedModules, c, ident, mini)?.let { (owner, member) ->
|
||||||
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Candidate '$c.$ident' resolved via inheritance to $owner.${member.name}")
|
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Candidate '$c.$ident' resolved via inheritance to $owner.${member.name}")
|
||||||
return when (member) {
|
return when (member) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
||||||
is MiniInitDecl -> null
|
is MiniInitDecl -> null
|
||||||
|
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// As a last resort try aggregated String members (extensions from stdlib text)
|
// As a last resort try aggregated String members (extensions from stdlib text)
|
||||||
run {
|
run {
|
||||||
val classes = DocLookupUtils.aggregateClasses(importedModules)
|
val classes = DocLookupUtils.aggregateClasses(importedModules, mini)
|
||||||
val stringCls = classes["String"]
|
val stringCls = classes["String"]
|
||||||
val m = stringCls?.members?.firstOrNull { it.name == ident }
|
val m = stringCls?.members?.firstOrNull { it.name == ident }
|
||||||
if (m != null) {
|
if (m != null) {
|
||||||
@@ -396,12 +436,16 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Search across classes; prefer Iterable, then Iterator, then List for common ops
|
// Search across classes; prefer Iterable, then Iterator, then List for common ops
|
||||||
DocLookupUtils.findMemberAcrossClasses(importedModules, ident)?.let { (owner, member) ->
|
DocLookupUtils.findMemberAcrossClasses(importedModules, ident, mini)?.let { (owner, member) ->
|
||||||
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Cross-class '$ident' resolved to $owner.${member.name}")
|
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Cross-class '$ident' resolved to $owner.${member.name}")
|
||||||
return when (member) {
|
return when (member) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
||||||
is MiniInitDecl -> null
|
is MiniInitDecl -> null
|
||||||
|
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -417,25 +461,39 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
private fun ensureExternalDocsRegistered() { @Suppress("UNUSED_EXPRESSION") externalDocsLoaded }
|
private fun ensureExternalDocsRegistered() { @Suppress("UNUSED_EXPRESSION") externalDocsLoaded }
|
||||||
|
|
||||||
private fun tryLoadExternalDocs(): Boolean {
|
private fun tryLoadExternalDocs(): Boolean {
|
||||||
return try {
|
var anyLoaded = false
|
||||||
|
try {
|
||||||
// Try known registrars; ignore failures if module is absent
|
// Try known registrars; ignore failures if module is absent
|
||||||
val cls = Class.forName("net.sergeych.lyngio.docs.FsBuiltinDocs")
|
val cls = Class.forName("net.sergeych.lyngio.docs.FsBuiltinDocs")
|
||||||
val m = cls.getMethod("ensure")
|
val m = cls.getMethod("ensure")
|
||||||
m.invoke(null)
|
m.invoke(null)
|
||||||
log.info("[LYNG_DEBUG] QuickDoc: external docs loaded: net.sergeych.lyngio.docs.FsBuiltinDocs.ensure() OK")
|
log.info("[LYNG_DEBUG] QuickDoc: external docs loaded: net.sergeych.lyngio.docs.FsBuiltinDocs.ensure() OK")
|
||||||
true
|
anyLoaded = true
|
||||||
} catch (_: Throwable) {
|
} catch (_: Throwable) {}
|
||||||
|
|
||||||
|
try {
|
||||||
|
val cls = Class.forName("net.sergeych.lyngio.docs.ProcessBuiltinDocs")
|
||||||
|
val m = cls.getMethod("ensure")
|
||||||
|
m.invoke(null)
|
||||||
|
log.info("[LYNG_DEBUG] QuickDoc: external docs loaded: net.sergeych.lyngio.docs.ProcessBuiltinDocs.ensure() OK")
|
||||||
|
anyLoaded = true
|
||||||
|
} catch (_: Throwable) {}
|
||||||
|
|
||||||
|
if (!anyLoaded) {
|
||||||
// Seed a minimal plugin-local fallback so Path docs still work without lyngio
|
// Seed a minimal plugin-local fallback so Path docs still work without lyngio
|
||||||
val seeded = try {
|
val seeded = try {
|
||||||
FsDocsFallback.ensureOnce()
|
FsDocsFallback.ensureOnce()
|
||||||
|
ProcessDocsFallback.ensureOnce()
|
||||||
|
true
|
||||||
} catch (_: Throwable) { false }
|
} catch (_: Throwable) { false }
|
||||||
if (seeded) {
|
if (seeded) {
|
||||||
log.info("[LYNG_DEBUG] QuickDoc: external docs NOT found; seeded plugin fallback for lyng.io.fs")
|
log.info("[LYNG_DEBUG] QuickDoc: external docs NOT found; seeded plugin fallbacks")
|
||||||
} else {
|
} else {
|
||||||
log.info("[LYNG_DEBUG] QuickDoc: external docs NOT found (lyngio absent on classpath)")
|
log.info("[LYNG_DEBUG] QuickDoc: external docs NOT found (lyngio absent on classpath)")
|
||||||
}
|
}
|
||||||
seeded
|
return seeded
|
||||||
}
|
}
|
||||||
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getCustomDocumentationElement(
|
override fun getCustomDocumentationElement(
|
||||||
@@ -449,25 +507,37 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return contextElement ?: file.findElementAt(targetOffset)
|
return contextElement ?: file.findElementAt(targetOffset)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun renderDeclDoc(d: MiniDecl): String {
|
private fun renderDeclDoc(d: MiniDecl, text: String, mini: MiniScript, imported: List<String>): String {
|
||||||
val title = when (d) {
|
val title = when (d) {
|
||||||
is MiniFunDecl -> "function ${d.name}${signatureOf(d)}"
|
is MiniFunDecl -> "function ${d.name}${signatureOf(d)}"
|
||||||
is MiniClassDecl -> "class ${d.name}"
|
is MiniClassDecl -> "class ${d.name}"
|
||||||
is MiniEnumDecl -> "enum ${d.name} { ${d.entries.joinToString(", ")} }"
|
is MiniEnumDecl -> "enum ${d.name} { ${d.entries.joinToString(", ")} }"
|
||||||
is MiniValDecl -> if (d.mutable) "var ${d.name}${typeOf(d.type)}" else "val ${d.name}${typeOf(d.type)}"
|
is MiniValDecl -> {
|
||||||
|
val t = d.type ?: DocLookupUtils.inferTypeRefForVal(d, text, imported, mini)
|
||||||
|
val typeStr = if (t == null) ": Object?" else typeOf(t)
|
||||||
|
if (d.mutable) "var ${d.name}${typeStr}" else "val ${d.name}${typeStr}"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// Show full detailed documentation, not just the summary
|
|
||||||
val raw = d.doc?.raw
|
|
||||||
val doc: String? = if (raw.isNullOrBlank()) null else MarkdownRenderer.render(raw)
|
|
||||||
val sb = StringBuilder()
|
val sb = StringBuilder()
|
||||||
sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
|
sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
|
||||||
if (!doc.isNullOrBlank()) sb.append(styledMarkdown(doc))
|
sb.append(renderDocBody(d.doc))
|
||||||
return sb.toString()
|
return sb.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun renderParamDoc(fn: MiniFunDecl, p: MiniParam): String {
|
private fun renderParamDoc(fn: MiniFunDecl, p: MiniParam): String {
|
||||||
val title = "parameter ${p.name}${typeOf(p.type)} in ${fn.name}${signatureOf(fn)}"
|
val title = "parameter ${p.name}${typeOf(p.type)} in ${fn.name}${signatureOf(fn)}"
|
||||||
return "<div class='doc-title'>${htmlEscape(title)}</div>"
|
val sb = StringBuilder()
|
||||||
|
sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
|
||||||
|
|
||||||
|
// Find matching @param tag
|
||||||
|
fn.doc?.tags?.get("param")?.forEach { tag ->
|
||||||
|
val parts = tag.split(Regex("\\s+"), 2)
|
||||||
|
if (parts.getOrNull(0) == p.name && parts.size > 1) {
|
||||||
|
sb.append(styledMarkdown(MarkdownRenderer.render(parts[1])))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return sb.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun renderMemberFunDoc(className: String, m: MiniMemberFunDecl): String {
|
private fun renderMemberFunDoc(className: String, m: MiniMemberFunDecl): String {
|
||||||
@@ -478,37 +548,26 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
val ret = typeOf(m.returnType)
|
val ret = typeOf(m.returnType)
|
||||||
val staticStr = if (m.isStatic) "static " else ""
|
val staticStr = if (m.isStatic) "static " else ""
|
||||||
val title = "${staticStr}method $className.${m.name}(${params})${ret}"
|
val title = "${staticStr}method $className.${m.name}(${params})${ret}"
|
||||||
val raw = m.doc?.raw
|
|
||||||
val doc: String? = if (raw.isNullOrBlank()) null else MarkdownRenderer.render(raw)
|
|
||||||
val sb = StringBuilder()
|
val sb = StringBuilder()
|
||||||
sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
|
sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
|
||||||
if (!doc.isNullOrBlank()) sb.append(styledMarkdown(doc))
|
sb.append(renderDocBody(m.doc))
|
||||||
return sb.toString()
|
return sb.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun renderMemberValDoc(className: String, m: MiniMemberValDecl): String {
|
private fun renderMemberValDoc(className: String, m: MiniMemberValDecl): String {
|
||||||
val ts = typeOf(m.type)
|
val ts = if (m.type == null) ": Object?" else typeOf(m.type)
|
||||||
val kind = if (m.mutable) "var" else "val"
|
val kind = if (m.mutable) "var" else "val"
|
||||||
val staticStr = if (m.isStatic) "static " else ""
|
val staticStr = if (m.isStatic) "static " else ""
|
||||||
val title = "${staticStr}${kind} $className.${m.name}${ts}"
|
val title = "${staticStr}${kind} $className.${m.name}${ts}"
|
||||||
val raw = m.doc?.raw
|
|
||||||
val doc: String? = if (raw.isNullOrBlank()) null else MarkdownRenderer.render(raw)
|
|
||||||
val sb = StringBuilder()
|
val sb = StringBuilder()
|
||||||
sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
|
sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
|
||||||
if (!doc.isNullOrBlank()) sb.append(styledMarkdown(doc))
|
sb.append(renderDocBody(m.doc))
|
||||||
return sb.toString()
|
return sb.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun typeOf(t: MiniTypeRef?): String = when (t) {
|
private fun typeOf(t: MiniTypeRef?): String {
|
||||||
is MiniTypeName -> ": ${t.segments.joinToString(".") { it.name }}${if (t.nullable) "?" else ""}"
|
val s = DocLookupUtils.typeOf(t)
|
||||||
is MiniGenericType -> {
|
return if (s.isEmpty()) (if (t == null) ": Object?" else "") else ": $s"
|
||||||
val base = typeOf(t.base).removePrefix(": ")
|
|
||||||
val args = t.args.joinToString(", ") { typeOf(it).removePrefix(": ") }
|
|
||||||
": ${base}<${args}>${if (t.nullable) "?" else ""}"
|
|
||||||
}
|
|
||||||
is MiniFunctionType -> ": (..) -> ..${if (t.nullable) "?" else ""}"
|
|
||||||
is MiniTypeVar -> ": ${t.name}${if (t.nullable) "?" else ""}"
|
|
||||||
null -> ""
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun signatureOf(fn: MiniFunDecl): String {
|
private fun signatureOf(fn: MiniFunDecl): String {
|
||||||
@@ -608,11 +667,64 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return if (e > s) TextRange(s, e) else null
|
return if (e > s) TextRange(s, e) else null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun renderDocBody(doc: MiniDoc?): String {
|
||||||
|
if (doc == null) return ""
|
||||||
|
val sb = StringBuilder()
|
||||||
|
if (doc.raw.isNotBlank()) {
|
||||||
|
sb.append(styledMarkdown(MarkdownRenderer.render(doc.raw)))
|
||||||
|
}
|
||||||
|
if (doc.tags.isNotEmpty()) {
|
||||||
|
sb.append(renderTags(doc.tags))
|
||||||
|
}
|
||||||
|
return sb.toString()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun renderTags(tags: Map<String, List<String>>): String {
|
||||||
|
if (tags.isEmpty()) return ""
|
||||||
|
val sb = StringBuilder()
|
||||||
|
sb.append("<table class='sections'>")
|
||||||
|
|
||||||
|
fun section(title: String, list: List<String>, isKeyValue: Boolean = false) {
|
||||||
|
if (list.isEmpty()) return
|
||||||
|
sb.append("<tr><td valign='top' class='section'><p>").append(htmlEscape(title)).append(":</p></td><td valign='top'>")
|
||||||
|
list.forEachIndexed { index, item ->
|
||||||
|
if (index > 0) sb.append("<p>")
|
||||||
|
if (isKeyValue) {
|
||||||
|
val parts = item.split(Regex("\\s+"), 2)
|
||||||
|
sb.append("<code>").append(htmlEscape(parts[0])).append("</code>")
|
||||||
|
if (parts.size > 1) {
|
||||||
|
sb.append(" — ").append(MarkdownRenderer.render(parts[1]).removePrefix("<p>").removeSuffix("</p>"))
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
sb.append(MarkdownRenderer.render(item).removePrefix("<p>").removeSuffix("</p>"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sb.append("</td></tr>")
|
||||||
|
}
|
||||||
|
|
||||||
|
section("Parameters", tags["param"] ?: emptyList(), isKeyValue = true)
|
||||||
|
section("Returns", tags["return"] ?: emptyList())
|
||||||
|
section("Throws", tags["throws"] ?: emptyList(), isKeyValue = true)
|
||||||
|
|
||||||
|
tags.forEach { (name, list) ->
|
||||||
|
if (name !in listOf("param", "return", "throws")) {
|
||||||
|
section(name.replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }, list)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
sb.append("</table>")
|
||||||
|
return sb.toString()
|
||||||
|
}
|
||||||
|
|
||||||
private fun previousWordBefore(text: String, offset: Int): TextRange? {
|
private fun previousWordBefore(text: String, offset: Int): TextRange? {
|
||||||
// skip spaces and dots to the left, but stop after hitting a non-identifier or dot boundary
|
// skip spaces and the dot to the left, but stop after hitting a non-identifier boundary
|
||||||
var i = (offset - 1).coerceAtLeast(0)
|
var i = (offset - 1).coerceAtLeast(0)
|
||||||
// first, move left past spaces
|
// skip trailing spaces
|
||||||
while (i > 0 && text[i].isWhitespace()) i--
|
while (i >= 0 && text[i].isWhitespace()) i--
|
||||||
|
// skip the dot if present
|
||||||
|
if (i >= 0 && text[i] == '.') i--
|
||||||
|
// skip spaces before the dot
|
||||||
|
while (i >= 0 && text[i].isWhitespace()) i--
|
||||||
// remember position to check for dot between words
|
// remember position to check for dot between words
|
||||||
val end = i + 1
|
val end = i + 1
|
||||||
// now find the start of the identifier
|
// now find the start of the identifier
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Minimal fallback docs seeding for `lyng.io.process` used only inside the IDEA plugin
|
||||||
|
* when external docs module (lyngio) is not present on the classpath.
|
||||||
|
*/
|
||||||
|
package net.sergeych.lyng.idea.docs
|
||||||
|
|
||||||
|
import net.sergeych.lyng.miniast.BuiltinDocRegistry
|
||||||
|
import net.sergeych.lyng.miniast.ParamDoc
|
||||||
|
import net.sergeych.lyng.miniast.type
|
||||||
|
|
||||||
|
internal object ProcessDocsFallback {
|
||||||
|
@Volatile
|
||||||
|
private var seeded = false
|
||||||
|
|
||||||
|
fun ensureOnce(): Boolean {
|
||||||
|
if (seeded) return true
|
||||||
|
synchronized(this) {
|
||||||
|
if (seeded) return true
|
||||||
|
BuiltinDocRegistry.module("lyng.io.process") {
|
||||||
|
classDoc(name = "Process", doc = "Process execution and control.") {
|
||||||
|
method(
|
||||||
|
name = "execute",
|
||||||
|
doc = "Execute a process with arguments.",
|
||||||
|
params = listOf(ParamDoc("executable", type("lyng.String")), ParamDoc("args", type("lyng.List"))),
|
||||||
|
returns = type("RunningProcess"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "shell",
|
||||||
|
doc = "Execute a command via system shell.",
|
||||||
|
params = listOf(ParamDoc("command", type("lyng.String"))),
|
||||||
|
returns = type("RunningProcess"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
classDoc(name = "RunningProcess", doc = "Handle to a running process.") {
|
||||||
|
method(name = "stdout", doc = "Get standard output stream as a Flow of lines.", returns = type("lyng.Flow"))
|
||||||
|
method(name = "stderr", doc = "Get standard error stream as a Flow of lines.", returns = type("lyng.Flow"))
|
||||||
|
method(name = "waitFor", doc = "Wait for the process to exit.", returns = type("lyng.Int"))
|
||||||
|
method(name = "signal", doc = "Send a signal to the process.", params = listOf(ParamDoc("signal", type("lyng.String"))))
|
||||||
|
method(name = "destroy", doc = "Forcefully terminate the process.")
|
||||||
|
}
|
||||||
|
|
||||||
|
valDoc(name = "Process", doc = "Process execution and control.", type = type("Process"))
|
||||||
|
valDoc(name = "RunningProcess", doc = "Handle to a running process.", type = type("RunningProcess"))
|
||||||
|
}
|
||||||
|
seeded = true
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
|
|
||||||
import com.intellij.codeInsight.intention.IntentionAction
|
|
||||||
import com.intellij.openapi.editor.Editor
|
|
||||||
import com.intellij.openapi.project.Project
|
|
||||||
import com.intellij.psi.PsiFile
|
|
||||||
import net.sergeych.lyng.idea.settings.LyngFormatterSettings
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lightweight quick-fix that adds a word to the per-project Lyng dictionary.
|
|
||||||
*/
|
|
||||||
class AddToLyngDictionaryFix(private val word: String) : IntentionAction {
|
|
||||||
override fun getText(): String = "Add '$word' to Lyng dictionary"
|
|
||||||
override fun getFamilyName(): String = "Lyng Spelling"
|
|
||||||
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?): Boolean = word.isNotBlank()
|
|
||||||
override fun startInWriteAction(): Boolean = true
|
|
||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor?, file: PsiFile?) {
|
|
||||||
val settings = LyngFormatterSettings.getInstance(project)
|
|
||||||
val learned = settings.learnedWords
|
|
||||||
learned.add(word.lowercase())
|
|
||||||
settings.learnedWords = learned
|
|
||||||
// Restart daemon to refresh highlights
|
|
||||||
if (file != null) DaemonCodeAnalyzer.getInstance(project).restart(file)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import java.io.BufferedReader
|
|
||||||
import java.io.InputStreamReader
|
|
||||||
import java.util.zip.GZIPInputStream
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Very simple English dictionary loader for offline suggestions on IC-243.
|
|
||||||
* It loads a word list from classpath resources. Supports plain text (one word per line)
|
|
||||||
* and gzipped text if the resource ends with .gz.
|
|
||||||
*/
|
|
||||||
object EnglishDictionary {
|
|
||||||
private val log = Logger.getInstance(EnglishDictionary::class.java)
|
|
||||||
|
|
||||||
@Volatile private var loaded = false
|
|
||||||
@Volatile private var words: Set<String> = emptySet()
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load dictionary from bundled resources (once).
|
|
||||||
* If multiple candidates exist, the first found is used.
|
|
||||||
*/
|
|
||||||
private fun ensureLoaded() {
|
|
||||||
if (loaded) return
|
|
||||||
synchronized(this) {
|
|
||||||
if (loaded) return
|
|
||||||
val candidates = listOf(
|
|
||||||
// preferred large bundles first (add en-basic.txt.gz ~3–5MB here)
|
|
||||||
"/dictionaries/en-basic.txt.gz",
|
|
||||||
"/dictionaries/en-large.txt.gz",
|
|
||||||
// plain text fallbacks
|
|
||||||
"/dictionaries/en-basic.txt",
|
|
||||||
"/dictionaries/en-large.txt",
|
|
||||||
)
|
|
||||||
val merged = HashSet<String>(128_000)
|
|
||||||
for (res in candidates) {
|
|
||||||
try {
|
|
||||||
val stream = javaClass.getResourceAsStream(res) ?: continue
|
|
||||||
val reader = if (res.endsWith(".gz"))
|
|
||||||
BufferedReader(InputStreamReader(GZIPInputStream(stream)))
|
|
||||||
else
|
|
||||||
BufferedReader(InputStreamReader(stream))
|
|
||||||
var loadedCount = 0
|
|
||||||
reader.useLines { seq -> seq.forEach { line ->
|
|
||||||
val w = line.trim()
|
|
||||||
if (w.isNotEmpty() && !w.startsWith("#")) { merged += w.lowercase(); loadedCount++ }
|
|
||||||
} }
|
|
||||||
log.info("EnglishDictionary: loaded $loadedCount words from $res (total=${merged.size})")
|
|
||||||
} catch (t: Throwable) {
|
|
||||||
log.info("EnglishDictionary: failed to load $res: ${t.javaClass.simpleName}: ${t.message}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (merged.isEmpty()) {
|
|
||||||
// Fallback minimal set
|
|
||||||
merged += setOf("comment","comments","error","errors","found","file","not","word","words","count","value","name","class","function","string")
|
|
||||||
log.info("EnglishDictionary: using minimal built-in set (${merged.size})")
|
|
||||||
}
|
|
||||||
words = merged
|
|
||||||
loaded = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun allWords(): Set<String> {
|
|
||||||
ensureLoaded()
|
|
||||||
return words
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,609 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Grazie-backed annotator for Lyng files.
|
|
||||||
*
|
|
||||||
* It consumes the MiniAst-driven LyngSpellIndex and, when Grazie is present,
|
|
||||||
* tries to run Grazie checks on the extracted TextContent. Results are painted
|
|
||||||
* as warnings in the editor. If the Grazie API changes, we use reflection and
|
|
||||||
* fail softly with INFO logs (no errors shown to users).
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
|
|
||||||
import com.intellij.grazie.text.TextContent
|
|
||||||
import com.intellij.grazie.text.TextContent.TextDomain
|
|
||||||
import com.intellij.ide.plugins.PluginManagerCore
|
|
||||||
import com.intellij.lang.annotation.AnnotationHolder
|
|
||||||
import com.intellij.lang.annotation.ExternalAnnotator
|
|
||||||
import com.intellij.lang.annotation.HighlightSeverity
|
|
||||||
import com.intellij.openapi.application.ApplicationManager
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import com.intellij.openapi.editor.Document
|
|
||||||
import com.intellij.openapi.editor.colors.TextAttributesKey
|
|
||||||
import com.intellij.openapi.project.DumbAware
|
|
||||||
import com.intellij.openapi.util.Key
|
|
||||||
import com.intellij.openapi.util.TextRange
|
|
||||||
import com.intellij.psi.PsiFile
|
|
||||||
import net.sergeych.lyng.idea.settings.LyngFormatterSettings
|
|
||||||
import net.sergeych.lyng.idea.spell.LyngSpellIndex
|
|
||||||
|
|
||||||
class LyngGrazieAnnotator : ExternalAnnotator<LyngGrazieAnnotator.Input, LyngGrazieAnnotator.Result>(), DumbAware {
|
|
||||||
private val log = Logger.getInstance(LyngGrazieAnnotator::class.java)
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
// Cache GrammarChecker availability to avoid repeated reflection + noisy logs
|
|
||||||
@Volatile
|
|
||||||
private var grammarCheckerAvailable: Boolean? = null
|
|
||||||
|
|
||||||
@Volatile
|
|
||||||
private var grammarCheckerMissingLogged: Boolean = false
|
|
||||||
|
|
||||||
private fun isGrammarCheckerKnownMissing(): Boolean = (grammarCheckerAvailable == false)
|
|
||||||
|
|
||||||
private fun markGrammarCheckerMissingOnce(log: Logger, message: String) {
|
|
||||||
if (!grammarCheckerMissingLogged) {
|
|
||||||
// Downgrade to debug to reduce log noise across projects/sessions
|
|
||||||
log.debug(message)
|
|
||||||
grammarCheckerMissingLogged = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private val RETRY_KEY: Key<Long> = Key.create("LYNG_GRAZIE_ANN_RETRY_STAMP")
|
|
||||||
}
|
|
||||||
|
|
||||||
data class Input(val modStamp: Long)
|
|
||||||
data class Finding(val range: TextRange, val message: String)
|
|
||||||
data class Result(val modStamp: Long, val findings: List<Finding>)
|
|
||||||
|
|
||||||
override fun collectInformation(file: PsiFile): Input? {
|
|
||||||
val doc: Document = file.viewProvider.document ?: return null
|
|
||||||
// Only require Grazie presence; index readiness is checked in apply with a retry.
|
|
||||||
val grazie = isGrazieInstalled()
|
|
||||||
if (!grazie) {
|
|
||||||
log.info("LyngGrazieAnnotator.collectInformation: skip (grazie=false) file='${file.name}'")
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
log.info("LyngGrazieAnnotator.collectInformation: file='${file.name}', modStamp=${doc.modificationStamp}")
|
|
||||||
return Input(doc.modificationStamp)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun doAnnotate(collectedInfo: Input?): Result? {
|
|
||||||
// All heavy lifting is done in apply where we have the file context
|
|
||||||
return collectedInfo?.let { Result(it.modStamp, emptyList()) }
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun apply(file: PsiFile, annotationResult: Result?, holder: AnnotationHolder) {
|
|
||||||
if (annotationResult == null || !isGrazieInstalled()) return
|
|
||||||
val doc = file.viewProvider.document ?: return
|
|
||||||
val idx = LyngSpellIndex.getUpToDate(file) ?: run {
|
|
||||||
log.info("LyngGrazieAnnotator.apply: index not ready for '${file.name}', scheduling one-shot restart")
|
|
||||||
scheduleOneShotRestart(file, annotationResult.modStamp)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
val settings = LyngFormatterSettings.getInstance(file.project)
|
|
||||||
|
|
||||||
// Build TextContent fragments for comments/strings/identifiers according to settings
|
|
||||||
val fragments = mutableListOf<Pair<TextContent, TextRange>>()
|
|
||||||
try {
|
|
||||||
fun addFragments(ranges: List<TextRange>, domain: TextDomain) {
|
|
||||||
for (r in ranges) {
|
|
||||||
val local = rangeToTextContent(file, domain, r) ?: continue
|
|
||||||
fragments += local to r
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Comments always via COMMENTS
|
|
||||||
addFragments(idx.comments, TextDomain.COMMENTS)
|
|
||||||
// Strings: LITERALS if requested, else COMMENTS if fallback enabled
|
|
||||||
if (settings.spellCheckStringLiterals) {
|
|
||||||
val domain = if (settings.grazieTreatLiteralsAsComments) TextDomain.COMMENTS else TextDomain.LITERALS
|
|
||||||
addFragments(idx.strings, domain)
|
|
||||||
}
|
|
||||||
// Identifiers via COMMENTS to force painting in 243 unless user disables fallback
|
|
||||||
val idsDomain = if (settings.grazieTreatIdentifiersAsComments) TextDomain.COMMENTS else TextDomain.DOCUMENTATION
|
|
||||||
addFragments(idx.identifiers, idsDomain)
|
|
||||||
log.info(
|
|
||||||
"LyngGrazieAnnotator.apply: file='${file.name}', idxCounts ids=${idx.identifiers.size}, comments=${idx.comments.size}, strings=${idx.strings.size}, builtFragments=${fragments.size}"
|
|
||||||
)
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator: failed to build TextContent fragments: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fragments.isEmpty()) return
|
|
||||||
|
|
||||||
val findings = mutableListOf<Finding>()
|
|
||||||
var totalReturned = 0
|
|
||||||
var chosenEntry: String? = null
|
|
||||||
for ((content, hostRange) in fragments) {
|
|
||||||
try {
|
|
||||||
val (typos, entryNote) = runGrazieChecksWithTracing(file, content)
|
|
||||||
if (chosenEntry == null) chosenEntry = entryNote
|
|
||||||
if (typos != null) {
|
|
||||||
totalReturned += typos.size
|
|
||||||
for (t in typos) {
|
|
||||||
val rel = extractRangeFromTypo(t) ?: continue
|
|
||||||
// Map relative range inside fragment to host file range
|
|
||||||
val abs = TextRange(hostRange.startOffset + rel.startOffset, hostRange.startOffset + rel.endOffset)
|
|
||||||
findings += Finding(abs, extractMessageFromTypo(t) ?: "Spelling/Grammar")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator: Grazie check failed: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
log.info("LyngGrazieAnnotator.apply: used=${chosenEntry ?: "<none>"}, totalFindings=$totalReturned, painting=${findings.size}")
|
|
||||||
|
|
||||||
// IMPORTANT: Do NOT fallback to the tiny bundled vocabulary on modern IDEs.
|
|
||||||
// If Grazie/Natural Languages processing returned nothing, we simply exit here
|
|
||||||
// to avoid low‑quality results from the legacy dictionary.
|
|
||||||
if (findings.isEmpty()) return
|
|
||||||
|
|
||||||
for (f in findings) {
|
|
||||||
val ab = holder.newAnnotation(HighlightSeverity.INFORMATION, f.message).range(f.range)
|
|
||||||
applyTypoStyleIfRequested(file, ab)
|
|
||||||
ab.create()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun scheduleOneShotRestart(file: PsiFile, modStamp: Long) {
|
|
||||||
try {
|
|
||||||
val last = file.getUserData(RETRY_KEY)
|
|
||||||
if (last == modStamp) {
|
|
||||||
log.info("LyngGrazieAnnotator.restart: already retried for modStamp=$modStamp, skip")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
file.putUserData(RETRY_KEY, modStamp)
|
|
||||||
ApplicationManager.getApplication().invokeLater({
|
|
||||||
try {
|
|
||||||
DaemonCodeAnalyzer.getInstance(file.project).restart(file)
|
|
||||||
log.info("LyngGrazieAnnotator.restart: daemon restarted for '${file.name}'")
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator.restart failed: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator.scheduleOneShotRestart failed: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun isGrazieInstalled(): Boolean {
|
|
||||||
return PluginManagerCore.isPluginInstalled(com.intellij.openapi.extensions.PluginId.getId("com.intellij.grazie")) ||
|
|
||||||
PluginManagerCore.isPluginInstalled(com.intellij.openapi.extensions.PluginId.getId("tanvd.grazi"))
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun rangeToTextContent(file: PsiFile, domain: TextDomain, range: TextRange): TextContent? {
|
|
||||||
// Build TextContent via reflection: prefer psiFragment(domain, element)
|
|
||||||
return try {
|
|
||||||
// Try to find an element that fully covers the target range
|
|
||||||
var element = file.findElementAt(range.startOffset) ?: return null
|
|
||||||
val start = range.startOffset
|
|
||||||
val end = range.endOffset
|
|
||||||
while (element.parent != null && (element.textRange.startOffset > start || element.textRange.endOffset < end)) {
|
|
||||||
element = element.parent
|
|
||||||
}
|
|
||||||
if (element.textRange.startOffset > start || element.textRange.endOffset < end) return null
|
|
||||||
// In many cases, the element may not span the whole range; use file + range via suitable factory
|
|
||||||
val methods = TextContent::class.java.methods.filter { it.name == "psiFragment" }
|
|
||||||
val byElementDomain = methods.firstOrNull { it.parameterCount == 2 && it.parameterTypes[0].name.endsWith("PsiElement") }
|
|
||||||
if (byElementDomain != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
return (byElementDomain.invoke(null, element, domain) as? TextContent)?.let { tc ->
|
|
||||||
val relStart = start - element.textRange.startOffset
|
|
||||||
val relEnd = end - element.textRange.startOffset
|
|
||||||
if (relStart < 0 || relEnd > tc.length || relStart >= relEnd) return null
|
|
||||||
tc.subText(TextRange(relStart, relEnd))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
val byDomainElement = methods.firstOrNull { it.parameterCount == 2 && it.parameterTypes[0].name.endsWith("TextDomain") }
|
|
||||||
if (byDomainElement != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
return (byDomainElement.invoke(null, domain, element) as? TextContent)?.let { tc ->
|
|
||||||
val relStart = start - element.textRange.startOffset
|
|
||||||
val relEnd = end - element.textRange.startOffset
|
|
||||||
if (relStart < 0 || relEnd > tc.length || relStart >= relEnd) return null
|
|
||||||
tc.subText(TextRange(relStart, relEnd))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
null
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator: rangeToTextContent failed: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun runGrazieChecksWithTracing(file: PsiFile, content: TextContent): Pair<Collection<Any>?, String?> {
|
|
||||||
// Try known entry points via reflection to avoid hard dependencies on Grazie internals
|
|
||||||
if (isGrammarCheckerKnownMissing()) return null to null
|
|
||||||
try {
|
|
||||||
// 1) Static GrammarChecker.check(TextContent)
|
|
||||||
val checkerCls = try {
|
|
||||||
Class.forName("com.intellij.grazie.grammar.GrammarChecker").also { grammarCheckerAvailable = true }
|
|
||||||
} catch (t: Throwable) {
|
|
||||||
grammarCheckerAvailable = false
|
|
||||||
markGrammarCheckerMissingOnce(log, "LyngGrazieAnnotator: GrammarChecker class not found: ${t.javaClass.simpleName}: ${t.message}")
|
|
||||||
null
|
|
||||||
}
|
|
||||||
if (checkerCls != null) {
|
|
||||||
// Diagnostic: list available 'check' methods once
|
|
||||||
runCatching {
|
|
||||||
val checks = checkerCls.methods.filter { it.name == "check" }
|
|
||||||
val sig = checks.joinToString { m ->
|
|
||||||
val params = m.parameterTypes.joinToString(prefix = "(", postfix = ")") { it.simpleName }
|
|
||||||
"${m.name}$params static=${java.lang.reflect.Modifier.isStatic(m.modifiers)}"
|
|
||||||
}
|
|
||||||
log.info("LyngGrazieAnnotator: GrammarChecker.check candidates: ${if (sig.isEmpty()) "<none>" else sig}")
|
|
||||||
}
|
|
||||||
checkerCls.methods.firstOrNull { it.name == "check" && it.parameterCount == 1 && it.parameterTypes[0].name.endsWith("TextContent") }?.let { m ->
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(null, content) as? Collection<Any>
|
|
||||||
return res to "GrammarChecker.check(TextContent) static"
|
|
||||||
}
|
|
||||||
// 2) GrammarChecker.getInstance().check(TextContent)
|
|
||||||
val getInstance = checkerCls.methods.firstOrNull { it.name == "getInstance" && it.parameterCount == 0 }
|
|
||||||
val inst = getInstance?.invoke(null)
|
|
||||||
if (inst != null) {
|
|
||||||
val m = checkerCls.methods.firstOrNull { it.name == "check" && it.parameterCount == 1 && it.parameterTypes[0].name.endsWith("TextContent") }
|
|
||||||
if (m != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(inst, content) as? Collection<Any>
|
|
||||||
return res to "GrammarChecker.getInstance().check(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 3) GrammarChecker.getDefault().check(TextContent)
|
|
||||||
val getDefault = checkerCls.methods.firstOrNull { it.name == "getDefault" && it.parameterCount == 0 }
|
|
||||||
val def = getDefault?.invoke(null)
|
|
||||||
if (def != null) {
|
|
||||||
val m = checkerCls.methods.firstOrNull { it.name == "check" && it.parameterCount == 1 && it.parameterTypes[0].name.endsWith("TextContent") }
|
|
||||||
if (m != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(def, content) as? Collection<Any>
|
|
||||||
return res to "GrammarChecker.getDefault().check(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 4) Service from project/application: GrammarChecker as a service
|
|
||||||
runCatching {
|
|
||||||
val app = com.intellij.openapi.application.ApplicationManager.getApplication()
|
|
||||||
val getService = app::class.java.methods.firstOrNull { it.name == "getService" && it.parameterCount == 1 }
|
|
||||||
val svc = getService?.invoke(app, checkerCls)
|
|
||||||
if (svc != null) {
|
|
||||||
val m = checkerCls.methods.firstOrNull { it.name == "check" && it.parameterCount == 1 && it.parameterTypes[0].name.endsWith("TextContent") }
|
|
||||||
if (m != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(svc, content) as? Collection<Any>
|
|
||||||
if (res != null) return res to "Application.getService(GrammarChecker).check(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
runCatching {
|
|
||||||
val getService = file.project::class.java.methods.firstOrNull { it.name == "getService" && it.parameterCount == 1 }
|
|
||||||
val svc = getService?.invoke(file.project, checkerCls)
|
|
||||||
if (svc != null) {
|
|
||||||
val m = checkerCls.methods.firstOrNull { it.name == "check" && it.parameterCount == 1 && it.parameterTypes[0].name.endsWith("TextContent") }
|
|
||||||
if (m != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(svc, content) as? Collection<Any>
|
|
||||||
if (res != null) return res to "Project.getService(GrammarChecker).check(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 5) Fallback: search any public method named check that accepts TextContent in any Grazie class (static)
|
|
||||||
val candidateClasses = listOf(
|
|
||||||
"com.intellij.grazie.grammar.GrammarChecker",
|
|
||||||
"com.intellij.grazie.grammar.GrammarRunner",
|
|
||||||
"com.intellij.grazie.grammar.Grammar" // historical names
|
|
||||||
)
|
|
||||||
for (cn in candidateClasses) {
|
|
||||||
val cls = try { Class.forName(cn) } catch (_: Throwable) { continue }
|
|
||||||
val m = cls.methods.firstOrNull { it.name == "check" && it.parameterTypes.any { p -> p.name.endsWith("TextContent") } }
|
|
||||||
if (m != null) {
|
|
||||||
val args = arrayOfNulls<Any>(m.parameterCount)
|
|
||||||
// place content to the first TextContent parameter; others left null (common defaults)
|
|
||||||
for (i in 0 until m.parameterCount) if (m.parameterTypes[i].name.endsWith("TextContent")) { args[i] = content; break }
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(null, *args) as? Collection<Any>
|
|
||||||
if (res != null) return res to "$cn.${m.name}(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 6) Kotlin top-level function: GrammarCheckerKt.check(TextContent)
|
|
||||||
runCatching {
|
|
||||||
val kt = Class.forName("com.intellij.grazie.grammar.GrammarCheckerKt")
|
|
||||||
val m = kt.methods.firstOrNull { it.name == "check" && it.parameterTypes.any { p -> p.name.endsWith("TextContent") } }
|
|
||||||
if (m != null) {
|
|
||||||
val args = arrayOfNulls<Any>(m.parameterCount)
|
|
||||||
for (i in 0 until m.parameterCount) if (m.parameterTypes[i].name.endsWith("TextContent")) { args[i] = content; break }
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(null, *args) as? Collection<Any>
|
|
||||||
if (res != null) return res to "GrammarCheckerKt.check(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator: runGrazieChecks reflection failed: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
}
|
|
||||||
return null to null
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun extractRangeFromTypo(typo: Any): TextRange? {
|
|
||||||
// Try to get a relative range from returned Grazie issue/typo via common accessors
|
|
||||||
return try {
|
|
||||||
// Common getters
|
|
||||||
val m1 = typo.javaClass.methods.firstOrNull { it.name == "getRange" && it.parameterCount == 0 }
|
|
||||||
val r1 = if (m1 != null) m1.invoke(typo) else null
|
|
||||||
when (r1) {
|
|
||||||
is TextRange -> return r1
|
|
||||||
is IntRange -> return TextRange(r1.first, r1.last + 1)
|
|
||||||
}
|
|
||||||
val m2 = typo.javaClass.methods.firstOrNull { it.name == "getHighlightRange" && it.parameterCount == 0 }
|
|
||||||
val r2 = if (m2 != null) m2.invoke(typo) else null
|
|
||||||
when (r2) {
|
|
||||||
is TextRange -> return r2
|
|
||||||
is IntRange -> return TextRange(r2.first, r2.last + 1)
|
|
||||||
}
|
|
||||||
// Separate from/to ints
|
|
||||||
val fromM = typo.javaClass.methods.firstOrNull { it.name == "getFrom" && it.parameterCount == 0 && it.returnType == Int::class.javaPrimitiveType }
|
|
||||||
val toM = typo.javaClass.methods.firstOrNull { it.name == "getTo" && it.parameterCount == 0 && it.returnType == Int::class.javaPrimitiveType }
|
|
||||||
if (fromM != null && toM != null) {
|
|
||||||
val s = (fromM.invoke(typo) as? Int) ?: return null
|
|
||||||
val e = (toM.invoke(typo) as? Int) ?: return null
|
|
||||||
if (e > s) return TextRange(s, e)
|
|
||||||
}
|
|
||||||
null
|
|
||||||
} catch (_: Throwable) { null }
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun extractMessageFromTypo(typo: Any): String? {
|
|
||||||
return try {
|
|
||||||
val m = typo.javaClass.methods.firstOrNull { it.name == "getMessage" && it.parameterCount == 0 }
|
|
||||||
(m?.invoke(typo) as? String)
|
|
||||||
} catch (_: Throwable) { null }
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Fallback that uses legacy SpellCheckerManager (if present) via reflection to validate words in fragments.
|
|
||||||
// Returns number of warnings painted.
|
|
||||||
private fun fallbackWithLegacySpellcheckerIfAvailable(
|
|
||||||
file: PsiFile,
|
|
||||||
fragments: List<Pair<TextContent, TextRange>>,
|
|
||||||
holder: AnnotationHolder
|
|
||||||
): Int {
|
|
||||||
return try {
|
|
||||||
val mgrCls = Class.forName("com.intellij.spellchecker.SpellCheckerManager")
|
|
||||||
val getInstance = mgrCls.methods.firstOrNull { it.name == "getInstance" && it.parameterCount == 1 }
|
|
||||||
val isCorrect = mgrCls.methods.firstOrNull { it.name == "isCorrect" && it.parameterCount == 1 && it.parameterTypes[0] == String::class.java }
|
|
||||||
if (getInstance == null || isCorrect == null) {
|
|
||||||
// No legacy spellchecker API available — fall back to naive painter
|
|
||||||
return naiveFallbackPaint(file, fragments, holder)
|
|
||||||
}
|
|
||||||
val mgr = getInstance.invoke(null, file.project)
|
|
||||||
if (mgr == null) {
|
|
||||||
// Legacy manager not present for this project — use naive fallback
|
|
||||||
return naiveFallbackPaint(file, fragments, holder)
|
|
||||||
}
|
|
||||||
var painted = 0
|
|
||||||
val docText = file.viewProvider.document?.text ?: return 0
|
|
||||||
val tokenRegex = Regex("[A-Za-z][A-Za-z0-9_']{2,}")
|
|
||||||
for ((content, hostRange) in fragments) {
|
|
||||||
val text = try { docText.substring(hostRange.startOffset, hostRange.endOffset) } catch (_: Throwable) { null } ?: continue
|
|
||||||
var seen = 0
|
|
||||||
var flagged = 0
|
|
||||||
for (m in tokenRegex.findAll(text)) {
|
|
||||||
val token = m.value
|
|
||||||
if ('%' in token) continue // skip printf fragments defensively
|
|
||||||
// Split snake_case and camelCase within the token
|
|
||||||
val parts = splitIdentifier(token)
|
|
||||||
for (part in parts) {
|
|
||||||
if (part.length <= 2) continue
|
|
||||||
if (isAllowedWord(part)) continue
|
|
||||||
// Quick allowlist for very common words to reduce noise if dictionaries differ
|
|
||||||
val ok = try { isCorrect.invoke(mgr, part) as? Boolean } catch (_: Throwable) { null }
|
|
||||||
if (ok == false) {
|
|
||||||
// Map part back to original token occurrence within this hostRange
|
|
||||||
val localStart = m.range.first + token.indexOf(part)
|
|
||||||
val localEnd = localStart + part.length
|
|
||||||
val abs = TextRange(hostRange.startOffset + localStart, hostRange.startOffset + localEnd)
|
|
||||||
paintTypoAnnotation(file, holder, abs, part)
|
|
||||||
painted++
|
|
||||||
flagged++
|
|
||||||
}
|
|
||||||
seen++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
log.info("LyngGrazieAnnotator.fallback: fragment words=$seen, flagged=$flagged")
|
|
||||||
}
|
|
||||||
painted
|
|
||||||
} catch (_: Throwable) {
|
|
||||||
// If legacy manager is not available, fall back to a very naive heuristic (no external deps)
|
|
||||||
return naiveFallbackPaint(file, fragments, holder)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun naiveFallbackPaint(
|
|
||||||
file: PsiFile,
|
|
||||||
fragments: List<Pair<TextContent, TextRange>>,
|
|
||||||
holder: AnnotationHolder
|
|
||||||
): Int {
|
|
||||||
var painted = 0
|
|
||||||
val docText = file.viewProvider.document?.text
|
|
||||||
val tokenRegex = Regex("[A-Za-z][A-Za-z0-9_']{2,}")
|
|
||||||
val baseWords = setOf(
|
|
||||||
// small, common vocabulary to catch near-miss typos in typical code/comments
|
|
||||||
"comment","comments","error","errors","found","file","not","word","words","count","value","name","class","function","string"
|
|
||||||
)
|
|
||||||
for ((content, hostRange) in fragments) {
|
|
||||||
val text: String? = docText?.let { dt ->
|
|
||||||
try { dt.substring(hostRange.startOffset, hostRange.endOffset) } catch (_: Throwable) { null }
|
|
||||||
}
|
|
||||||
if (text.isNullOrBlank()) continue
|
|
||||||
var seen = 0
|
|
||||||
var flagged = 0
|
|
||||||
for (m in tokenRegex.findAll(text)) {
|
|
||||||
val token = m.value
|
|
||||||
if ('%' in token) continue
|
|
||||||
val parts = splitIdentifier(token)
|
|
||||||
for (part in parts) {
|
|
||||||
seen++
|
|
||||||
val lower = part.lowercase()
|
|
||||||
if (lower.length <= 2 || isAllowedWord(part)) continue
|
|
||||||
// Heuristic: no vowels OR 3 repeated chars OR ends with unlikely double consonants
|
|
||||||
val noVowel = lower.none { it in "aeiouy" }
|
|
||||||
val triple = Regex("(.)\\1\\1").containsMatchIn(lower)
|
|
||||||
val dblCons = Regex("[bcdfghjklmnpqrstvwxyz]{2}$").containsMatchIn(lower)
|
|
||||||
var looksWrong = noVowel || triple || dblCons
|
|
||||||
// Additional: low vowel ratio for length>=4
|
|
||||||
if (!looksWrong && lower.length >= 4) {
|
|
||||||
val vowels = lower.count { it in "aeiouy" }
|
|
||||||
val ratio = if (lower.isNotEmpty()) vowels.toDouble() / lower.length else 1.0
|
|
||||||
if (ratio < 0.25) looksWrong = true
|
|
||||||
}
|
|
||||||
// Additional: near-miss to a small base vocabulary (edit distance 1, or 2 for words >=6)
|
|
||||||
if (!looksWrong) {
|
|
||||||
for (bw in baseWords) {
|
|
||||||
val d = editDistance(lower, bw)
|
|
||||||
if (d == 1 || (d == 2 && lower.length >= 6)) { looksWrong = true; break }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (looksWrong) {
|
|
||||||
val localStart = m.range.first + token.indexOf(part)
|
|
||||||
val localEnd = localStart + part.length
|
|
||||||
val abs = TextRange(hostRange.startOffset + localStart, hostRange.startOffset + localEnd)
|
|
||||||
paintTypoAnnotation(file, holder, abs, part)
|
|
||||||
painted++
|
|
||||||
flagged++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
log.info("LyngGrazieAnnotator.fallback(naive): fragment words=$seen, flagged=$flagged")
|
|
||||||
}
|
|
||||||
return painted
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun paintTypoAnnotation(file: PsiFile, holder: AnnotationHolder, range: TextRange, word: String) {
|
|
||||||
val settings = LyngFormatterSettings.getInstance(file.project)
|
|
||||||
val ab = holder.newAnnotation(HighlightSeverity.INFORMATION, "Possible typo")
|
|
||||||
.range(range)
|
|
||||||
applyTypoStyleIfRequested(file, ab)
|
|
||||||
if (settings.offerLyngTypoQuickFixes) {
|
|
||||||
// Offer lightweight fixes; for 243 provide Add-to-dictionary always
|
|
||||||
ab.withFix(net.sergeych.lyng.idea.grazie.AddToLyngDictionaryFix(word))
|
|
||||||
// Offer "Replace with…" candidates (top 7)
|
|
||||||
val cands = suggestReplacements(file, word).take(7)
|
|
||||||
for (c in cands) {
|
|
||||||
ab.withFix(net.sergeych.lyng.idea.grazie.ReplaceWordFix(range, word, c))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ab.create()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun applyTypoStyleIfRequested(file: PsiFile, ab: com.intellij.lang.annotation.AnnotationBuilder) {
|
|
||||||
val settings = LyngFormatterSettings.getInstance(file.project)
|
|
||||||
if (!settings.showTyposWithGreenUnderline) return
|
|
||||||
// Use the standard TYPO text attributes key used by the platform
|
|
||||||
val TYPO: TextAttributesKey = TextAttributesKey.createTextAttributesKey("TYPO")
|
|
||||||
try {
|
|
||||||
ab.textAttributes(TYPO)
|
|
||||||
} catch (_: Throwable) {
|
|
||||||
// some IDEs may not allow setting attributes on INFORMATION; ignore gracefully
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun suggestReplacements(file: PsiFile, word: String): List<String> {
|
|
||||||
val lower = word.lowercase()
|
|
||||||
val fromProject = collectProjectWords(file)
|
|
||||||
val fromTech = TechDictionary.allWords()
|
|
||||||
val fromEnglish = EnglishDictionary.allWords()
|
|
||||||
// Merge with priority: project (p=0), tech (p=1), english (p=2)
|
|
||||||
val all = LinkedHashSet<String>()
|
|
||||||
all.addAll(fromProject)
|
|
||||||
all.addAll(fromTech)
|
|
||||||
all.addAll(fromEnglish)
|
|
||||||
data class Cand(val w: String, val d: Int, val p: Int)
|
|
||||||
val cands = ArrayList<Cand>(32)
|
|
||||||
for (w in all) {
|
|
||||||
if (w == lower) continue
|
|
||||||
if (kotlin.math.abs(w.length - lower.length) > 2) continue
|
|
||||||
val d = editDistance(lower, w)
|
|
||||||
val p = when {
|
|
||||||
w in fromProject -> 0
|
|
||||||
w in fromTech -> 1
|
|
||||||
else -> 2
|
|
||||||
}
|
|
||||||
cands += Cand(w, d, p)
|
|
||||||
}
|
|
||||||
cands.sortWith(compareBy<Cand> { it.d }.thenBy { it.p }.thenBy { it.w })
|
|
||||||
// Return a larger pool so callers can choose desired display count
|
|
||||||
return cands.take(16).map { it.w }
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun collectProjectWords(file: PsiFile): Set<String> {
|
|
||||||
// Simple approach: use current file text; can be extended to project scanning later
|
|
||||||
val text = file.viewProvider.document?.text ?: return emptySet()
|
|
||||||
val out = LinkedHashSet<String>()
|
|
||||||
val tokenRegex = Regex("[A-Za-z][A-Za-z0-9_']{2,}")
|
|
||||||
for (m in tokenRegex.findAll(text)) {
|
|
||||||
val parts = splitIdentifier(m.value)
|
|
||||||
parts.forEach { out += it.lowercase() }
|
|
||||||
}
|
|
||||||
// Include learned words
|
|
||||||
val settings = LyngFormatterSettings.getInstance(file.project)
|
|
||||||
out.addAll(settings.learnedWords.map { it.lowercase() })
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun splitIdentifier(token: String): List<String> {
|
|
||||||
// Split on underscores and camelCase boundaries
|
|
||||||
val unders = token.split('_').filter { it.isNotBlank() }
|
|
||||||
val out = mutableListOf<String>()
|
|
||||||
val camelBoundary = Regex("(?<=[a-z])(?=[A-Z])")
|
|
||||||
for (u in unders) out += u.split(camelBoundary).filter { it.isNotBlank() }
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun isAllowedWord(w: String): Boolean {
|
|
||||||
val s = w.lowercase()
|
|
||||||
return s in setOf(
|
|
||||||
// common code words / language keywords to avoid noise
|
|
||||||
"val","var","fun","class","interface","enum","type","import","package","return","if","else","when","while","for","try","catch","finally","true","false","null",
|
|
||||||
"abstract","closed","override",
|
|
||||||
// very common English words
|
|
||||||
"the","and","or","not","with","from","into","this","that","file","found","count","name","value","object"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun editDistance(a: String, b: String): Int {
|
|
||||||
if (a == b) return 0
|
|
||||||
if (a.isEmpty()) return b.length
|
|
||||||
if (b.isEmpty()) return a.length
|
|
||||||
val dp = IntArray(b.length + 1) { it }
|
|
||||||
for (i in 1..a.length) {
|
|
||||||
var prev = dp[0]
|
|
||||||
dp[0] = i
|
|
||||||
for (j in 1..b.length) {
|
|
||||||
val temp = dp[j]
|
|
||||||
dp[j] = minOf(
|
|
||||||
dp[j] + 1, // deletion
|
|
||||||
dp[j - 1] + 1, // insertion
|
|
||||||
prev + if (a[i - 1] == b[j - 1]) 0 else 1 // substitution
|
|
||||||
)
|
|
||||||
prev = temp
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return dp[b.length]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,139 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.grazie.grammar.strategy.GrammarCheckingStrategy
|
|
||||||
import com.intellij.grazie.grammar.strategy.GrammarCheckingStrategy.TextDomain
|
|
||||||
import com.intellij.ide.plugins.PluginManagerCore
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import com.intellij.openapi.extensions.PluginId
|
|
||||||
import com.intellij.openapi.util.TextRange
|
|
||||||
import com.intellij.psi.PsiElement
|
|
||||||
import net.sergeych.lyng.idea.highlight.LyngTokenTypes
|
|
||||||
import net.sergeych.lyng.idea.settings.LyngFormatterSettings
|
|
||||||
import net.sergeych.lyng.idea.spell.LyngSpellIndex
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Grazie/Natural Languages strategy for Lyng.
|
|
||||||
*
|
|
||||||
* - Comments: checked as natural language (TextDomain.COMMENTS)
|
|
||||||
* - String literals: optionally checked (setting), skipping printf-like specifiers via stealth ranges (TextDomain.LITERALS)
|
|
||||||
* - Identifiers (non-keywords): checked under TextDomain.CODE so "Process code" controls apply
|
|
||||||
* - Keywords: skipped
|
|
||||||
*/
|
|
||||||
class LyngGrazieStrategy : GrammarCheckingStrategy {
|
|
||||||
|
|
||||||
private val log = Logger.getInstance(LyngGrazieStrategy::class.java)
|
|
||||||
@Volatile private var loggedOnce = false
|
|
||||||
@Volatile private var loggedFirstMatch = false
|
|
||||||
private val seenTypes: MutableSet<String> = java.util.Collections.synchronizedSet(mutableSetOf())
|
|
||||||
|
|
||||||
private fun legacySpellcheckerInstalled(): Boolean =
|
|
||||||
PluginManagerCore.isPluginInstalled(PluginId.getId("com.intellij.spellchecker"))
|
|
||||||
|
|
||||||
// Regex for printf-style specifiers: %[flags][width][.precision][length]type
|
|
||||||
private val spec = Regex("%(?:[-+ #0]*(?:\\d+)?(?:\\.\\d+)?[a-zA-Z%])")
|
|
||||||
|
|
||||||
override fun isMyContextRoot(element: PsiElement): Boolean {
|
|
||||||
val type = element.node?.elementType
|
|
||||||
val settings = LyngFormatterSettings.getInstance(element.project)
|
|
||||||
val legacyPresent = legacySpellcheckerInstalled()
|
|
||||||
if (type != null && seenTypes.size < 10) {
|
|
||||||
val name = type.toString()
|
|
||||||
if (seenTypes.add(name)) {
|
|
||||||
log.info("LyngGrazieStrategy: saw PSI type=$name")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!loggedOnce) {
|
|
||||||
loggedOnce = true
|
|
||||||
log.info("LyngGrazieStrategy activated: legacyPresent=$legacyPresent, preferGrazieForCommentsAndLiterals=${settings.preferGrazieForCommentsAndLiterals}, spellCheckStringLiterals=${settings.spellCheckStringLiterals}, grazieChecksIdentifiers=${settings.grazieChecksIdentifiers}")
|
|
||||||
}
|
|
||||||
|
|
||||||
val file = element.containingFile ?: return false
|
|
||||||
val index = LyngSpellIndex.getUpToDate(file) ?: return false // Suspend until ready
|
|
||||||
// To ensure Grazie asks TextExtractor for all leafs, accept any Lyng element once index is ready.
|
|
||||||
// The extractor will decide per-range/domain what to actually provide.
|
|
||||||
if (!loggedFirstMatch) {
|
|
||||||
loggedFirstMatch = true
|
|
||||||
log.info("LyngGrazieStrategy: enabling Grazie on all Lyng elements (index ready)")
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getContextRootTextDomain(root: PsiElement): TextDomain {
|
|
||||||
val type = root.node?.elementType
|
|
||||||
val settings = LyngFormatterSettings.getInstance(root.project)
|
|
||||||
val file = root.containingFile
|
|
||||||
val index = if (file != null) LyngSpellIndex.getUpToDate(file) else null
|
|
||||||
val r = root.textRange
|
|
||||||
|
|
||||||
fun overlaps(list: List<TextRange>): Boolean = r != null && list.any { it.intersects(r) }
|
|
||||||
|
|
||||||
return when (type) {
|
|
||||||
LyngTokenTypes.LINE_COMMENT, LyngTokenTypes.BLOCK_COMMENT -> TextDomain.COMMENTS
|
|
||||||
LyngTokenTypes.STRING -> if (settings.grazieTreatLiteralsAsComments) TextDomain.COMMENTS else TextDomain.LITERALS
|
|
||||||
LyngTokenTypes.IDENTIFIER -> {
|
|
||||||
// For Grazie-only reliability in 243, route identifiers via COMMENTS when configured
|
|
||||||
if (settings.grazieTreatIdentifiersAsComments && index != null && r != null && overlaps(index.identifiers))
|
|
||||||
TextDomain.COMMENTS
|
|
||||||
else TextDomain.PLAIN_TEXT
|
|
||||||
}
|
|
||||||
else -> TextDomain.PLAIN_TEXT
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Note: do not override getLanguageSupport to keep compatibility with 243 API
|
|
||||||
|
|
||||||
override fun getStealthyRanges(root: PsiElement, text: CharSequence): java.util.LinkedHashSet<IntRange> {
|
|
||||||
val result = LinkedHashSet<IntRange>()
|
|
||||||
val type = root.node?.elementType
|
|
||||||
if (type == LyngTokenTypes.STRING) {
|
|
||||||
if (!shouldCheckLiterals(root)) {
|
|
||||||
// Hide the entire string when literals checking is disabled by settings
|
|
||||||
result += (0 until text.length)
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
// Hide printf-like specifiers in strings
|
|
||||||
val (start, end) = stripQuotesBounds(text)
|
|
||||||
if (end > start) {
|
|
||||||
val content = text.subSequence(start, end)
|
|
||||||
for (m in spec.findAll(content)) {
|
|
||||||
val ms = start + m.range.first
|
|
||||||
val me = start + m.range.last
|
|
||||||
result += (ms..me)
|
|
||||||
}
|
|
||||||
if (result.isNotEmpty()) {
|
|
||||||
log.debug("LyngGrazieStrategy: hidden ${result.size} printf specifier ranges in string literal")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun isEnabledByDefault(): Boolean = true
|
|
||||||
|
|
||||||
private fun shouldCheckLiterals(root: PsiElement): Boolean =
|
|
||||||
LyngFormatterSettings.getInstance(root.project).spellCheckStringLiterals
|
|
||||||
|
|
||||||
private fun stripQuotesBounds(text: CharSequence): Pair<Int, Int> {
|
|
||||||
if (text.length < 2) return 0 to text.length
|
|
||||||
val first = text.first()
|
|
||||||
val last = text.last()
|
|
||||||
return if ((first == '"' && last == '"') || (first == '\'' && last == '\''))
|
|
||||||
1 to (text.length - 1) else (0 to text.length)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -19,86 +19,29 @@ package net.sergeych.lyng.idea.grazie
|
|||||||
import com.intellij.grazie.text.TextContent
|
import com.intellij.grazie.text.TextContent
|
||||||
import com.intellij.grazie.text.TextContent.TextDomain
|
import com.intellij.grazie.text.TextContent.TextDomain
|
||||||
import com.intellij.grazie.text.TextExtractor
|
import com.intellij.grazie.text.TextExtractor
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import net.sergeych.lyng.idea.highlight.LyngTokenTypes
|
import net.sergeych.lyng.idea.highlight.LyngTokenTypes
|
||||||
import net.sergeych.lyng.idea.settings.LyngFormatterSettings
|
import net.sergeych.lyng.idea.psi.LyngElementTypes
|
||||||
import net.sergeych.lyng.idea.spell.LyngSpellIndex
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides Grazie with extractable text for Lyng PSI elements.
|
* Simplified TextExtractor for Lyng.
|
||||||
* We return text for identifiers, comments, and (optionally) string literals.
|
* Designates areas for Natural Languages (Grazie) to check.
|
||||||
* printf-like specifiers are filtered by the Grammar strategy via stealth ranges.
|
|
||||||
*/
|
*/
|
||||||
class LyngTextExtractor : TextExtractor() {
|
class LyngTextExtractor : TextExtractor() {
|
||||||
private val log = Logger.getInstance(LyngTextExtractor::class.java)
|
|
||||||
@Volatile private var loggedOnce = false
|
|
||||||
private val seen: MutableSet<String> = java.util.Collections.synchronizedSet(mutableSetOf())
|
|
||||||
|
|
||||||
override fun buildTextContent(element: PsiElement, allowedDomains: Set<TextDomain>): TextContent? {
|
override fun buildTextContent(element: PsiElement, allowedDomains: Set<TextDomain>): TextContent? {
|
||||||
val type = element.node?.elementType ?: return null
|
val type = element.node?.elementType ?: return null
|
||||||
if (!loggedOnce) {
|
|
||||||
loggedOnce = true
|
|
||||||
log.info("LyngTextExtractor active; allowedDomains=${allowedDomains.joinToString()}")
|
|
||||||
}
|
|
||||||
val settings = LyngFormatterSettings.getInstance(element.project)
|
|
||||||
val file = element.containingFile
|
|
||||||
val index = if (file != null) LyngSpellIndex.getUpToDate(file) else null
|
|
||||||
val r = element.textRange
|
|
||||||
|
|
||||||
fun overlaps(list: List<com.intellij.openapi.util.TextRange>): Boolean = r != null && list.any { it.intersects(r) }
|
val domain = when (type) {
|
||||||
|
LyngTokenTypes.LINE_COMMENT, LyngTokenTypes.BLOCK_COMMENT -> TextDomain.COMMENTS
|
||||||
|
LyngTokenTypes.STRING -> TextDomain.LITERALS
|
||||||
|
LyngElementTypes.NAME_IDENTIFIER,
|
||||||
|
LyngElementTypes.PARAMETER_NAME,
|
||||||
|
LyngElementTypes.ENUM_CONSTANT_NAME -> TextDomain.COMMENTS
|
||||||
|
else -> return null
|
||||||
|
}
|
||||||
|
|
||||||
// Decide target domain by intersection with our MiniAst-driven index; prefer comments > strings > identifiers
|
if (!allowedDomains.contains(domain)) return null
|
||||||
var domain: TextDomain? = null
|
|
||||||
if (index != null && r != null) {
|
|
||||||
if (overlaps(index.comments)) domain = TextDomain.COMMENTS
|
|
||||||
else if (overlaps(index.strings) && settings.spellCheckStringLiterals) domain = TextDomain.LITERALS
|
|
||||||
else if (overlaps(index.identifiers)) domain = if (settings.grazieTreatIdentifiersAsComments) TextDomain.COMMENTS else TextDomain.DOCUMENTATION
|
|
||||||
} else {
|
|
||||||
// Fallback to token type if index is not ready (rare timing), mostly for comments
|
|
||||||
domain = when (type) {
|
|
||||||
LyngTokenTypes.LINE_COMMENT, LyngTokenTypes.BLOCK_COMMENT -> TextDomain.COMMENTS
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (domain == null) return null
|
|
||||||
|
|
||||||
// If literals aren't requested but fallback is enabled, route strings as COMMENTS
|
return TextContent.psiFragment(domain, element)
|
||||||
if (domain == TextDomain.LITERALS && !allowedDomains.contains(TextDomain.LITERALS) && settings.grazieTreatLiteralsAsComments) {
|
|
||||||
domain = TextDomain.COMMENTS
|
|
||||||
}
|
|
||||||
if (!allowedDomains.contains(domain)) {
|
|
||||||
if (seen.add("deny-${domain.name}")) {
|
|
||||||
log.info("LyngTextExtractor: domain ${domain.name} not in allowedDomains; skipping")
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
return try {
|
|
||||||
// Try common factory names across versions
|
|
||||||
val methods = TextContent::class.java.methods.filter { it.name == "psiFragment" }
|
|
||||||
val built: TextContent? = when {
|
|
||||||
// Try psiFragment(PsiElement, TextDomain)
|
|
||||||
methods.any { it.parameterCount == 2 && it.parameterTypes[0].name.contains("PsiElement") } -> {
|
|
||||||
val m = methods.first { it.parameterCount == 2 && it.parameterTypes[0].name.contains("PsiElement") }
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
(m.invoke(null, element, domain) as? TextContent)?.also {
|
|
||||||
if (seen.add("ok-${domain.name}")) log.info("LyngTextExtractor: provided ${domain.name} for ${type} via psiFragment(element, domain)")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Try psiFragment(TextDomain, PsiElement)
|
|
||||||
methods.any { it.parameterCount == 2 && it.parameterTypes[0].name.endsWith("TextDomain") } -> {
|
|
||||||
val m = methods.first { it.parameterCount == 2 && it.parameterTypes[0].name.endsWith("TextDomain") }
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
(m.invoke(null, domain, element) as? TextContent)?.also {
|
|
||||||
if (seen.add("ok-${domain.name}")) log.info("LyngTextExtractor: provided ${domain.name} for ${type} via psiFragment(domain, element)")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
built
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngTextExtractor: failed to build TextContent: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,86 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
|
|
||||||
import com.intellij.codeInsight.intention.IntentionAction
|
|
||||||
import com.intellij.openapi.command.WriteCommandAction
|
|
||||||
import com.intellij.openapi.editor.CaretModel
|
|
||||||
import com.intellij.openapi.editor.Document
|
|
||||||
import com.intellij.openapi.editor.Editor
|
|
||||||
import com.intellij.openapi.project.Project
|
|
||||||
import com.intellij.openapi.util.TextRange
|
|
||||||
import com.intellij.psi.PsiFile
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lightweight quick-fix to replace a misspelled word (subrange) with a suggested alternative.
|
|
||||||
* Works without the legacy Spell Checker. The replacement is applied directly to the file text.
|
|
||||||
*/
|
|
||||||
class ReplaceWordFix(
|
|
||||||
private val range: TextRange,
|
|
||||||
private val original: String,
|
|
||||||
private val replacementRaw: String
|
|
||||||
) : IntentionAction {
|
|
||||||
|
|
||||||
override fun getText(): String = "Replace '$original' with '$replacementRaw'"
|
|
||||||
override fun getFamilyName(): String = "Lyng Spelling"
|
|
||||||
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?): Boolean =
|
|
||||||
editor != null && file != null && range.startOffset in 0..range.endOffset
|
|
||||||
|
|
||||||
override fun startInWriteAction(): Boolean = true
|
|
||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor?, file: PsiFile?) {
|
|
||||||
if (editor == null) return
|
|
||||||
val doc: Document = editor.document
|
|
||||||
val safeRange = range.constrainTo(doc)
|
|
||||||
val current = doc.getText(safeRange)
|
|
||||||
// Preserve basic case style based on the original token
|
|
||||||
val replacement = adaptCaseStyle(current, replacementRaw)
|
|
||||||
WriteCommandAction.runWriteCommandAction(project, "Replace word", null, Runnable {
|
|
||||||
doc.replaceString(safeRange.startOffset, safeRange.endOffset, replacement)
|
|
||||||
}, file)
|
|
||||||
// Move caret to end of replacement for convenience
|
|
||||||
try {
|
|
||||||
val caret: CaretModel = editor.caretModel
|
|
||||||
caret.moveToOffset(safeRange.startOffset + replacement.length)
|
|
||||||
} catch (_: Throwable) {}
|
|
||||||
// Restart daemon to refresh highlights
|
|
||||||
if (file != null) DaemonCodeAnalyzer.getInstance(project).restart(file)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun TextRange.constrainTo(doc: Document): TextRange {
|
|
||||||
val start = startOffset.coerceIn(0, doc.textLength)
|
|
||||||
val end = endOffset.coerceIn(start, doc.textLength)
|
|
||||||
return TextRange(start, end)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun adaptCaseStyle(sample: String, suggestion: String): String {
|
|
||||||
if (suggestion.isEmpty()) return suggestion
|
|
||||||
return when {
|
|
||||||
sample.all { it.isUpperCase() } -> suggestion.uppercase()
|
|
||||||
// PascalCase / Capitalized single word
|
|
||||||
sample.firstOrNull()?.isUpperCase() == true && sample.drop(1).any { it.isLowerCase() } ->
|
|
||||||
suggestion.replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
|
|
||||||
// snake_case -> lower
|
|
||||||
sample.contains('_') -> suggestion.lowercase()
|
|
||||||
// camelCase -> lower first
|
|
||||||
sample.firstOrNull()?.isLowerCase() == true && sample.any { it.isUpperCase() } ->
|
|
||||||
suggestion.replaceFirstChar { it.lowercase() }
|
|
||||||
else -> suggestion
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import java.io.BufferedReader
|
|
||||||
import java.io.InputStreamReader
|
|
||||||
import java.util.zip.GZIPInputStream
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lightweight technical/Lyng vocabulary dictionary.
|
|
||||||
* Loaded from classpath resources; supports .txt and .txt.gz. Merged with EnglishDictionary.
|
|
||||||
*/
|
|
||||||
object TechDictionary {
|
|
||||||
private val log = Logger.getInstance(TechDictionary::class.java)
|
|
||||||
@Volatile private var loaded = false
|
|
||||||
@Volatile private var words: Set<String> = emptySet()
|
|
||||||
|
|
||||||
private fun ensureLoaded() {
|
|
||||||
if (loaded) return
|
|
||||||
synchronized(this) {
|
|
||||||
if (loaded) return
|
|
||||||
val candidates = listOf(
|
|
||||||
"/dictionaries/tech-lyng.txt.gz",
|
|
||||||
"/dictionaries/tech-lyng.txt"
|
|
||||||
)
|
|
||||||
val merged = HashSet<String>(8_000)
|
|
||||||
for (res in candidates) {
|
|
||||||
try {
|
|
||||||
val stream = javaClass.getResourceAsStream(res) ?: continue
|
|
||||||
val reader = if (res.endsWith(".gz"))
|
|
||||||
BufferedReader(InputStreamReader(GZIPInputStream(stream)))
|
|
||||||
else
|
|
||||||
BufferedReader(InputStreamReader(stream))
|
|
||||||
var n = 0
|
|
||||||
reader.useLines { seq -> seq.forEach { line ->
|
|
||||||
val w = line.trim()
|
|
||||||
if (w.isNotEmpty() && !w.startsWith("#")) { merged += w.lowercase(); n++ }
|
|
||||||
} }
|
|
||||||
log.info("TechDictionary: loaded $n words from $res (total=${merged.size})")
|
|
||||||
} catch (t: Throwable) {
|
|
||||||
log.info("TechDictionary: failed to load $res: ${t.javaClass.simpleName}: ${t.message}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (merged.isEmpty()) {
|
|
||||||
merged += setOf(
|
|
||||||
// minimal Lyng/tech seeding to avoid empty dictionary
|
|
||||||
"lyng","miniast","binder","printf","specifier","specifiers","regex","token","tokens",
|
|
||||||
"identifier","identifiers","keyword","keywords","comment","comments","string","strings",
|
|
||||||
"literal","literals","formatting","formatter","grazie","typo","typos","dictionary","dictionaries"
|
|
||||||
)
|
|
||||||
log.info("TechDictionary: using minimal built-in set (${merged.size})")
|
|
||||||
}
|
|
||||||
words = merged
|
|
||||||
loaded = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun allWords(): Set<String> {
|
|
||||||
ensureLoaded()
|
|
||||||
return words
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -101,8 +101,9 @@ class LyngLexer : LexerBase() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// String "..." with simple escape handling
|
// String "..." or '...' with simple escape handling
|
||||||
if (ch == '"') {
|
if (ch == '"' || ch == '\'') {
|
||||||
|
val quote = ch
|
||||||
i++
|
i++
|
||||||
while (i < endOffset) {
|
while (i < endOffset) {
|
||||||
val c = buffer[i]
|
val c = buffer[i]
|
||||||
@@ -110,7 +111,7 @@ class LyngLexer : LexerBase() {
|
|||||||
i += 2
|
i += 2
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if (c == '"') { i++; break }
|
if (c == quote) { i++; break }
|
||||||
i++
|
i++
|
||||||
}
|
}
|
||||||
myTokenEnd = i
|
myTokenEnd = i
|
||||||
|
|||||||
+2
-1
@@ -20,13 +20,14 @@ package net.sergeych.lyng.idea.navigation
|
|||||||
import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler
|
import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
|
import net.sergeych.lyng.idea.LyngLanguage
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ensures Ctrl+B (Go to Definition) works on Lyng identifiers by resolving through LyngPsiReference.
|
* Ensures Ctrl+B (Go to Definition) works on Lyng identifiers by resolving through LyngPsiReference.
|
||||||
*/
|
*/
|
||||||
class LyngGotoDeclarationHandler : GotoDeclarationHandler {
|
class LyngGotoDeclarationHandler : GotoDeclarationHandler {
|
||||||
override fun getGotoDeclarationTargets(sourceElement: PsiElement?, offset: Int, editor: Editor?): Array<PsiElement>? {
|
override fun getGotoDeclarationTargets(sourceElement: PsiElement?, offset: Int, editor: Editor?): Array<PsiElement>? {
|
||||||
if (sourceElement == null) return null
|
if (sourceElement == null || sourceElement.language != LyngLanguage) return null
|
||||||
|
|
||||||
val allTargets = mutableListOf<PsiElement>()
|
val allTargets = mutableListOf<PsiElement>()
|
||||||
|
|
||||||
|
|||||||
@@ -38,16 +38,18 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
|
|
||||||
val mini = LyngAstManager.getMiniAst(file) ?: return emptyArray()
|
val mini = LyngAstManager.getMiniAst(file) ?: return emptyArray()
|
||||||
val binding = LyngAstManager.getBinding(file)
|
val binding = LyngAstManager.getBinding(file)
|
||||||
|
val imported = DocLookupUtils.canonicalImportedModules(mini, text).toSet()
|
||||||
|
val currentPackage = getPackageName(file)
|
||||||
|
val allowedPackages = if (currentPackage != null) imported + currentPackage else imported
|
||||||
|
|
||||||
// 1. Member resolution (obj.member)
|
// 1. Member resolution (obj.member)
|
||||||
val dotPos = TextCtx.findDotLeft(text, offset)
|
val dotPos = TextCtx.findDotLeft(text, offset)
|
||||||
if (dotPos != null) {
|
if (dotPos != null) {
|
||||||
val imported = DocLookupUtils.canonicalImportedModules(mini, text)
|
val receiverClass = DocLookupUtils.guessReceiverClassViaMini(mini, text, dotPos, imported.toList(), binding)
|
||||||
val receiverClass = DocLookupUtils.guessReceiverClassViaMini(mini, text, dotPos, imported, binding)
|
?: DocLookupUtils.guessReceiverClass(text, dotPos, imported.toList(), mini)
|
||||||
?: DocLookupUtils.guessReceiverClass(text, dotPos, imported, mini)
|
|
||||||
|
|
||||||
if (receiverClass != null) {
|
if (receiverClass != null) {
|
||||||
val resolved = DocLookupUtils.resolveMemberWithInheritance(imported, receiverClass, name, mini)
|
val resolved = DocLookupUtils.resolveMemberWithInheritance(imported.toList(), receiverClass, name, mini)
|
||||||
if (resolved != null) {
|
if (resolved != null) {
|
||||||
val owner = resolved.first
|
val owner = resolved.first
|
||||||
val member = resolved.second
|
val member = resolved.second
|
||||||
@@ -63,6 +65,10 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
is MiniMemberFunDecl -> "Function"
|
is MiniMemberFunDecl -> "Function"
|
||||||
is MiniMemberValDecl -> if (member.mutable) "Variable" else "Value"
|
is MiniMemberValDecl -> if (member.mutable) "Variable" else "Value"
|
||||||
is MiniInitDecl -> "Initializer"
|
is MiniInitDecl -> "Initializer"
|
||||||
|
is MiniFunDecl -> "Function"
|
||||||
|
is MiniValDecl -> if (member.mutable) "Variable" else "Value"
|
||||||
|
is MiniClassDecl -> "Class"
|
||||||
|
is MiniEnumDecl -> "Enum"
|
||||||
}
|
}
|
||||||
results.add(PsiElementResolveResult(LyngDeclarationElement(it, member.name, kind)))
|
results.add(PsiElementResolveResult(LyngDeclarationElement(it, member.name, kind)))
|
||||||
}
|
}
|
||||||
@@ -71,7 +77,7 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
}
|
}
|
||||||
// If we couldn't resolve exactly, we might still want to search globally but ONLY for members
|
// If we couldn't resolve exactly, we might still want to search globally but ONLY for members
|
||||||
if (results.isEmpty()) {
|
if (results.isEmpty()) {
|
||||||
results.addAll(resolveGlobally(file.project, name, membersOnly = true))
|
results.addAll(resolveGlobally(file.project, name, membersOnly = true, allowedPackages = allowedPackages))
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// 2. Local resolution via Binder
|
// 2. Local resolution via Binder
|
||||||
@@ -90,7 +96,7 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
// 3. Global project scan
|
// 3. Global project scan
|
||||||
// Only search globally if we haven't found a strong local match
|
// Only search globally if we haven't found a strong local match
|
||||||
if (results.isEmpty()) {
|
if (results.isEmpty()) {
|
||||||
results.addAll(resolveGlobally(file.project, name))
|
results.addAll(resolveGlobally(file.project, name, allowedPackages = allowedPackages))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,6 +143,16 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun getPackageName(file: PsiFile): String? {
|
||||||
|
val mini = LyngAstManager.getMiniAst(file) ?: return null
|
||||||
|
return try {
|
||||||
|
val pkg = mini.range.start.source.extractPackageName()
|
||||||
|
if (pkg.startsWith("lyng.")) pkg else "lyng.$pkg"
|
||||||
|
} catch (e: Exception) {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override fun resolve(): PsiElement? {
|
override fun resolve(): PsiElement? {
|
||||||
val results = multiResolve(false)
|
val results = multiResolve(false)
|
||||||
if (results.isEmpty()) return null
|
if (results.isEmpty()) return null
|
||||||
@@ -150,13 +166,20 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
return target
|
return target
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun resolveGlobally(project: Project, name: String, membersOnly: Boolean = false): List<ResolveResult> {
|
private fun resolveGlobally(project: Project, name: String, membersOnly: Boolean = false, allowedPackages: Set<String>? = null): List<ResolveResult> {
|
||||||
val results = mutableListOf<ResolveResult>()
|
val results = mutableListOf<ResolveResult>()
|
||||||
val files = FilenameIndex.getAllFilesByExt(project, "lyng", GlobalSearchScope.projectScope(project))
|
val files = FilenameIndex.getAllFilesByExt(project, "lyng", GlobalSearchScope.projectScope(project))
|
||||||
val psiManager = PsiManager.getInstance(project)
|
val psiManager = PsiManager.getInstance(project)
|
||||||
|
|
||||||
for (vFile in files) {
|
for (vFile in files) {
|
||||||
val file = psiManager.findFile(vFile) ?: continue
|
val file = psiManager.findFile(vFile) ?: continue
|
||||||
|
|
||||||
|
// Filter by package if requested
|
||||||
|
if (allowedPackages != null) {
|
||||||
|
val pkg = getPackageName(file)
|
||||||
|
if (pkg == null || pkg !in allowedPackages) continue
|
||||||
|
}
|
||||||
|
|
||||||
val mini = LyngAstManager.getMiniAst(file) ?: continue
|
val mini = LyngAstManager.getMiniAst(file) ?: continue
|
||||||
val src = mini.range.start.source
|
val src = mini.range.start.source
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng.idea.psi
|
||||||
|
|
||||||
|
import com.intellij.psi.tree.IElementType
|
||||||
|
import net.sergeych.lyng.idea.LyngLanguage
|
||||||
|
|
||||||
|
object LyngElementTypes {
|
||||||
|
val NAME_IDENTIFIER = IElementType("NAME_IDENTIFIER", LyngLanguage)
|
||||||
|
val PARAMETER_NAME = IElementType("PARAMETER_NAME", LyngLanguage)
|
||||||
|
val ENUM_CONSTANT_NAME = IElementType("ENUM_CONSTANT_NAME", LyngLanguage)
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -45,7 +45,68 @@ class LyngParserDefinition : ParserDefinition {
|
|||||||
|
|
||||||
override fun createParser(project: Project?): PsiParser = PsiParser { root, builder ->
|
override fun createParser(project: Project?): PsiParser = PsiParser { root, builder ->
|
||||||
val mark: PsiBuilder.Marker = builder.mark()
|
val mark: PsiBuilder.Marker = builder.mark()
|
||||||
while (!builder.eof()) builder.advanceLexer()
|
var lastKeyword: String? = null
|
||||||
|
var inEnum = false
|
||||||
|
var inParams = false
|
||||||
|
var parenDepth = 0
|
||||||
|
var braceDepth = 0
|
||||||
|
|
||||||
|
while (!builder.eof()) {
|
||||||
|
val type = builder.tokenType
|
||||||
|
val text = builder.tokenText
|
||||||
|
|
||||||
|
when (type) {
|
||||||
|
LyngTokenTypes.KEYWORD -> {
|
||||||
|
lastKeyword = text
|
||||||
|
if (text == "enum") inEnum = true
|
||||||
|
}
|
||||||
|
LyngTokenTypes.PUNCT -> {
|
||||||
|
if (text == "(") {
|
||||||
|
parenDepth++
|
||||||
|
if (lastKeyword == "fun" || lastKeyword == "constructor" || lastKeyword == "init") inParams = true
|
||||||
|
} else if (text == ")") {
|
||||||
|
parenDepth--
|
||||||
|
if (parenDepth == 0) inParams = false
|
||||||
|
} else if (text == "{") {
|
||||||
|
braceDepth++
|
||||||
|
} else if (text == "}") {
|
||||||
|
braceDepth--
|
||||||
|
if (braceDepth == 0) inEnum = false
|
||||||
|
}
|
||||||
|
if (text != ".") lastKeyword = null
|
||||||
|
}
|
||||||
|
LyngTokenTypes.IDENTIFIER -> {
|
||||||
|
val m = builder.mark()
|
||||||
|
builder.advanceLexer()
|
||||||
|
val nextType = builder.tokenType
|
||||||
|
val isQualified = nextType == LyngTokenTypes.PUNCT && builder.tokenText == "."
|
||||||
|
|
||||||
|
if (!isQualified) {
|
||||||
|
when {
|
||||||
|
lastKeyword in setOf("fun", "val", "var", "class", "enum", "object", "interface", "type", "property") -> {
|
||||||
|
m.done(LyngElementTypes.NAME_IDENTIFIER)
|
||||||
|
}
|
||||||
|
inParams && parenDepth > 0 -> {
|
||||||
|
m.done(LyngElementTypes.PARAMETER_NAME)
|
||||||
|
}
|
||||||
|
inEnum && braceDepth > 0 && parenDepth == 0 -> {
|
||||||
|
m.done(LyngElementTypes.ENUM_CONSTANT_NAME)
|
||||||
|
}
|
||||||
|
else -> m.drop()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
m.drop()
|
||||||
|
}
|
||||||
|
lastKeyword = null
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
LyngTokenTypes.WHITESPACE, LyngTokenTypes.LINE_COMMENT, LyngTokenTypes.BLOCK_COMMENT -> {
|
||||||
|
// keep lastKeyword
|
||||||
|
}
|
||||||
|
else -> lastKeyword = null
|
||||||
|
}
|
||||||
|
builder.advanceLexer()
|
||||||
|
}
|
||||||
mark.done(root)
|
mark.done(root)
|
||||||
builder.treeBuilt
|
builder.treeBuilt
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -32,24 +32,6 @@ class LyngFormatterSettings(private val project: Project) : PersistentStateCompo
|
|||||||
var reindentClosedBlockOnEnter: Boolean = true,
|
var reindentClosedBlockOnEnter: Boolean = true,
|
||||||
var reindentPastedBlocks: Boolean = true,
|
var reindentPastedBlocks: Boolean = true,
|
||||||
var normalizeBlockCommentIndent: Boolean = false,
|
var normalizeBlockCommentIndent: Boolean = false,
|
||||||
var spellCheckStringLiterals: Boolean = true,
|
|
||||||
// When Grazie/Natural Languages is present, prefer it for comments and literals (avoid legacy duplicates)
|
|
||||||
var preferGrazieForCommentsAndLiterals: Boolean = true,
|
|
||||||
// When Grazie is available, also check identifiers via Grazie.
|
|
||||||
// Default OFF because Grazie typically doesn't flag code identifiers; legacy Spellchecker is better for code.
|
|
||||||
var grazieChecksIdentifiers: Boolean = false,
|
|
||||||
// Grazie-only fallback: treat identifiers as comments domain so Grazie applies spelling rules
|
|
||||||
var grazieTreatIdentifiersAsComments: Boolean = true,
|
|
||||||
// Grazie-only fallback: treat string literals as comments domain when LITERALS domain is not requested
|
|
||||||
var grazieTreatLiteralsAsComments: Boolean = true,
|
|
||||||
// Debug helper: show the exact ranges we feed to Grazie/legacy as weak warnings
|
|
||||||
var debugShowSpellFeed: Boolean = false,
|
|
||||||
// Visuals: render Lyng typos using the standard Typo green underline styling
|
|
||||||
var showTyposWithGreenUnderline: Boolean = true,
|
|
||||||
// Enable lightweight quick-fixes (Replace..., Add to dictionary) without legacy Spell Checker
|
|
||||||
var offerLyngTypoQuickFixes: Boolean = true,
|
|
||||||
// Per-project learned words (do not flag again)
|
|
||||||
var learnedWords: MutableSet<String> = mutableSetOf(),
|
|
||||||
// Experimental: enable Lyng autocompletion (can be disabled if needed)
|
// Experimental: enable Lyng autocompletion (can be disabled if needed)
|
||||||
var enableLyngCompletionExperimental: Boolean = true,
|
var enableLyngCompletionExperimental: Boolean = true,
|
||||||
)
|
)
|
||||||
@@ -82,42 +64,6 @@ class LyngFormatterSettings(private val project: Project) : PersistentStateCompo
|
|||||||
get() = myState.normalizeBlockCommentIndent
|
get() = myState.normalizeBlockCommentIndent
|
||||||
set(value) { myState.normalizeBlockCommentIndent = value }
|
set(value) { myState.normalizeBlockCommentIndent = value }
|
||||||
|
|
||||||
var spellCheckStringLiterals: Boolean
|
|
||||||
get() = myState.spellCheckStringLiterals
|
|
||||||
set(value) { myState.spellCheckStringLiterals = value }
|
|
||||||
|
|
||||||
var preferGrazieForCommentsAndLiterals: Boolean
|
|
||||||
get() = myState.preferGrazieForCommentsAndLiterals
|
|
||||||
set(value) { myState.preferGrazieForCommentsAndLiterals = value }
|
|
||||||
|
|
||||||
var grazieChecksIdentifiers: Boolean
|
|
||||||
get() = myState.grazieChecksIdentifiers
|
|
||||||
set(value) { myState.grazieChecksIdentifiers = value }
|
|
||||||
|
|
||||||
var grazieTreatIdentifiersAsComments: Boolean
|
|
||||||
get() = myState.grazieTreatIdentifiersAsComments
|
|
||||||
set(value) { myState.grazieTreatIdentifiersAsComments = value }
|
|
||||||
|
|
||||||
var grazieTreatLiteralsAsComments: Boolean
|
|
||||||
get() = myState.grazieTreatLiteralsAsComments
|
|
||||||
set(value) { myState.grazieTreatLiteralsAsComments = value }
|
|
||||||
|
|
||||||
var debugShowSpellFeed: Boolean
|
|
||||||
get() = myState.debugShowSpellFeed
|
|
||||||
set(value) { myState.debugShowSpellFeed = value }
|
|
||||||
|
|
||||||
var showTyposWithGreenUnderline: Boolean
|
|
||||||
get() = myState.showTyposWithGreenUnderline
|
|
||||||
set(value) { myState.showTyposWithGreenUnderline = value }
|
|
||||||
|
|
||||||
var offerLyngTypoQuickFixes: Boolean
|
|
||||||
get() = myState.offerLyngTypoQuickFixes
|
|
||||||
set(value) { myState.offerLyngTypoQuickFixes = value }
|
|
||||||
|
|
||||||
var learnedWords: MutableSet<String>
|
|
||||||
get() = myState.learnedWords
|
|
||||||
set(value) { myState.learnedWords = value }
|
|
||||||
|
|
||||||
var enableLyngCompletionExperimental: Boolean
|
var enableLyngCompletionExperimental: Boolean
|
||||||
get() = myState.enableLyngCompletionExperimental
|
get() = myState.enableLyngCompletionExperimental
|
||||||
set(value) { myState.enableLyngCompletionExperimental = value }
|
set(value) { myState.enableLyngCompletionExperimental = value }
|
||||||
|
|||||||
+1
-56
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -30,14 +30,6 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
private var reindentClosedBlockCb: JCheckBox? = null
|
private var reindentClosedBlockCb: JCheckBox? = null
|
||||||
private var reindentPasteCb: JCheckBox? = null
|
private var reindentPasteCb: JCheckBox? = null
|
||||||
private var normalizeBlockCommentIndentCb: JCheckBox? = null
|
private var normalizeBlockCommentIndentCb: JCheckBox? = null
|
||||||
private var spellCheckLiteralsCb: JCheckBox? = null
|
|
||||||
private var preferGrazieCommentsLiteralsCb: JCheckBox? = null
|
|
||||||
private var grazieChecksIdentifiersCb: JCheckBox? = null
|
|
||||||
private var grazieIdsAsCommentsCb: JCheckBox? = null
|
|
||||||
private var grazieLiteralsAsCommentsCb: JCheckBox? = null
|
|
||||||
private var debugShowSpellFeedCb: JCheckBox? = null
|
|
||||||
private var showTyposGreenCb: JCheckBox? = null
|
|
||||||
private var offerQuickFixesCb: JCheckBox? = null
|
|
||||||
private var enableCompletionCb: JCheckBox? = null
|
private var enableCompletionCb: JCheckBox? = null
|
||||||
|
|
||||||
override fun getDisplayName(): String = "Lyng Formatter"
|
override fun getDisplayName(): String = "Lyng Formatter"
|
||||||
@@ -50,14 +42,6 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
reindentClosedBlockCb = JCheckBox("Reindent enclosed block on Enter after '}'")
|
reindentClosedBlockCb = JCheckBox("Reindent enclosed block on Enter after '}'")
|
||||||
reindentPasteCb = JCheckBox("Reindent pasted blocks (align pasted code to current indent)")
|
reindentPasteCb = JCheckBox("Reindent pasted blocks (align pasted code to current indent)")
|
||||||
normalizeBlockCommentIndentCb = JCheckBox("Normalize block comment indentation [experimental]")
|
normalizeBlockCommentIndentCb = JCheckBox("Normalize block comment indentation [experimental]")
|
||||||
spellCheckLiteralsCb = JCheckBox("Spell check string literals (skip % specifiers like %s, %d, %-12s)")
|
|
||||||
preferGrazieCommentsLiteralsCb = JCheckBox("Prefer Natural Languages/Grazie for comments and string literals (avoid duplicates)")
|
|
||||||
grazieChecksIdentifiersCb = JCheckBox("Check identifiers via Natural Languages/Grazie when available")
|
|
||||||
grazieIdsAsCommentsCb = JCheckBox("Natural Languages/Grazie: treat identifiers as comments (forces spelling checks in 2024.3)")
|
|
||||||
grazieLiteralsAsCommentsCb = JCheckBox("Natural Languages/Grazie: treat string literals as comments when literals are not processed")
|
|
||||||
debugShowSpellFeedCb = JCheckBox("Debug: show spell-feed ranges (weak warnings)")
|
|
||||||
showTyposGreenCb = JCheckBox("Show Lyng typos with green underline (TYPO styling)")
|
|
||||||
offerQuickFixesCb = JCheckBox("Offer Lyng typo quick fixes (Replace…, Add to dictionary) without Spell Checker")
|
|
||||||
enableCompletionCb = JCheckBox("Enable Lyng autocompletion (experimental)")
|
enableCompletionCb = JCheckBox("Enable Lyng autocompletion (experimental)")
|
||||||
|
|
||||||
// Tooltips / short help
|
// Tooltips / short help
|
||||||
@@ -66,27 +50,12 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
reindentClosedBlockCb?.toolTipText = "On Enter after a closing '}', reindent the just-closed {…} block using formatter rules."
|
reindentClosedBlockCb?.toolTipText = "On Enter after a closing '}', reindent the just-closed {…} block using formatter rules."
|
||||||
reindentPasteCb?.toolTipText = "When caret is in leading whitespace, reindent the pasted text and align it to the caret's indent."
|
reindentPasteCb?.toolTipText = "When caret is in leading whitespace, reindent the pasted text and align it to the caret's indent."
|
||||||
normalizeBlockCommentIndentCb?.toolTipText = "Experimental: normalize indentation inside /* … */ comments (code is not modified)."
|
normalizeBlockCommentIndentCb?.toolTipText = "Experimental: normalize indentation inside /* … */ comments (code is not modified)."
|
||||||
preferGrazieCommentsLiteralsCb?.toolTipText = "When ON and Natural Languages/Grazie is installed, comments and string literals are checked by Grazie. Turn OFF to force legacy Spellchecker to check them."
|
|
||||||
grazieChecksIdentifiersCb?.toolTipText = "When ON and Natural Languages/Grazie is installed, identifiers (non-keywords) are checked by Grazie too."
|
|
||||||
grazieIdsAsCommentsCb?.toolTipText = "Grazie-only fallback: route identifiers as COMMENTS domain so Grazie applies spelling in 2024.3."
|
|
||||||
grazieLiteralsAsCommentsCb?.toolTipText = "Grazie-only fallback: when Grammar doesn't process literals, route strings as COMMENTS so they are checked."
|
|
||||||
debugShowSpellFeedCb?.toolTipText = "Show the exact ranges we feed to spellcheckers (ids/comments/strings) as weak warnings."
|
|
||||||
showTyposGreenCb?.toolTipText = "Render Lyng typos using the platform's green TYPO underline instead of generic warnings."
|
|
||||||
offerQuickFixesCb?.toolTipText = "Provide lightweight Replace… and Add to dictionary quick-fixes without requiring the legacy Spell Checker."
|
|
||||||
enableCompletionCb?.toolTipText = "Turn on/off the lightweight Lyng code completion (BASIC)."
|
enableCompletionCb?.toolTipText = "Turn on/off the lightweight Lyng code completion (BASIC)."
|
||||||
p.add(spacingCb)
|
p.add(spacingCb)
|
||||||
p.add(wrappingCb)
|
p.add(wrappingCb)
|
||||||
p.add(reindentClosedBlockCb)
|
p.add(reindentClosedBlockCb)
|
||||||
p.add(reindentPasteCb)
|
p.add(reindentPasteCb)
|
||||||
p.add(normalizeBlockCommentIndentCb)
|
p.add(normalizeBlockCommentIndentCb)
|
||||||
p.add(spellCheckLiteralsCb)
|
|
||||||
p.add(preferGrazieCommentsLiteralsCb)
|
|
||||||
p.add(grazieChecksIdentifiersCb)
|
|
||||||
p.add(grazieIdsAsCommentsCb)
|
|
||||||
p.add(grazieLiteralsAsCommentsCb)
|
|
||||||
p.add(debugShowSpellFeedCb)
|
|
||||||
p.add(showTyposGreenCb)
|
|
||||||
p.add(offerQuickFixesCb)
|
|
||||||
p.add(enableCompletionCb)
|
p.add(enableCompletionCb)
|
||||||
panel = p
|
panel = p
|
||||||
reset()
|
reset()
|
||||||
@@ -100,14 +69,6 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
reindentClosedBlockCb?.isSelected != s.reindentClosedBlockOnEnter ||
|
reindentClosedBlockCb?.isSelected != s.reindentClosedBlockOnEnter ||
|
||||||
reindentPasteCb?.isSelected != s.reindentPastedBlocks ||
|
reindentPasteCb?.isSelected != s.reindentPastedBlocks ||
|
||||||
normalizeBlockCommentIndentCb?.isSelected != s.normalizeBlockCommentIndent ||
|
normalizeBlockCommentIndentCb?.isSelected != s.normalizeBlockCommentIndent ||
|
||||||
spellCheckLiteralsCb?.isSelected != s.spellCheckStringLiterals ||
|
|
||||||
preferGrazieCommentsLiteralsCb?.isSelected != s.preferGrazieForCommentsAndLiterals ||
|
|
||||||
grazieChecksIdentifiersCb?.isSelected != s.grazieChecksIdentifiers ||
|
|
||||||
grazieIdsAsCommentsCb?.isSelected != s.grazieTreatIdentifiersAsComments ||
|
|
||||||
grazieLiteralsAsCommentsCb?.isSelected != s.grazieTreatLiteralsAsComments ||
|
|
||||||
debugShowSpellFeedCb?.isSelected != s.debugShowSpellFeed ||
|
|
||||||
showTyposGreenCb?.isSelected != s.showTyposWithGreenUnderline ||
|
|
||||||
offerQuickFixesCb?.isSelected != s.offerLyngTypoQuickFixes ||
|
|
||||||
enableCompletionCb?.isSelected != s.enableLyngCompletionExperimental
|
enableCompletionCb?.isSelected != s.enableLyngCompletionExperimental
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,14 +79,6 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
s.reindentClosedBlockOnEnter = reindentClosedBlockCb?.isSelected == true
|
s.reindentClosedBlockOnEnter = reindentClosedBlockCb?.isSelected == true
|
||||||
s.reindentPastedBlocks = reindentPasteCb?.isSelected == true
|
s.reindentPastedBlocks = reindentPasteCb?.isSelected == true
|
||||||
s.normalizeBlockCommentIndent = normalizeBlockCommentIndentCb?.isSelected == true
|
s.normalizeBlockCommentIndent = normalizeBlockCommentIndentCb?.isSelected == true
|
||||||
s.spellCheckStringLiterals = spellCheckLiteralsCb?.isSelected == true
|
|
||||||
s.preferGrazieForCommentsAndLiterals = preferGrazieCommentsLiteralsCb?.isSelected == true
|
|
||||||
s.grazieChecksIdentifiers = grazieChecksIdentifiersCb?.isSelected == true
|
|
||||||
s.grazieTreatIdentifiersAsComments = grazieIdsAsCommentsCb?.isSelected == true
|
|
||||||
s.grazieTreatLiteralsAsComments = grazieLiteralsAsCommentsCb?.isSelected == true
|
|
||||||
s.debugShowSpellFeed = debugShowSpellFeedCb?.isSelected == true
|
|
||||||
s.showTyposWithGreenUnderline = showTyposGreenCb?.isSelected == true
|
|
||||||
s.offerLyngTypoQuickFixes = offerQuickFixesCb?.isSelected == true
|
|
||||||
s.enableLyngCompletionExperimental = enableCompletionCb?.isSelected == true
|
s.enableLyngCompletionExperimental = enableCompletionCb?.isSelected == true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -136,14 +89,6 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
reindentClosedBlockCb?.isSelected = s.reindentClosedBlockOnEnter
|
reindentClosedBlockCb?.isSelected = s.reindentClosedBlockOnEnter
|
||||||
reindentPasteCb?.isSelected = s.reindentPastedBlocks
|
reindentPasteCb?.isSelected = s.reindentPastedBlocks
|
||||||
normalizeBlockCommentIndentCb?.isSelected = s.normalizeBlockCommentIndent
|
normalizeBlockCommentIndentCb?.isSelected = s.normalizeBlockCommentIndent
|
||||||
spellCheckLiteralsCb?.isSelected = s.spellCheckStringLiterals
|
|
||||||
preferGrazieCommentsLiteralsCb?.isSelected = s.preferGrazieForCommentsAndLiterals
|
|
||||||
grazieChecksIdentifiersCb?.isSelected = s.grazieChecksIdentifiers
|
|
||||||
grazieIdsAsCommentsCb?.isSelected = s.grazieTreatIdentifiersAsComments
|
|
||||||
grazieLiteralsAsCommentsCb?.isSelected = s.grazieTreatLiteralsAsComments
|
|
||||||
debugShowSpellFeedCb?.isSelected = s.debugShowSpellFeed
|
|
||||||
showTyposGreenCb?.isSelected = s.showTyposWithGreenUnderline
|
|
||||||
offerQuickFixesCb?.isSelected = s.offerLyngTypoQuickFixes
|
|
||||||
enableCompletionCb?.isSelected = s.enableLyngCompletionExperimental
|
enableCompletionCb?.isSelected = s.enableLyngCompletionExperimental
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.spell
|
|
||||||
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import com.intellij.openapi.util.Key
|
|
||||||
import com.intellij.openapi.util.TextRange
|
|
||||||
import com.intellij.psi.PsiFile
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Per-file cached spellcheck index built from MiniAst-based highlighting and the lynglib highlighter.
|
|
||||||
* It exposes identifier, comment, and string literal ranges. Strategies should suspend until data is ready.
|
|
||||||
*/
|
|
||||||
object LyngSpellIndex {
|
|
||||||
private val LOG = Logger.getInstance(LyngSpellIndex::class.java)
|
|
||||||
|
|
||||||
data class Data(
|
|
||||||
val modStamp: Long,
|
|
||||||
val identifiers: List<TextRange>,
|
|
||||||
val comments: List<TextRange>,
|
|
||||||
val strings: List<TextRange>,
|
|
||||||
)
|
|
||||||
|
|
||||||
private val KEY: Key<Data> = Key.create("LYNG_SPELL_INDEX")
|
|
||||||
|
|
||||||
fun getUpToDate(file: PsiFile): Data? {
|
|
||||||
val doc = file.viewProvider.document ?: return null
|
|
||||||
val d = file.getUserData(KEY) ?: return null
|
|
||||||
return if (d.modStamp == doc.modificationStamp) d else null
|
|
||||||
}
|
|
||||||
|
|
||||||
fun store(file: PsiFile, data: Data) {
|
|
||||||
file.putUserData(KEY, data)
|
|
||||||
LOG.info("LyngSpellIndex built: ids=${data.identifiers.size}, comments=${data.comments.size}, strings=${data.strings.size}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+14
-128
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -16,140 +16,26 @@
|
|||||||
*/
|
*/
|
||||||
package net.sergeych.lyng.idea.spell
|
package net.sergeych.lyng.idea.spell
|
||||||
|
|
||||||
// Avoid Tokenizers helper to keep compatibility; implement our own tokenizers
|
|
||||||
import com.intellij.ide.plugins.PluginManagerCore
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import com.intellij.openapi.extensions.PluginId
|
|
||||||
import com.intellij.openapi.util.TextRange
|
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import com.intellij.spellchecker.inspections.PlainTextSplitter
|
|
||||||
import com.intellij.spellchecker.tokenizer.SpellcheckingStrategy
|
import com.intellij.spellchecker.tokenizer.SpellcheckingStrategy
|
||||||
import com.intellij.spellchecker.tokenizer.TokenConsumer
|
|
||||||
import com.intellij.spellchecker.tokenizer.Tokenizer
|
import com.intellij.spellchecker.tokenizer.Tokenizer
|
||||||
import net.sergeych.lyng.idea.settings.LyngFormatterSettings
|
import net.sergeych.lyng.idea.highlight.LyngTokenTypes
|
||||||
|
import net.sergeych.lyng.idea.psi.LyngElementTypes
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Spellchecking strategy for Lyng:
|
* Standard IntelliJ spellchecking strategy for Lyng.
|
||||||
* - Identifiers: checked as identifiers
|
* Uses the simplified PSI structure to identify declarations.
|
||||||
* - Comments: checked as plain text
|
|
||||||
* - Keywords: skipped
|
|
||||||
* - String literals: optional (controlled by settings), and we exclude printf-style format specifiers like
|
|
||||||
* %s, %d, %-12s, %0.2f, etc.
|
|
||||||
*/
|
*/
|
||||||
class LyngSpellcheckingStrategy : SpellcheckingStrategy() {
|
class LyngSpellcheckingStrategy : SpellcheckingStrategy() {
|
||||||
|
override fun getTokenizer(element: PsiElement?): Tokenizer<*> {
|
||||||
private val log = Logger.getInstance(LyngSpellcheckingStrategy::class.java)
|
val type = element?.node?.elementType
|
||||||
@Volatile private var loggedOnce = false
|
return when (type) {
|
||||||
|
LyngTokenTypes.LINE_COMMENT, LyngTokenTypes.BLOCK_COMMENT -> TEXT_TOKENIZER
|
||||||
private fun grazieInstalled(): Boolean {
|
LyngTokenTypes.STRING -> TEXT_TOKENIZER
|
||||||
// Support both historical and bundled IDs
|
LyngElementTypes.NAME_IDENTIFIER,
|
||||||
return PluginManagerCore.isPluginInstalled(PluginId.getId("com.intellij.grazie")) ||
|
LyngElementTypes.PARAMETER_NAME,
|
||||||
PluginManagerCore.isPluginInstalled(PluginId.getId("tanvd.grazi"))
|
LyngElementTypes.ENUM_CONSTANT_NAME -> TEXT_TOKENIZER
|
||||||
}
|
else -> super.getTokenizer(element)
|
||||||
|
|
||||||
private fun grazieApiAvailable(): Boolean = try {
|
|
||||||
// If this class is absent (as in IC-243), third-party plugins can't run Grazie programmatically
|
|
||||||
Class.forName("com.intellij.grazie.grammar.GrammarChecker")
|
|
||||||
true
|
|
||||||
} catch (_: Throwable) { false }
|
|
||||||
|
|
||||||
override fun getTokenizer(element: PsiElement): Tokenizer<*> {
|
|
||||||
val hasGrazie = grazieInstalled()
|
|
||||||
val hasGrazieApi = grazieApiAvailable()
|
|
||||||
val settings = LyngFormatterSettings.getInstance(element.project)
|
|
||||||
if (!loggedOnce) {
|
|
||||||
loggedOnce = true
|
|
||||||
log.info("LyngSpellcheckingStrategy activated: hasGrazie=$hasGrazie, grazieApi=$hasGrazieApi, preferGrazieForCommentsAndLiterals=${settings.preferGrazieForCommentsAndLiterals}, spellCheckStringLiterals=${settings.spellCheckStringLiterals}, grazieChecksIdentifiers=${settings.grazieChecksIdentifiers}")
|
|
||||||
}
|
|
||||||
|
|
||||||
val file = element.containingFile ?: return EMPTY_TOKENIZER
|
|
||||||
val index = LyngSpellIndex.getUpToDate(file) ?: run {
|
|
||||||
// Suspend legacy spellcheck until MiniAst-based index is ready
|
|
||||||
return EMPTY_TOKENIZER
|
|
||||||
}
|
|
||||||
val elRange = element.textRange ?: return EMPTY_TOKENIZER
|
|
||||||
|
|
||||||
fun overlaps(list: List<TextRange>) = list.any { it.intersects(elRange) }
|
|
||||||
|
|
||||||
// Decide responsibility per settings
|
|
||||||
// If Grazie is present but its public API is not available (IC-243), do NOT delegate to it.
|
|
||||||
val preferGrazie = hasGrazie && hasGrazieApi && settings.preferGrazieForCommentsAndLiterals
|
|
||||||
val grazieIds = hasGrazie && hasGrazieApi && settings.grazieChecksIdentifiers
|
|
||||||
|
|
||||||
// Identifiers: only if range is within identifiers index and not delegated to Grazie
|
|
||||||
if (overlaps(index.identifiers) && !grazieIds) return IDENTIFIER_TOKENIZER
|
|
||||||
|
|
||||||
// Comments: only if not delegated to Grazie and overlapping indexed comments
|
|
||||||
if (!preferGrazie && overlaps(index.comments)) return COMMENT_TEXT_TOKENIZER
|
|
||||||
|
|
||||||
// Strings: only if not delegated to Grazie, literals checking enabled, and overlapping indexed strings
|
|
||||||
if (!preferGrazie && settings.spellCheckStringLiterals && overlaps(index.strings)) return STRING_WITH_PRINTF_EXCLUDES
|
|
||||||
|
|
||||||
return EMPTY_TOKENIZER
|
|
||||||
}
|
|
||||||
|
|
||||||
private object EMPTY_TOKENIZER : Tokenizer<PsiElement>() {
|
|
||||||
override fun tokenize(element: PsiElement, consumer: TokenConsumer) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
private object IDENTIFIER_TOKENIZER : Tokenizer<PsiElement>() {
|
|
||||||
private val splitter = PlainTextSplitter.getInstance()
|
|
||||||
override fun tokenize(element: PsiElement, consumer: TokenConsumer) {
|
|
||||||
val text = element.text
|
|
||||||
if (text.isNullOrEmpty()) return
|
|
||||||
consumer.consumeToken(element, text, false, 0, TextRange(0, text.length), splitter)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private object COMMENT_TEXT_TOKENIZER : Tokenizer<PsiElement>() {
|
|
||||||
private val splitter = PlainTextSplitter.getInstance()
|
|
||||||
override fun tokenize(element: PsiElement, consumer: TokenConsumer) {
|
|
||||||
val text = element.text
|
|
||||||
if (text.isNullOrEmpty()) return
|
|
||||||
consumer.consumeToken(element, text, false, 0, TextRange(0, text.length), splitter)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private object STRING_WITH_PRINTF_EXCLUDES : Tokenizer<PsiElement>() {
|
|
||||||
private val splitter = PlainTextSplitter.getInstance()
|
|
||||||
|
|
||||||
// Regex for printf-style specifiers: %[flags][width][.precision][length]type
|
|
||||||
// This is intentionally permissive to skip common cases like %s, %d, %-12s, %08x, %.2f, %%
|
|
||||||
private val SPEC = Regex("%(?:[-+ #0]*(?:\\d+)?(?:\\.\\d+)?[a-zA-Z%])")
|
|
||||||
|
|
||||||
override fun tokenize(element: PsiElement, consumer: TokenConsumer) {
|
|
||||||
// Check project settings whether literals should be spell-checked
|
|
||||||
val settings = LyngFormatterSettings.getInstance(element.project)
|
|
||||||
if (!settings.spellCheckStringLiterals) return
|
|
||||||
|
|
||||||
val text = element.text
|
|
||||||
if (text.isEmpty()) return
|
|
||||||
|
|
||||||
// Try to strip surrounding quotes (simple lexer token for Lyng strings)
|
|
||||||
var startOffsetInElement = 0
|
|
||||||
var endOffsetInElement = text.length
|
|
||||||
if (text.length >= 2 && (text.first() == '"' && text.last() == '"' || text.first() == '\'' && text.last() == '\'')) {
|
|
||||||
startOffsetInElement = 1
|
|
||||||
endOffsetInElement = text.length - 1
|
|
||||||
}
|
|
||||||
if (endOffsetInElement <= startOffsetInElement) return
|
|
||||||
|
|
||||||
val content = text.substring(startOffsetInElement, endOffsetInElement)
|
|
||||||
|
|
||||||
var last = 0
|
|
||||||
for (m in SPEC.findAll(content)) {
|
|
||||||
val ms = m.range.first
|
|
||||||
val me = m.range.last + 1
|
|
||||||
if (ms > last) {
|
|
||||||
val range = TextRange(startOffsetInElement + last, startOffsetInElement + ms)
|
|
||||||
consumer.consumeToken(element, text, false, 0, range, splitter)
|
|
||||||
}
|
|
||||||
last = me
|
|
||||||
}
|
|
||||||
if (last < content.length) {
|
|
||||||
val range = TextRange(startOffsetInElement + last, startOffsetInElement + content.length)
|
|
||||||
consumer.consumeToken(element, text, false, 0, range, splitter)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Ensure external/bundled docs are registered in BuiltinDocRegistry
|
* Ensure external/bundled docs are registered in BuiltinDocRegistry
|
||||||
* so completion/quickdoc can resolve things like lyng.io.fs.Path.
|
* so completion/quickdoc can resolve things like lyng.io.fs.Path.
|
||||||
@@ -6,6 +23,7 @@ package net.sergeych.lyng.idea.util
|
|||||||
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
import com.intellij.openapi.diagnostic.Logger
|
||||||
import net.sergeych.lyng.idea.docs.FsDocsFallback
|
import net.sergeych.lyng.idea.docs.FsDocsFallback
|
||||||
|
import net.sergeych.lyng.idea.docs.ProcessDocsFallback
|
||||||
|
|
||||||
object DocsBootstrap {
|
object DocsBootstrap {
|
||||||
private val log = Logger.getInstance(DocsBootstrap::class.java)
|
private val log = Logger.getInstance(DocsBootstrap::class.java)
|
||||||
@@ -20,20 +38,32 @@ object DocsBootstrap {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun tryLoadExternal(): Boolean = try {
|
private fun tryLoadExternal(): Boolean {
|
||||||
val cls = Class.forName("net.sergeych.lyngio.docs.FsBuiltinDocs")
|
var anyLoaded = false
|
||||||
val m = cls.getMethod("ensure")
|
try {
|
||||||
m.invoke(null)
|
val cls = Class.forName("net.sergeych.lyngio.docs.FsBuiltinDocs")
|
||||||
log.info("[LYNG_DEBUG] DocsBootstrap: external docs loaded: net.sergeych.lyngio.docs.FsBuiltinDocs.ensure() OK")
|
val m = cls.getMethod("ensure")
|
||||||
true
|
m.invoke(null)
|
||||||
} catch (_: Throwable) {
|
log.info("[LYNG_DEBUG] DocsBootstrap: external docs loaded: net.sergeych.lyngio.docs.FsBuiltinDocs.ensure() OK")
|
||||||
false
|
anyLoaded = true
|
||||||
|
} catch (_: Throwable) {}
|
||||||
|
|
||||||
|
try {
|
||||||
|
val cls = Class.forName("net.sergeych.lyngio.docs.ProcessBuiltinDocs")
|
||||||
|
val m = cls.getMethod("ensure")
|
||||||
|
m.invoke(null)
|
||||||
|
log.info("[LYNG_DEBUG] DocsBootstrap: external docs loaded: net.sergeych.lyngio.docs.ProcessBuiltinDocs.ensure() OK")
|
||||||
|
anyLoaded = true
|
||||||
|
} catch (_: Throwable) {}
|
||||||
|
return anyLoaded
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun trySeedFallback(): Boolean = try {
|
private fun trySeedFallback(): Boolean = try {
|
||||||
val seeded = FsDocsFallback.ensureOnce()
|
val seededFs = FsDocsFallback.ensureOnce()
|
||||||
|
val seededProcess = ProcessDocsFallback.ensureOnce()
|
||||||
|
val seeded = seededFs || seededProcess
|
||||||
if (seeded) {
|
if (seeded) {
|
||||||
log.info("[LYNG_DEBUG] DocsBootstrap: external docs not found; seeded plugin fallback for lyng.io.fs")
|
log.info("[LYNG_DEBUG] DocsBootstrap: external docs not found; seeded plugin fallback for lyng.io.fs/process")
|
||||||
} else {
|
} else {
|
||||||
log.info("[LYNG_DEBUG] DocsBootstrap: external docs not found; no fallback seeded")
|
log.info("[LYNG_DEBUG] DocsBootstrap: external docs not found; no fallback seeded")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,8 +17,10 @@
|
|||||||
|
|
||||||
package net.sergeych.lyng.idea.util
|
package net.sergeych.lyng.idea.util
|
||||||
|
|
||||||
|
import com.intellij.openapi.application.runReadAction
|
||||||
import com.intellij.openapi.util.Key
|
import com.intellij.openapi.util.Key
|
||||||
import com.intellij.psi.PsiFile
|
import com.intellij.psi.PsiFile
|
||||||
|
import com.intellij.psi.PsiManager
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
import net.sergeych.lyng.Compiler
|
import net.sergeych.lyng.Compiler
|
||||||
import net.sergeych.lyng.Source
|
import net.sergeych.lyng.Source
|
||||||
@@ -32,43 +34,89 @@ object LyngAstManager {
|
|||||||
private val BINDING_KEY = Key.create<BindingSnapshot>("lyng.binding.cache")
|
private val BINDING_KEY = Key.create<BindingSnapshot>("lyng.binding.cache")
|
||||||
private val STAMP_KEY = Key.create<Long>("lyng.mini.cache.stamp")
|
private val STAMP_KEY = Key.create<Long>("lyng.mini.cache.stamp")
|
||||||
|
|
||||||
fun getMiniAst(file: PsiFile): MiniScript? {
|
fun getMiniAst(file: PsiFile): MiniScript? = runReadAction {
|
||||||
val doc = file.viewProvider.document ?: return null
|
val vFile = file.virtualFile ?: return@runReadAction null
|
||||||
val stamp = doc.modificationStamp
|
val combinedStamp = getCombinedStamp(file)
|
||||||
|
|
||||||
val prevStamp = file.getUserData(STAMP_KEY)
|
val prevStamp = file.getUserData(STAMP_KEY)
|
||||||
val cached = file.getUserData(MINI_KEY)
|
val cached = file.getUserData(MINI_KEY)
|
||||||
if (cached != null && prevStamp != null && prevStamp == stamp) return cached
|
if (cached != null && prevStamp != null && prevStamp == combinedStamp) return@runReadAction cached
|
||||||
|
|
||||||
val text = doc.text
|
val text = file.viewProvider.contents.toString()
|
||||||
val sink = MiniAstBuilder()
|
val sink = MiniAstBuilder()
|
||||||
val built = try {
|
val built = try {
|
||||||
val provider = IdeLenientImportProvider.create()
|
val provider = IdeLenientImportProvider.create()
|
||||||
val src = Source(file.name, text)
|
val src = Source(file.name, text)
|
||||||
runBlocking { Compiler.compileWithMini(src, provider, sink) }
|
runBlocking { Compiler.compileWithMini(src, provider, sink) }
|
||||||
sink.build()
|
val script = sink.build()
|
||||||
|
if (script != null && !file.name.endsWith(".lyng.d")) {
|
||||||
|
val dFiles = collectDeclarationFiles(file)
|
||||||
|
for (df in dFiles) {
|
||||||
|
val scriptD = getMiniAst(df)
|
||||||
|
if (scriptD != null) {
|
||||||
|
script.declarations.addAll(scriptD.declarations)
|
||||||
|
script.imports.addAll(scriptD.imports)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
script
|
||||||
} catch (_: Throwable) {
|
} catch (_: Throwable) {
|
||||||
sink.build()
|
sink.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (built != null) {
|
if (built != null) {
|
||||||
file.putUserData(MINI_KEY, built)
|
file.putUserData(MINI_KEY, built)
|
||||||
file.putUserData(STAMP_KEY, stamp)
|
file.putUserData(STAMP_KEY, combinedStamp)
|
||||||
// Invalidate binding too
|
// Invalidate binding too
|
||||||
file.putUserData(BINDING_KEY, null)
|
file.putUserData(BINDING_KEY, null)
|
||||||
}
|
}
|
||||||
return built
|
built
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getBinding(file: PsiFile): BindingSnapshot? {
|
fun getCombinedStamp(file: PsiFile): Long = runReadAction {
|
||||||
val doc = file.viewProvider.document ?: return null
|
var combinedStamp = file.viewProvider.modificationStamp
|
||||||
val stamp = doc.modificationStamp
|
if (!file.name.endsWith(".lyng.d")) {
|
||||||
|
collectDeclarationFiles(file).forEach { df ->
|
||||||
|
combinedStamp += df.viewProvider.modificationStamp
|
||||||
|
}
|
||||||
|
}
|
||||||
|
combinedStamp
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun collectDeclarationFiles(file: PsiFile): List<PsiFile> = runReadAction {
|
||||||
|
val psiManager = PsiManager.getInstance(file.project)
|
||||||
|
var current = file.virtualFile?.parent
|
||||||
|
val seen = mutableSetOf<String>()
|
||||||
|
val result = mutableListOf<PsiFile>()
|
||||||
|
|
||||||
|
while (current != null) {
|
||||||
|
for (child in current.children) {
|
||||||
|
if (child.name.endsWith(".lyng.d") && child != file.virtualFile && seen.add(child.path)) {
|
||||||
|
val psiD = psiManager.findFile(child) ?: continue
|
||||||
|
result.add(psiD)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
current = current.parent
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getBinding(file: PsiFile): BindingSnapshot? = runReadAction {
|
||||||
|
val vFile = file.virtualFile ?: return@runReadAction null
|
||||||
|
var combinedStamp = file.viewProvider.modificationStamp
|
||||||
|
|
||||||
|
val dFiles = if (!file.name.endsWith(".lyng.d")) collectDeclarationFiles(file) else emptyList()
|
||||||
|
for (df in dFiles) {
|
||||||
|
combinedStamp += df.viewProvider.modificationStamp
|
||||||
|
}
|
||||||
|
|
||||||
val prevStamp = file.getUserData(STAMP_KEY)
|
val prevStamp = file.getUserData(STAMP_KEY)
|
||||||
val cached = file.getUserData(BINDING_KEY)
|
val cached = file.getUserData(BINDING_KEY)
|
||||||
|
|
||||||
if (cached != null && prevStamp != null && prevStamp == stamp) return cached
|
if (cached != null && prevStamp != null && prevStamp == combinedStamp) return@runReadAction cached
|
||||||
|
|
||||||
val mini = getMiniAst(file) ?: return null
|
val mini = getMiniAst(file) ?: return@runReadAction null
|
||||||
val text = doc.text
|
val text = file.viewProvider.contents.toString()
|
||||||
val binding = try {
|
val binding = try {
|
||||||
Binder.bind(text, mini)
|
Binder.bind(text, mini)
|
||||||
} catch (_: Throwable) {
|
} catch (_: Throwable) {
|
||||||
@@ -77,8 +125,9 @@ object LyngAstManager {
|
|||||||
|
|
||||||
if (binding != null) {
|
if (binding != null) {
|
||||||
file.putUserData(BINDING_KEY, binding)
|
file.putUserData(BINDING_KEY, binding)
|
||||||
// stamp is already set by getMiniAst
|
// stamp is already set by getMiniAst or we set it here if getMiniAst was cached
|
||||||
|
file.putUserData(STAMP_KEY, combinedStamp)
|
||||||
}
|
}
|
||||||
return binding
|
binding
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<!--
|
<!--
|
||||||
~ Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
~ Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
~
|
~
|
||||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
~ you may not use this file except in compliance with the License.
|
~ you may not use this file except in compliance with the License.
|
||||||
@@ -20,8 +20,6 @@
|
|||||||
-->
|
-->
|
||||||
<idea-plugin>
|
<idea-plugin>
|
||||||
<extensions defaultExtensionNs="com.intellij">
|
<extensions defaultExtensionNs="com.intellij">
|
||||||
<grazie.grammar.strategy language="Lyng"
|
|
||||||
implementationClass="net.sergeych.lyng.idea.grazie.LyngGrazieStrategy"/>
|
|
||||||
<!-- Provide text extraction for Lyng PSI so Grazie (bundled Natural Languages) can check content -->
|
<!-- Provide text extraction for Lyng PSI so Grazie (bundled Natural Languages) can check content -->
|
||||||
<grazie.textExtractor language="Lyng"
|
<grazie.textExtractor language="Lyng"
|
||||||
implementationClass="net.sergeych.lyng.idea.grazie.LyngTextExtractor"/>
|
implementationClass="net.sergeych.lyng.idea.grazie.LyngTextExtractor"/>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<!--
|
<!--
|
||||||
~ Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
~ Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
~
|
~
|
||||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
~ you may not use this file except in compliance with the License.
|
~ you may not use this file except in compliance with the License.
|
||||||
@@ -21,8 +21,6 @@
|
|||||||
-->
|
-->
|
||||||
<idea-plugin>
|
<idea-plugin>
|
||||||
<extensions defaultExtensionNs="com.intellij">
|
<extensions defaultExtensionNs="com.intellij">
|
||||||
<grazie.grammar.strategy language="Lyng"
|
|
||||||
implementationClass="net.sergeych.lyng.idea.grazie.LyngGrazieStrategy"/>
|
|
||||||
<!-- Provide text extraction for Lyng PSI so Grazie can actually check content -->
|
<!-- Provide text extraction for Lyng PSI so Grazie can actually check content -->
|
||||||
<grazie.textExtractor language="Lyng"
|
<grazie.textExtractor language="Lyng"
|
||||||
implementationClass="net.sergeych.lyng.idea.grazie.LyngTextExtractor"/>
|
implementationClass="net.sergeych.lyng.idea.grazie.LyngTextExtractor"/>
|
||||||
|
|||||||
@@ -16,10 +16,10 @@
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
<idea-plugin>
|
<idea-plugin>
|
||||||
<!-- Open-ended compatibility: 2024.3+ (build 243 and newer) -->
|
<!-- Open-ended compatibility: 2024.1+ (build 241 and newer) -->
|
||||||
<idea-version since-build="243"/>
|
<idea-version since-build="241"/>
|
||||||
<id>net.sergeych.lyng.idea</id>
|
<id>net.sergeych.lyng.idea</id>
|
||||||
<name>Lyng Language Support</name>
|
<name>Lyng</name>
|
||||||
<vendor email="real.sergeych@gmail.com">Sergey Chernov</vendor>
|
<vendor email="real.sergeych@gmail.com">Sergey Chernov</vendor>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
@@ -43,6 +43,7 @@
|
|||||||
<extensions defaultExtensionNs="com.intellij">
|
<extensions defaultExtensionNs="com.intellij">
|
||||||
<!-- Language and file type -->
|
<!-- Language and file type -->
|
||||||
<fileType implementationClass="net.sergeych.lyng.idea.LyngFileType" name="Lyng" extensions="lyng" fieldName="INSTANCE" language="Lyng"/>
|
<fileType implementationClass="net.sergeych.lyng.idea.LyngFileType" name="Lyng" extensions="lyng" fieldName="INSTANCE" language="Lyng"/>
|
||||||
|
<fileTypeFactory implementation="net.sergeych.lyng.idea.LyngFileTypeFactory"/>
|
||||||
|
|
||||||
<!-- Minimal parser/PSI to fully wire editor services for the language -->
|
<!-- Minimal parser/PSI to fully wire editor services for the language -->
|
||||||
<lang.parserDefinition language="Lyng" implementationClass="net.sergeych.lyng.idea.psi.LyngParserDefinition"/>
|
<lang.parserDefinition language="Lyng" implementationClass="net.sergeych.lyng.idea.psi.LyngParserDefinition"/>
|
||||||
@@ -56,9 +57,6 @@
|
|||||||
<!-- External annotator for semantic highlighting -->
|
<!-- External annotator for semantic highlighting -->
|
||||||
<externalAnnotator language="Lyng" implementationClass="net.sergeych.lyng.idea.annotators.LyngExternalAnnotator"/>
|
<externalAnnotator language="Lyng" implementationClass="net.sergeych.lyng.idea.annotators.LyngExternalAnnotator"/>
|
||||||
|
|
||||||
<!-- Grazie-backed spell/grammar annotator (runs only when Grazie is installed) -->
|
|
||||||
<externalAnnotator language="Lyng" implementationClass="net.sergeych.lyng.idea.grazie.LyngGrazieAnnotator"/>
|
|
||||||
|
|
||||||
<!-- Quick documentation provider bound to Lyng language -->
|
<!-- Quick documentation provider bound to Lyng language -->
|
||||||
<lang.documentationProvider language="Lyng" implementationClass="net.sergeych.lyng.idea.docs.LyngDocumentationProvider"/>
|
<lang.documentationProvider language="Lyng" implementationClass="net.sergeych.lyng.idea.docs.LyngDocumentationProvider"/>
|
||||||
|
|
||||||
@@ -104,5 +102,15 @@
|
|||||||
|
|
||||||
</extensions>
|
</extensions>
|
||||||
|
|
||||||
<actions/>
|
<actions>
|
||||||
|
<action id="net.sergeych.lyng.idea.actions.RunLyngScriptAction"
|
||||||
|
class="net.sergeych.lyng.idea.actions.RunLyngScriptAction"
|
||||||
|
text="Run Lyng Script"
|
||||||
|
description="Run the current Lyng script and show output in console">
|
||||||
|
<add-to-group group-id="EditorPopupMenu" anchor="last"/>
|
||||||
|
<add-to-group group-id="ProjectViewPopupMenu" anchor="last"/>
|
||||||
|
<add-to-group group-id="RunMenu" anchor="last"/>
|
||||||
|
<keyboard-shortcut keymap="$default" first-keystroke="control shift F10"/>
|
||||||
|
</action>
|
||||||
|
</actions>
|
||||||
</idea-plugin>
|
</idea-plugin>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<!--
|
<!--
|
||||||
~ Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
~ Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
~
|
~
|
||||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
~ you may not use this file except in compliance with the License.
|
~ you may not use this file except in compliance with the License.
|
||||||
@@ -22,8 +22,7 @@
|
|||||||
-->
|
-->
|
||||||
<idea-plugin>
|
<idea-plugin>
|
||||||
<extensions defaultExtensionNs="com.intellij">
|
<extensions defaultExtensionNs="com.intellij">
|
||||||
<!-- Spellchecker strategy: identifiers + comments; literals configurable, skipping printf-like specs -->
|
|
||||||
<spellchecker.support language="Lyng"
|
<spellchecker.support language="Lyng"
|
||||||
implementationClass="net.sergeych.lyng.idea.spell.LyngSpellcheckingStrategy"/>
|
implementationClass="net.sergeych.lyng.idea.spell.LyngSpellcheckingStrategy"/>
|
||||||
</extensions>
|
</extensions>
|
||||||
</idea-plugin>
|
</idea-plugin>
|
||||||
@@ -1,466 +0,0 @@
|
|||||||
the
|
|
||||||
be
|
|
||||||
to
|
|
||||||
of
|
|
||||||
and
|
|
||||||
a
|
|
||||||
in
|
|
||||||
that
|
|
||||||
have
|
|
||||||
I
|
|
||||||
it
|
|
||||||
for
|
|
||||||
not
|
|
||||||
on
|
|
||||||
with
|
|
||||||
he
|
|
||||||
as
|
|
||||||
you
|
|
||||||
do
|
|
||||||
at
|
|
||||||
this
|
|
||||||
but
|
|
||||||
his
|
|
||||||
by
|
|
||||||
from
|
|
||||||
they
|
|
||||||
we
|
|
||||||
say
|
|
||||||
her
|
|
||||||
she
|
|
||||||
or
|
|
||||||
an
|
|
||||||
will
|
|
||||||
my
|
|
||||||
one
|
|
||||||
all
|
|
||||||
would
|
|
||||||
there
|
|
||||||
their
|
|
||||||
what
|
|
||||||
so
|
|
||||||
up
|
|
||||||
out
|
|
||||||
if
|
|
||||||
about
|
|
||||||
who
|
|
||||||
get
|
|
||||||
which
|
|
||||||
go
|
|
||||||
me
|
|
||||||
when
|
|
||||||
make
|
|
||||||
can
|
|
||||||
like
|
|
||||||
time
|
|
||||||
no
|
|
||||||
just
|
|
||||||
him
|
|
||||||
know
|
|
||||||
take
|
|
||||||
people
|
|
||||||
into
|
|
||||||
year
|
|
||||||
your
|
|
||||||
good
|
|
||||||
some
|
|
||||||
could
|
|
||||||
them
|
|
||||||
see
|
|
||||||
other
|
|
||||||
than
|
|
||||||
then
|
|
||||||
now
|
|
||||||
look
|
|
||||||
only
|
|
||||||
come
|
|
||||||
its
|
|
||||||
over
|
|
||||||
think
|
|
||||||
also
|
|
||||||
back
|
|
||||||
after
|
|
||||||
use
|
|
||||||
two
|
|
||||||
how
|
|
||||||
our
|
|
||||||
work
|
|
||||||
first
|
|
||||||
well
|
|
||||||
way
|
|
||||||
even
|
|
||||||
new
|
|
||||||
want
|
|
||||||
because
|
|
||||||
any
|
|
||||||
these
|
|
||||||
give
|
|
||||||
day
|
|
||||||
most
|
|
||||||
us
|
|
||||||
is
|
|
||||||
are
|
|
||||||
was
|
|
||||||
were
|
|
||||||
been
|
|
||||||
being
|
|
||||||
does
|
|
||||||
did
|
|
||||||
done
|
|
||||||
has
|
|
||||||
had
|
|
||||||
having
|
|
||||||
may
|
|
||||||
might
|
|
||||||
must
|
|
||||||
shall
|
|
||||||
should
|
|
||||||
ought
|
|
||||||
need
|
|
||||||
used
|
|
||||||
here
|
|
||||||
therefore
|
|
||||||
where
|
|
||||||
why
|
|
||||||
while
|
|
||||||
until
|
|
||||||
since
|
|
||||||
before
|
|
||||||
afterward
|
|
||||||
between
|
|
||||||
among
|
|
||||||
without
|
|
||||||
within
|
|
||||||
through
|
|
||||||
across
|
|
||||||
against
|
|
||||||
toward
|
|
||||||
upon
|
|
||||||
above
|
|
||||||
below
|
|
||||||
under
|
|
||||||
around
|
|
||||||
near
|
|
||||||
far
|
|
||||||
early
|
|
||||||
late
|
|
||||||
often
|
|
||||||
always
|
|
||||||
never
|
|
||||||
seldom
|
|
||||||
sometimes
|
|
||||||
usually
|
|
||||||
really
|
|
||||||
very
|
|
||||||
quite
|
|
||||||
rather
|
|
||||||
almost
|
|
||||||
already
|
|
||||||
again
|
|
||||||
still
|
|
||||||
yet
|
|
||||||
soon
|
|
||||||
today
|
|
||||||
tomorrow
|
|
||||||
yesterday
|
|
||||||
number
|
|
||||||
string
|
|
||||||
boolean
|
|
||||||
true
|
|
||||||
false
|
|
||||||
null
|
|
||||||
none
|
|
||||||
file
|
|
||||||
files
|
|
||||||
path
|
|
||||||
paths
|
|
||||||
line
|
|
||||||
lines
|
|
||||||
word
|
|
||||||
words
|
|
||||||
count
|
|
||||||
value
|
|
||||||
values
|
|
||||||
name
|
|
||||||
names
|
|
||||||
title
|
|
||||||
text
|
|
||||||
message
|
|
||||||
error
|
|
||||||
errors
|
|
||||||
warning
|
|
||||||
warnings
|
|
||||||
info
|
|
||||||
information
|
|
||||||
debug
|
|
||||||
trace
|
|
||||||
format
|
|
||||||
printf
|
|
||||||
specifier
|
|
||||||
specifiers
|
|
||||||
pattern
|
|
||||||
patterns
|
|
||||||
match
|
|
||||||
matches
|
|
||||||
regex
|
|
||||||
version
|
|
||||||
versions
|
|
||||||
module
|
|
||||||
modules
|
|
||||||
package
|
|
||||||
packages
|
|
||||||
import
|
|
||||||
imports
|
|
||||||
export
|
|
||||||
exports
|
|
||||||
class
|
|
||||||
classes
|
|
||||||
object
|
|
||||||
objects
|
|
||||||
function
|
|
||||||
functions
|
|
||||||
method
|
|
||||||
methods
|
|
||||||
parameter
|
|
||||||
parameters
|
|
||||||
argument
|
|
||||||
arguments
|
|
||||||
variable
|
|
||||||
variables
|
|
||||||
constant
|
|
||||||
constants
|
|
||||||
type
|
|
||||||
types
|
|
||||||
generic
|
|
||||||
generics
|
|
||||||
map
|
|
||||||
maps
|
|
||||||
list
|
|
||||||
lists
|
|
||||||
array
|
|
||||||
arrays
|
|
||||||
set
|
|
||||||
sets
|
|
||||||
queue
|
|
||||||
stack
|
|
||||||
graph
|
|
||||||
tree
|
|
||||||
node
|
|
||||||
nodes
|
|
||||||
edge
|
|
||||||
edges
|
|
||||||
pair
|
|
||||||
pairs
|
|
||||||
key
|
|
||||||
keys
|
|
||||||
value
|
|
||||||
values
|
|
||||||
index
|
|
||||||
indices
|
|
||||||
length
|
|
||||||
size
|
|
||||||
empty
|
|
||||||
contains
|
|
||||||
equals
|
|
||||||
compare
|
|
||||||
greater
|
|
||||||
less
|
|
||||||
minimum
|
|
||||||
maximum
|
|
||||||
average
|
|
||||||
sum
|
|
||||||
total
|
|
||||||
random
|
|
||||||
round
|
|
||||||
floor
|
|
||||||
ceil
|
|
||||||
sin
|
|
||||||
cos
|
|
||||||
tan
|
|
||||||
sqrt
|
|
||||||
abs
|
|
||||||
min
|
|
||||||
max
|
|
||||||
read
|
|
||||||
write
|
|
||||||
open
|
|
||||||
close
|
|
||||||
append
|
|
||||||
create
|
|
||||||
delete
|
|
||||||
remove
|
|
||||||
update
|
|
||||||
save
|
|
||||||
load
|
|
||||||
start
|
|
||||||
stop
|
|
||||||
run
|
|
||||||
execute
|
|
||||||
return
|
|
||||||
break
|
|
||||||
continue
|
|
||||||
try
|
|
||||||
catch
|
|
||||||
finally
|
|
||||||
throw
|
|
||||||
throws
|
|
||||||
if
|
|
||||||
else
|
|
||||||
when
|
|
||||||
while
|
|
||||||
for
|
|
||||||
loop
|
|
||||||
range
|
|
||||||
case
|
|
||||||
switch
|
|
||||||
default
|
|
||||||
optional
|
|
||||||
required
|
|
||||||
enable
|
|
||||||
disable
|
|
||||||
enabled
|
|
||||||
disabled
|
|
||||||
visible
|
|
||||||
hidden
|
|
||||||
public
|
|
||||||
private
|
|
||||||
protected
|
|
||||||
internal
|
|
||||||
external
|
|
||||||
inline
|
|
||||||
override
|
|
||||||
abstract
|
|
||||||
sealed
|
|
||||||
open
|
|
||||||
final
|
|
||||||
static
|
|
||||||
const
|
|
||||||
lazy
|
|
||||||
late
|
|
||||||
init
|
|
||||||
initialize
|
|
||||||
configuration
|
|
||||||
settings
|
|
||||||
option
|
|
||||||
options
|
|
||||||
preference
|
|
||||||
preferences
|
|
||||||
project
|
|
||||||
projects
|
|
||||||
module
|
|
||||||
modules
|
|
||||||
build
|
|
||||||
builds
|
|
||||||
compile
|
|
||||||
compiles
|
|
||||||
compiler
|
|
||||||
test
|
|
||||||
tests
|
|
||||||
testing
|
|
||||||
assert
|
|
||||||
assertion
|
|
||||||
result
|
|
||||||
results
|
|
||||||
success
|
|
||||||
failure
|
|
||||||
status
|
|
||||||
state
|
|
||||||
context
|
|
||||||
scope
|
|
||||||
scopes
|
|
||||||
token
|
|
||||||
tokens
|
|
||||||
identifier
|
|
||||||
identifiers
|
|
||||||
keyword
|
|
||||||
keywords
|
|
||||||
comment
|
|
||||||
comments
|
|
||||||
string
|
|
||||||
strings
|
|
||||||
literal
|
|
||||||
literals
|
|
||||||
formatting
|
|
||||||
formatter
|
|
||||||
spell
|
|
||||||
spelling
|
|
||||||
dictionary
|
|
||||||
dictionaries
|
|
||||||
language
|
|
||||||
languages
|
|
||||||
natural
|
|
||||||
grazie
|
|
||||||
typo
|
|
||||||
typos
|
|
||||||
suggest
|
|
||||||
suggestion
|
|
||||||
suggestions
|
|
||||||
replace
|
|
||||||
replacement
|
|
||||||
replacements
|
|
||||||
learn
|
|
||||||
learned
|
|
||||||
learns
|
|
||||||
filter
|
|
||||||
filters
|
|
||||||
exclude
|
|
||||||
excludes
|
|
||||||
include
|
|
||||||
includes
|
|
||||||
bundle
|
|
||||||
bundled
|
|
||||||
resource
|
|
||||||
resources
|
|
||||||
gzipped
|
|
||||||
plain
|
|
||||||
text
|
|
||||||
editor
|
|
||||||
editors
|
|
||||||
inspection
|
|
||||||
inspections
|
|
||||||
highlight
|
|
||||||
highlighting
|
|
||||||
underline
|
|
||||||
underlines
|
|
||||||
style
|
|
||||||
styles
|
|
||||||
range
|
|
||||||
ranges
|
|
||||||
offset
|
|
||||||
offsets
|
|
||||||
position
|
|
||||||
positions
|
|
||||||
apply
|
|
||||||
applies
|
|
||||||
provides
|
|
||||||
present
|
|
||||||
absent
|
|
||||||
available
|
|
||||||
unavailable
|
|
||||||
version
|
|
||||||
build
|
|
||||||
platform
|
|
||||||
ide
|
|
||||||
intellij
|
|
||||||
plugin
|
|
||||||
plugins
|
|
||||||
sandbox
|
|
||||||
gradle
|
|
||||||
kotlin
|
|
||||||
java
|
|
||||||
linux
|
|
||||||
macos
|
|
||||||
windows
|
|
||||||
unix
|
|
||||||
system
|
|
||||||
systems
|
|
||||||
support
|
|
||||||
supports
|
|
||||||
compatible
|
|
||||||
compatibility
|
|
||||||
fallback
|
|
||||||
native
|
|
||||||
automatic
|
|
||||||
autoswitch
|
|
||||||
switch
|
|
||||||
switches
|
|
||||||
@@ -1,282 +0,0 @@
|
|||||||
# Lyng/tech vocabulary – one word per line, lowercase
|
|
||||||
lyng
|
|
||||||
miniast
|
|
||||||
binder
|
|
||||||
printf
|
|
||||||
specifier
|
|
||||||
specifiers
|
|
||||||
regex
|
|
||||||
regexp
|
|
||||||
token
|
|
||||||
tokens
|
|
||||||
lexer
|
|
||||||
parser
|
|
||||||
syntax
|
|
||||||
semantic
|
|
||||||
highlight
|
|
||||||
highlighting
|
|
||||||
underline
|
|
||||||
typo
|
|
||||||
typos
|
|
||||||
dictionary
|
|
||||||
dictionaries
|
|
||||||
grazie
|
|
||||||
natural
|
|
||||||
languages
|
|
||||||
inspection
|
|
||||||
inspections
|
|
||||||
annotation
|
|
||||||
annotator
|
|
||||||
annotations
|
|
||||||
quickfix
|
|
||||||
quickfixes
|
|
||||||
intention
|
|
||||||
intentions
|
|
||||||
replacement
|
|
||||||
replacements
|
|
||||||
identifier
|
|
||||||
identifiers
|
|
||||||
keyword
|
|
||||||
keywords
|
|
||||||
comment
|
|
||||||
comments
|
|
||||||
string
|
|
||||||
strings
|
|
||||||
literal
|
|
||||||
literals
|
|
||||||
formatting
|
|
||||||
formatter
|
|
||||||
splitter
|
|
||||||
camelcase
|
|
||||||
snakecase
|
|
||||||
pascalcase
|
|
||||||
uppercase
|
|
||||||
lowercase
|
|
||||||
titlecase
|
|
||||||
case
|
|
||||||
cases
|
|
||||||
project
|
|
||||||
module
|
|
||||||
modules
|
|
||||||
resource
|
|
||||||
resources
|
|
||||||
bundle
|
|
||||||
bundled
|
|
||||||
gzipped
|
|
||||||
plaintext
|
|
||||||
text
|
|
||||||
range
|
|
||||||
ranges
|
|
||||||
offset
|
|
||||||
offsets
|
|
||||||
position
|
|
||||||
positions
|
|
||||||
apply
|
|
||||||
applies
|
|
||||||
runtime
|
|
||||||
compile
|
|
||||||
build
|
|
||||||
artifact
|
|
||||||
artifacts
|
|
||||||
plugin
|
|
||||||
plugins
|
|
||||||
intellij
|
|
||||||
idea
|
|
||||||
sandbox
|
|
||||||
gradle
|
|
||||||
kotlin
|
|
||||||
java
|
|
||||||
jvm
|
|
||||||
coroutines
|
|
||||||
suspend
|
|
||||||
scope
|
|
||||||
scopes
|
|
||||||
context
|
|
||||||
contexts
|
|
||||||
tokenizer
|
|
||||||
tokenizers
|
|
||||||
spell
|
|
||||||
spelling
|
|
||||||
spellcheck
|
|
||||||
spellchecker
|
|
||||||
fallback
|
|
||||||
native
|
|
||||||
autoswitch
|
|
||||||
switch
|
|
||||||
switching
|
|
||||||
enable
|
|
||||||
disable
|
|
||||||
enabled
|
|
||||||
disabled
|
|
||||||
setting
|
|
||||||
settings
|
|
||||||
preference
|
|
||||||
preferences
|
|
||||||
editor
|
|
||||||
filetype
|
|
||||||
filetypes
|
|
||||||
language
|
|
||||||
languages
|
|
||||||
psi
|
|
||||||
psielement
|
|
||||||
psifile
|
|
||||||
textcontent
|
|
||||||
textdomain
|
|
||||||
stealth
|
|
||||||
stealthy
|
|
||||||
printfspec
|
|
||||||
format
|
|
||||||
formats
|
|
||||||
pattern
|
|
||||||
patterns
|
|
||||||
match
|
|
||||||
matches
|
|
||||||
group
|
|
||||||
groups
|
|
||||||
node
|
|
||||||
nodes
|
|
||||||
tree
|
|
||||||
graph
|
|
||||||
edge
|
|
||||||
edges
|
|
||||||
pair
|
|
||||||
pairs
|
|
||||||
map
|
|
||||||
maps
|
|
||||||
list
|
|
||||||
lists
|
|
||||||
array
|
|
||||||
arrays
|
|
||||||
set
|
|
||||||
sets
|
|
||||||
queue
|
|
||||||
stack
|
|
||||||
index
|
|
||||||
indices
|
|
||||||
length
|
|
||||||
size
|
|
||||||
empty
|
|
||||||
contains
|
|
||||||
equals
|
|
||||||
compare
|
|
||||||
greater
|
|
||||||
less
|
|
||||||
minimum
|
|
||||||
maximum
|
|
||||||
average
|
|
||||||
sum
|
|
||||||
total
|
|
||||||
random
|
|
||||||
round
|
|
||||||
floor
|
|
||||||
ceil
|
|
||||||
sin
|
|
||||||
cos
|
|
||||||
tan
|
|
||||||
sqrt
|
|
||||||
abs
|
|
||||||
min
|
|
||||||
max
|
|
||||||
read
|
|
||||||
write
|
|
||||||
open
|
|
||||||
close
|
|
||||||
append
|
|
||||||
create
|
|
||||||
delete
|
|
||||||
remove
|
|
||||||
update
|
|
||||||
save
|
|
||||||
load
|
|
||||||
start
|
|
||||||
stop
|
|
||||||
run
|
|
||||||
execute
|
|
||||||
return
|
|
||||||
break
|
|
||||||
continue
|
|
||||||
try
|
|
||||||
catch
|
|
||||||
finally
|
|
||||||
throw
|
|
||||||
throws
|
|
||||||
if
|
|
||||||
else
|
|
||||||
when
|
|
||||||
while
|
|
||||||
for
|
|
||||||
loop
|
|
||||||
rangeop
|
|
||||||
caseop
|
|
||||||
switchop
|
|
||||||
default
|
|
||||||
optional
|
|
||||||
required
|
|
||||||
public
|
|
||||||
private
|
|
||||||
protected
|
|
||||||
internal
|
|
||||||
external
|
|
||||||
inline
|
|
||||||
override
|
|
||||||
abstract
|
|
||||||
sealed
|
|
||||||
open
|
|
||||||
final
|
|
||||||
static
|
|
||||||
const
|
|
||||||
lazy
|
|
||||||
late
|
|
||||||
init
|
|
||||||
initialize
|
|
||||||
configuration
|
|
||||||
option
|
|
||||||
options
|
|
||||||
projectwide
|
|
||||||
workspace
|
|
||||||
crossplatform
|
|
||||||
multiplatform
|
|
||||||
commonmain
|
|
||||||
jsmain
|
|
||||||
native
|
|
||||||
platform
|
|
||||||
api
|
|
||||||
implementation
|
|
||||||
dependency
|
|
||||||
dependencies
|
|
||||||
classpath
|
|
||||||
source
|
|
||||||
sources
|
|
||||||
document
|
|
||||||
documents
|
|
||||||
logging
|
|
||||||
logger
|
|
||||||
info
|
|
||||||
debug
|
|
||||||
trace
|
|
||||||
warning
|
|
||||||
error
|
|
||||||
severity
|
|
||||||
severitylevel
|
|
||||||
intentionaction
|
|
||||||
daemon
|
|
||||||
daemoncodeanalyzer
|
|
||||||
restart
|
|
||||||
textattributes
|
|
||||||
textattributeskey
|
|
||||||
typostyle
|
|
||||||
learned
|
|
||||||
learn
|
|
||||||
tech
|
|
||||||
vocabulary
|
|
||||||
domain
|
|
||||||
term
|
|
||||||
terms
|
|
||||||
us
|
|
||||||
uk
|
|
||||||
american
|
|
||||||
british
|
|
||||||
colour
|
|
||||||
color
|
|
||||||
organisation
|
|
||||||
organization
|
|
||||||
+54
@@ -1,3 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
package net.sergeych.lyng.idea.completion
|
package net.sergeych.lyng.idea.completion
|
||||||
|
|
||||||
import com.intellij.testFramework.fixtures.BasePlatformTestCase
|
import com.intellij.testFramework.fixtures.BasePlatformTestCase
|
||||||
@@ -118,4 +135,41 @@ class LyngCompletionMemberTest : BasePlatformTestCase() {
|
|||||||
// Heuristic: we expect more than a couple of items (not just size/toList)
|
// Heuristic: we expect more than a couple of items (not just size/toList)
|
||||||
assertTrue("Too few member suggestions after list literal: $items", items.size >= 3)
|
assertTrue("Too few member suggestions after list literal: $items", items.size >= 3)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun test_ProcessModule_Completion() {
|
||||||
|
val code = """
|
||||||
|
import lyng.io.process
|
||||||
|
Process.<caret>
|
||||||
|
""".trimIndent()
|
||||||
|
val imported = listOf("lyng.io.process")
|
||||||
|
ensureDocs(imported)
|
||||||
|
|
||||||
|
val items = complete(code)
|
||||||
|
assertTrue("Should contain 'execute'", items.contains("execute"))
|
||||||
|
assertTrue("Should contain 'shell'", items.contains("shell"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fun test_RunningProcess_Completion() {
|
||||||
|
val code = """
|
||||||
|
import lyng.io.process
|
||||||
|
val p = Process.shell("ls")
|
||||||
|
p.<caret>
|
||||||
|
""".trimIndent()
|
||||||
|
val imported = listOf("lyng.io.process")
|
||||||
|
ensureDocs(imported)
|
||||||
|
|
||||||
|
val items = complete(code)
|
||||||
|
assertTrue("Should contain 'stdout'", items.contains("stdout"))
|
||||||
|
assertTrue("Should contain 'waitFor'", items.contains("waitFor"))
|
||||||
|
assertTrue("Should contain 'signal'", items.contains("signal"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fun test_RegistryDirect() {
|
||||||
|
DocsBootstrap.ensure()
|
||||||
|
val docs = BuiltinDocRegistry.docsForModule("lyng.io.process")
|
||||||
|
assertTrue("Docs for lyng.io.process should not be empty", docs.isNotEmpty())
|
||||||
|
val processClass = docs.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == "Process" }
|
||||||
|
assertNotNull("Should contain Process class", processClass)
|
||||||
|
assertTrue("Process should have members", processClass!!.members.isNotEmpty())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -32,6 +32,7 @@ group = "net.sergeych"
|
|||||||
version = "0.0.1-SNAPSHOT"
|
version = "0.0.1-SNAPSHOT"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
|
jvmToolchain(17)
|
||||||
jvm()
|
jvm()
|
||||||
androidTarget {
|
androidTarget {
|
||||||
publishLibraryVariants("release")
|
publishLibraryVariants("release")
|
||||||
|
|||||||
@@ -39,43 +39,174 @@ object FsBuiltinDocs {
|
|||||||
name = "Path",
|
name = "Path",
|
||||||
doc = "Filesystem path class. Construct with a string: `Path(\"/tmp\")`."
|
doc = "Filesystem path class. Construct with a string: `Path(\"/tmp\")`."
|
||||||
) {
|
) {
|
||||||
// Common instance methods (subset sufficient for Quick Docs)
|
method(
|
||||||
|
name = "name",
|
||||||
|
doc = "Base name of the path (last segment).",
|
||||||
|
returns = type("lyng.String")
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "parent",
|
||||||
|
doc = "Parent directory as a Path or null if none.",
|
||||||
|
returns = type("Path", nullable = true)
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "segments",
|
||||||
|
doc = "List of path segments.",
|
||||||
|
returns = TypeGenericDoc(type("lyng.List"), listOf(type("lyng.String")))
|
||||||
|
)
|
||||||
method(
|
method(
|
||||||
name = "exists",
|
name = "exists",
|
||||||
doc = "Whether the path exists on the filesystem.",
|
doc = "Check whether this path exists on the filesystem.",
|
||||||
returns = type("lyng.Bool")
|
returns = type("lyng.Bool")
|
||||||
)
|
)
|
||||||
method(
|
method(
|
||||||
name = "isFile",
|
name = "isFile",
|
||||||
doc = "Whether the path exists and is a file.",
|
doc = "True if this path is a regular file (based on cached metadata).",
|
||||||
returns = type("lyng.Bool")
|
returns = type("lyng.Bool")
|
||||||
)
|
)
|
||||||
method(
|
method(
|
||||||
name = "isDir",
|
name = "isDirectory",
|
||||||
doc = "Whether the path exists and is a directory.",
|
doc = "True if this path is a directory (based on cached metadata).",
|
||||||
returns = type("lyng.Bool")
|
returns = type("lyng.Bool")
|
||||||
)
|
)
|
||||||
|
method(
|
||||||
|
name = "size",
|
||||||
|
doc = "File size in bytes, or null when unavailable.",
|
||||||
|
returns = type("lyng.Int", nullable = true)
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "createdAt",
|
||||||
|
doc = "Creation time as `Instant`, or null when unavailable.",
|
||||||
|
returns = type("lyng.Instant", nullable = true)
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "createdAtMillis",
|
||||||
|
doc = "Creation time in milliseconds since epoch, or null when unavailable.",
|
||||||
|
returns = type("lyng.Int", nullable = true)
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "modifiedAt",
|
||||||
|
doc = "Last modification time as `Instant`, or null when unavailable.",
|
||||||
|
returns = type("lyng.Instant", nullable = true)
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "modifiedAtMillis",
|
||||||
|
doc = "Last modification time in milliseconds since epoch, or null when unavailable.",
|
||||||
|
returns = type("lyng.Int", nullable = true)
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "list",
|
||||||
|
doc = "List directory entries as `Path` objects.",
|
||||||
|
returns = TypeGenericDoc(type("lyng.List"), listOf(type("Path")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "readBytes",
|
||||||
|
doc = "Read the entire file into a binary buffer.",
|
||||||
|
returns = type("lyng.Buffer")
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "writeBytes",
|
||||||
|
doc = "Write a binary buffer to the file, replacing content.",
|
||||||
|
params = listOf(ParamDoc("bytes", type("lyng.Buffer")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "appendBytes",
|
||||||
|
doc = "Append a binary buffer to the end of the file.",
|
||||||
|
params = listOf(ParamDoc("bytes", type("lyng.Buffer")))
|
||||||
|
)
|
||||||
method(
|
method(
|
||||||
name = "readUtf8",
|
name = "readUtf8",
|
||||||
doc = "Read the entire file as UTF-8 string.",
|
doc = "Read the entire file as a UTF-8 string.",
|
||||||
returns = type("lyng.String")
|
returns = type("lyng.String")
|
||||||
)
|
)
|
||||||
method(
|
method(
|
||||||
name = "writeUtf8",
|
name = "writeUtf8",
|
||||||
doc = "Write UTF-8 string to the file (overwrite).",
|
doc = "Write a UTF-8 string to the file, replacing content.",
|
||||||
params = listOf(ParamDoc("text", type("lyng.String")))
|
params = listOf(ParamDoc("text", type("lyng.String")))
|
||||||
)
|
)
|
||||||
method(
|
method(
|
||||||
name = "bytes",
|
name = "appendUtf8",
|
||||||
doc = "Iterate file content as `Buffer` chunks.",
|
doc = "Append UTF-8 text to the end of the file.",
|
||||||
|
params = listOf(ParamDoc("text", type("lyng.String")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "metadata",
|
||||||
|
doc = "Fetch cached metadata as a map of fields: `isFile`, `isDirectory`, `size`, `createdAtMillis`, `modifiedAtMillis`, `isSymlink`.",
|
||||||
|
returns = TypeGenericDoc(type("lyng.Map"), listOf(type("lyng.String"), type("lyng.Any")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "mkdirs",
|
||||||
|
doc = "Create directories (like `mkdir -p`). If `mustCreate` is true and the path already exists, the call fails.",
|
||||||
|
params = listOf(ParamDoc("mustCreate", type("lyng.Bool")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "move",
|
||||||
|
doc = "Move this path to a new location. `to` may be a `Path` or `String`.",
|
||||||
|
params = listOf(ParamDoc("to"), ParamDoc("overwrite", type("lyng.Bool")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "delete",
|
||||||
|
doc = "Delete this path. `recursively=true` removes directories with their contents.",
|
||||||
|
params = listOf(ParamDoc("mustExist", type("lyng.Bool")), ParamDoc("recursively", type("lyng.Bool")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "copy",
|
||||||
|
doc = "Copy this path to a new location. `to` may be a `Path` or `String`.",
|
||||||
|
params = listOf(ParamDoc("to"), ParamDoc("overwrite", type("lyng.Bool")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "glob",
|
||||||
|
doc = "List entries matching a glob pattern (no recursion).",
|
||||||
|
params = listOf(ParamDoc("pattern", type("lyng.String"))),
|
||||||
|
returns = TypeGenericDoc(type("lyng.List"), listOf(type("Path")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "readChunks",
|
||||||
|
doc = "Read file in fixed-size chunks as an iterator of `Buffer`.",
|
||||||
params = listOf(ParamDoc("size", type("lyng.Int"))),
|
params = listOf(ParamDoc("size", type("lyng.Int"))),
|
||||||
returns = TypeGenericDoc(type("lyng.Iterator"), listOf(type("lyng.Buffer")))
|
returns = TypeGenericDoc(type("lyng.Iterator"), listOf(type("lyng.Buffer")))
|
||||||
)
|
)
|
||||||
method(
|
method(
|
||||||
name = "lines",
|
name = "readUtf8Chunks",
|
||||||
doc = "Iterate file as lines of text.",
|
doc = "Read UTF-8 text in fixed-size chunks as an iterator of `String`.",
|
||||||
|
params = listOf(ParamDoc("size", type("lyng.Int"))),
|
||||||
returns = TypeGenericDoc(type("lyng.Iterator"), listOf(type("lyng.String")))
|
returns = TypeGenericDoc(type("lyng.Iterator"), listOf(type("lyng.String")))
|
||||||
)
|
)
|
||||||
|
method(
|
||||||
|
name = "lines",
|
||||||
|
doc = "Iterate lines of the file as `String` values.",
|
||||||
|
returns = TypeGenericDoc(type("lyng.Iterator"), listOf(type("lyng.String")))
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
classDoc(
|
||||||
|
name = "BytesIterator",
|
||||||
|
doc = "Iterator over binary chunks."
|
||||||
|
) {
|
||||||
|
method("iterator", "Return this iterator instance.", returns = type("BytesIterator"))
|
||||||
|
method("hasNext", "Whether there is another chunk available.", returns = type("lyng.Bool"))
|
||||||
|
method("next", "Return the next chunk as a `Buffer`.", returns = type("lyng.Buffer"))
|
||||||
|
method("cancelIteration", "Stop the iteration early.")
|
||||||
|
}
|
||||||
|
|
||||||
|
classDoc(
|
||||||
|
name = "StringChunksIterator",
|
||||||
|
doc = "Iterator over UTF-8 text chunks."
|
||||||
|
) {
|
||||||
|
method("iterator", "Return this iterator instance.", returns = type("StringChunksIterator"))
|
||||||
|
method("hasNext", "Whether there is another chunk available.", returns = type("lyng.Bool"))
|
||||||
|
method("next", "Return the next UTF-8 chunk as a `String`.", returns = type("lyng.String"))
|
||||||
|
method("cancelIteration", "Stop the iteration early.")
|
||||||
|
}
|
||||||
|
|
||||||
|
classDoc(
|
||||||
|
name = "LinesIterator",
|
||||||
|
doc = "Iterator that yields lines of text."
|
||||||
|
) {
|
||||||
|
method("iterator", "Return this iterator instance.", returns = type("LinesIterator"))
|
||||||
|
method("hasNext", "Whether another line is available.", returns = type("lyng.Bool"))
|
||||||
|
method("next", "Return the next line as `String`.", returns = type("lyng.String"))
|
||||||
|
method("cancelIteration", "Stop the iteration early.")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Top-level exported constants
|
// Top-level exported constants
|
||||||
|
|||||||
@@ -0,0 +1,117 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.docs
|
||||||
|
|
||||||
|
import net.sergeych.lyng.miniast.BuiltinDocRegistry
|
||||||
|
import net.sergeych.lyng.miniast.ParamDoc
|
||||||
|
import net.sergeych.lyng.miniast.type
|
||||||
|
|
||||||
|
object ProcessBuiltinDocs {
|
||||||
|
private var registered = false
|
||||||
|
|
||||||
|
fun ensure() {
|
||||||
|
if (registered) return
|
||||||
|
BuiltinDocRegistry.module("lyng.io.process") {
|
||||||
|
classDoc(
|
||||||
|
name = "Process",
|
||||||
|
doc = "Process execution and control."
|
||||||
|
) {
|
||||||
|
method(
|
||||||
|
name = "execute",
|
||||||
|
doc = "Execute a process with arguments.",
|
||||||
|
params = listOf(ParamDoc("executable", type("lyng.String")), ParamDoc("args", type("lyng.List"))),
|
||||||
|
returns = type("RunningProcess"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "shell",
|
||||||
|
doc = "Execute a command via system shell.",
|
||||||
|
params = listOf(ParamDoc("command", type("lyng.String"))),
|
||||||
|
returns = type("RunningProcess"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
classDoc(
|
||||||
|
name = "Platform",
|
||||||
|
doc = "Platform information."
|
||||||
|
) {
|
||||||
|
method(
|
||||||
|
name = "details",
|
||||||
|
doc = "Get platform core details.",
|
||||||
|
returns = type("lyng.Map"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "isSupported",
|
||||||
|
doc = "Check if processes are supported on this platform.",
|
||||||
|
returns = type("lyng.Bool"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
classDoc(
|
||||||
|
name = "RunningProcess",
|
||||||
|
doc = "Handle to a running process."
|
||||||
|
) {
|
||||||
|
method(
|
||||||
|
name = "stdout",
|
||||||
|
doc = "Get standard output stream as a Flow of lines.",
|
||||||
|
returns = type("lyng.Flow")
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "stderr",
|
||||||
|
doc = "Get standard error stream as a Flow of lines.",
|
||||||
|
returns = type("lyng.Flow")
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "signal",
|
||||||
|
doc = "Send a signal to the process (e.g. 'SIGINT', 'SIGTERM', 'SIGKILL').",
|
||||||
|
params = listOf(ParamDoc("signal", type("lyng.String")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "waitFor",
|
||||||
|
doc = "Wait for the process to exit and return its exit code.",
|
||||||
|
returns = type("lyng.Int")
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "destroy",
|
||||||
|
doc = "Forcefully terminate the process."
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Top-level exported constants
|
||||||
|
valDoc(
|
||||||
|
name = "Process",
|
||||||
|
doc = "Process execution and control.",
|
||||||
|
type = type("Process")
|
||||||
|
)
|
||||||
|
valDoc(
|
||||||
|
name = "Platform",
|
||||||
|
doc = "Platform information.",
|
||||||
|
type = type("Platform")
|
||||||
|
)
|
||||||
|
valDoc(
|
||||||
|
name = "RunningProcess",
|
||||||
|
doc = "Handle to a running process.",
|
||||||
|
type = type("RunningProcess")
|
||||||
|
)
|
||||||
|
}
|
||||||
|
registered = true
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
|
|||||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
|
|
||||||
group = "net.sergeych"
|
group = "net.sergeych"
|
||||||
version = "1.1.1-SNAPSHOT"
|
version = "1.2.0"
|
||||||
|
|
||||||
// Removed legacy buildscript classpath declarations; plugins are applied via the plugins DSL below
|
// Removed legacy buildscript classpath declarations; plugins are applied via the plugins DSL below
|
||||||
|
|
||||||
@@ -46,6 +46,7 @@ buildkonfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
|
jvmToolchain(17)
|
||||||
jvm()
|
jvm()
|
||||||
androidTarget {
|
androidTarget {
|
||||||
publishLibraryVariants("release")
|
publishLibraryVariants("release")
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ actual object ArgBuilderProvider {
|
|||||||
private val tl = object : ThreadLocal<AndroidArgsBuilder>() {
|
private val tl = object : ThreadLocal<AndroidArgsBuilder>() {
|
||||||
override fun initialValue(): AndroidArgsBuilder = AndroidArgsBuilder()
|
override fun initialValue(): AndroidArgsBuilder = AndroidArgsBuilder()
|
||||||
}
|
}
|
||||||
actual fun acquire(): ArgsBuilder = tl.get()
|
actual fun acquire(): ArgsBuilder = tl.get()!!
|
||||||
}
|
}
|
||||||
|
|
||||||
private class AndroidArgsBuilder : ArgsBuilder {
|
private class AndroidArgsBuilder : ArgsBuilder {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -23,7 +23,7 @@ actual object PerfDefaults {
|
|||||||
|
|
||||||
actual val ARG_BUILDER: Boolean = true
|
actual val ARG_BUILDER: Boolean = true
|
||||||
actual val SKIP_ARGS_ON_NULL_RECEIVER: Boolean = true
|
actual val SKIP_ARGS_ON_NULL_RECEIVER: Boolean = true
|
||||||
actual val SCOPE_POOL: Boolean = false
|
actual val SCOPE_POOL: Boolean = true
|
||||||
|
|
||||||
actual val FIELD_PIC: Boolean = true
|
actual val FIELD_PIC: Boolean = true
|
||||||
actual val METHOD_PIC: Boolean = true
|
actual val METHOD_PIC: Boolean = true
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -18,7 +18,6 @@
|
|||||||
package net.sergeych.lyng
|
package net.sergeych.lyng
|
||||||
|
|
||||||
import net.sergeych.lyng.obj.Obj
|
import net.sergeych.lyng.obj.Obj
|
||||||
import net.sergeych.lyng.obj.ObjVoid
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Android actual: per-thread scope frame pool backed by ThreadLocal.
|
* Android actual: per-thread scope frame pool backed by ThreadLocal.
|
||||||
@@ -38,24 +37,31 @@ actual object ScopePool {
|
|||||||
|
|
||||||
actual fun borrow(parent: Scope, args: Arguments, pos: Pos, thisObj: Obj): Scope {
|
actual fun borrow(parent: Scope, args: Arguments, pos: Pos, thisObj: Obj): Scope {
|
||||||
val pool = pool()
|
val pool = pool()
|
||||||
val s = if (pool.isNotEmpty()) pool.removeLast() else Scope(parent, args, pos, thisObj)
|
if (pool.isNotEmpty()) {
|
||||||
return try {
|
val s = pool.removeLast()
|
||||||
if (s.parent !== parent || s.args !== args || s.pos !== pos || s.thisObj !== thisObj) {
|
try {
|
||||||
|
// Re-initialize pooled instance
|
||||||
s.resetForReuse(parent, args, pos, thisObj)
|
s.resetForReuse(parent, args, pos, thisObj)
|
||||||
} else {
|
return s
|
||||||
s.frameId = nextFrameId()
|
} catch (e: IllegalStateException) {
|
||||||
|
// Defensive fallback: if a cycle in scope parent chain is detected during reuse,
|
||||||
|
// discard pooled instance for this call frame and allocate a fresh scope instead.
|
||||||
|
if (e.message?.contains("cycle") == true && e.message?.contains("scope parent chain") == true) {
|
||||||
|
return Scope(parent, args, pos, thisObj)
|
||||||
|
} else {
|
||||||
|
throw e
|
||||||
|
}
|
||||||
}
|
}
|
||||||
s
|
|
||||||
} catch (e: IllegalStateException) {
|
|
||||||
if (e.message?.contains("cycle") == true && e.message?.contains("scope parent chain") == true) {
|
|
||||||
Scope(parent, args, pos, thisObj)
|
|
||||||
} else throw e
|
|
||||||
}
|
}
|
||||||
|
return Scope(parent, args, pos, thisObj)
|
||||||
}
|
}
|
||||||
|
|
||||||
actual fun release(scope: Scope) {
|
actual fun release(scope: Scope) {
|
||||||
val pool = pool()
|
val pool = pool()
|
||||||
scope.resetForReuse(parent = null, args = Arguments.EMPTY, pos = Pos.builtIn, thisObj = ObjVoid)
|
if (pool.size < MAX_POOL_SIZE) {
|
||||||
if (pool.size < MAX_POOL_SIZE) pool.addLast(scope)
|
// Scrub sensitive references to avoid accidental retention before returning to pool
|
||||||
|
scope.scrub()
|
||||||
|
pool.addLast(scope)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -51,6 +51,32 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
|
|||||||
defaultVisibility: Visibility = Visibility.Public,
|
defaultVisibility: Visibility = Visibility.Public,
|
||||||
declaringClass: net.sergeych.lyng.obj.ObjClass? = scope.currentClassCtx
|
declaringClass: net.sergeych.lyng.obj.ObjClass? = scope.currentClassCtx
|
||||||
) {
|
) {
|
||||||
|
// Fast path for simple positional-only calls with no ellipsis and no defaults
|
||||||
|
if (arguments.named.isEmpty() && !arguments.tailBlockMode) {
|
||||||
|
var hasComplex = false
|
||||||
|
for (p in params) {
|
||||||
|
if (p.isEllipsis || p.defaultValue != null) {
|
||||||
|
hasComplex = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!hasComplex) {
|
||||||
|
if (arguments.list.size != params.size)
|
||||||
|
scope.raiseIllegalArgument("expected ${params.size} arguments, got ${arguments.list.size}")
|
||||||
|
|
||||||
|
for (i in params.indices) {
|
||||||
|
val a = params[i]
|
||||||
|
val value = arguments.list[i]
|
||||||
|
scope.addItem(a.name, (a.accessType ?: defaultAccessType).isMutable,
|
||||||
|
value.byValueCopy(),
|
||||||
|
a.visibility ?: defaultVisibility,
|
||||||
|
recordType = ObjRecord.Type.Argument,
|
||||||
|
declaringClass = declaringClass)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun assign(a: Item, value: Obj) {
|
fun assign(a: Item, value: Obj) {
|
||||||
scope.addItem(a.name, (a.accessType ?: defaultAccessType).isMutable,
|
scope.addItem(a.name, (a.accessType ?: defaultAccessType).isMutable,
|
||||||
value.byValueCopy(),
|
value.byValueCopy(),
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -17,6 +17,8 @@
|
|||||||
|
|
||||||
package net.sergeych.lyng
|
package net.sergeych.lyng
|
||||||
|
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjClass
|
||||||
import net.sergeych.lyng.obj.ObjRecord
|
import net.sergeych.lyng.obj.ObjRecord
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -38,133 +40,34 @@ class ClosureScope(val callScope: Scope, val closureScope: Scope) :
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun get(name: String): ObjRecord? {
|
override fun get(name: String): ObjRecord? {
|
||||||
// Fast-path built-ins
|
|
||||||
if (name == "this") return thisObj.asReadonly
|
if (name == "this") return thisObj.asReadonly
|
||||||
|
|
||||||
// Priority:
|
// 1. Current frame locals (parameters, local variables)
|
||||||
// 1) Locals and arguments declared in this lambda frame (including values defined before suspension)
|
tryGetLocalRecord(this, name, currentClassCtx)?.let { return it }
|
||||||
// 2) Instance/class members of the captured receiver (`closureScope.thisObj`)
|
|
||||||
// 3) Symbols from the captured closure scope chain (locals/parents), ignoring nested ClosureScope overrides
|
|
||||||
// 4) Instance members of the caller's `this` (e.g., FlowBuilder.emit)
|
|
||||||
// 5) Symbols from the caller chain (locals/parents), ignoring nested ClosureScope overrides
|
|
||||||
// 6) Special fallback for module pseudo-symbols (e.g., __PACKAGE__)
|
|
||||||
|
|
||||||
// 1) Locals/arguments in this closure frame
|
// 2. Lexical environment (captured locals from entire ancestry)
|
||||||
super.objects[name]?.let { return it }
|
closureScope.chainLookupIgnoreClosure(name, followClosure = true, caller = currentClassCtx)?.let { return it }
|
||||||
super.localBindings[name]?.let { return it }
|
|
||||||
|
|
||||||
// 1a) Priority: if we are in a class context, prefer our own private members to support
|
// 3. Lexical this members (captured receiver)
|
||||||
// non-virtual private dispatch. This prevents a subclass from accidentally
|
val receiver = thisObj
|
||||||
// capturing a private member call from a base class.
|
val effectiveClass = receiver as? ObjClass ?: receiver.objClass
|
||||||
// We only return non-field/non-property members (methods) here; fields must
|
for (cls in effectiveClass.mro) {
|
||||||
// be resolved via instance storage in priority 2.
|
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
||||||
currentClassCtx?.let { ctx ->
|
if (rec != null && !rec.isAbstract) {
|
||||||
ctx.members[name]?.let { rec ->
|
if (canAccessMember(rec.visibility, rec.declaringClass ?: cls, currentClassCtx)) {
|
||||||
if (rec.visibility == Visibility.Private &&
|
return rec.copy(receiver = receiver)
|
||||||
rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Field &&
|
|
||||||
rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Property) return rec
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 2) Members on the captured receiver instance
|
|
||||||
(closureScope.thisObj as? net.sergeych.lyng.obj.ObjInstance)?.let { inst ->
|
|
||||||
// Check direct locals in instance scope (unmangled)
|
|
||||||
inst.instanceScope.objects[name]?.let { rec ->
|
|
||||||
if (rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Property &&
|
|
||||||
canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) return rec
|
|
||||||
}
|
|
||||||
// Check mangled names for fields along MRO
|
|
||||||
for (cls in inst.objClass.mro) {
|
|
||||||
inst.instanceScope.objects["${cls.className}::$name"]?.let { rec ->
|
|
||||||
if (rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Property &&
|
|
||||||
canAccessMember(rec.visibility, rec.declaringClass ?: cls, currentClassCtx)) return rec
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Finally, root object fallback
|
||||||
findExtension(closureScope.thisObj.objClass, name)?.let { return it }
|
Obj.rootObjectType.members[name]?.let { rec ->
|
||||||
closureScope.thisObj.objClass.getInstanceMemberOrNull(name)?.let { rec ->
|
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) {
|
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) {
|
||||||
// Return only non-field/non-property members (methods) from class-level records.
|
return rec.copy(receiver = receiver)
|
||||||
// Fields and properties must be resolved via instance storage (mangled) or readField.
|
|
||||||
if (rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Field &&
|
|
||||||
rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Property &&
|
|
||||||
!rec.isAbstract) return rec
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3) Closure scope chain (locals/parents + members), ignore ClosureScope overrides to prevent recursion
|
// 4. Call environment (caller locals, caller this, and global fallback)
|
||||||
closureScope.chainLookupWithMembers(name, currentClassCtx)?.let { return it }
|
return callScope.get(name)
|
||||||
|
|
||||||
// 4) Caller `this` members
|
|
||||||
(callScope.thisObj as? net.sergeych.lyng.obj.ObjInstance)?.let { inst ->
|
|
||||||
// Check direct locals in instance scope (unmangled)
|
|
||||||
inst.instanceScope.objects[name]?.let { rec ->
|
|
||||||
if (rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Property &&
|
|
||||||
canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) return rec
|
|
||||||
}
|
|
||||||
// Check mangled names for fields along MRO
|
|
||||||
for (cls in inst.objClass.mro) {
|
|
||||||
inst.instanceScope.objects["${cls.className}::$name"]?.let { rec ->
|
|
||||||
if (rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Property &&
|
|
||||||
canAccessMember(rec.visibility, rec.declaringClass ?: cls, currentClassCtx)) return rec
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
findExtension(callScope.thisObj.objClass, name)?.let { return it }
|
|
||||||
callScope.thisObj.objClass.getInstanceMemberOrNull(name)?.let { rec ->
|
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) {
|
|
||||||
if (rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Field &&
|
|
||||||
rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Property &&
|
|
||||||
!rec.isAbstract) return rec
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 5) Caller chain (locals/parents + members)
|
|
||||||
callScope.chainLookupWithMembers(name, currentClassCtx)?.let { return it }
|
|
||||||
|
|
||||||
// 6) Module pseudo-symbols (e.g., __PACKAGE__) — walk caller ancestry and query ModuleScope directly
|
|
||||||
if (name.startsWith("__")) {
|
|
||||||
var s: Scope? = callScope
|
|
||||||
val visited = HashSet<Long>(4)
|
|
||||||
while (s != null) {
|
|
||||||
if (!visited.add(s.frameId)) break
|
|
||||||
if (s is ModuleScope) return s.get(name)
|
|
||||||
s = s.parent
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 7) Direct module/global fallback: try to locate nearest ModuleScope and check its own locals
|
|
||||||
fun lookupInModuleAncestry(from: Scope): ObjRecord? {
|
|
||||||
var s: Scope? = from
|
|
||||||
val visited = HashSet<Long>(4)
|
|
||||||
while (s != null) {
|
|
||||||
if (!visited.add(s.frameId)) break
|
|
||||||
if (s is ModuleScope) {
|
|
||||||
s.objects[name]?.let { return it }
|
|
||||||
s.localBindings[name]?.let { return it }
|
|
||||||
// check immediate parent (root scope) locals/constants for globals like `delay`
|
|
||||||
val p = s.parent
|
|
||||||
if (p != null) {
|
|
||||||
p.objects[name]?.let { return it }
|
|
||||||
p.localBindings[name]?.let { return it }
|
|
||||||
p.thisObj.objClass.getInstanceMemberOrNull(name)?.let { return it }
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
s = s.parent
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
lookupInModuleAncestry(closureScope)?.let { return it }
|
|
||||||
lookupInModuleAncestry(callScope)?.let { return it }
|
|
||||||
|
|
||||||
// 8) Global root scope constants/functions (e.g., delay, yield) via current import provider
|
|
||||||
runCatching { this.currentImportProvider.rootScope.objects[name] }.getOrNull()?.let { return it }
|
|
||||||
|
|
||||||
// Final safe fallback: base scope lookup from this frame walking raw parents
|
|
||||||
return baseGetIgnoreClosure(name)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ package net.sergeych.lyng
|
|||||||
sealed class CodeContext {
|
sealed class CodeContext {
|
||||||
class Module(@Suppress("unused") val packageName: String?): CodeContext()
|
class Module(@Suppress("unused") val packageName: String?): CodeContext()
|
||||||
class Function(val name: String): CodeContext()
|
class Function(val name: String): CodeContext()
|
||||||
class ClassBody(val name: String): CodeContext() {
|
class ClassBody(val name: String, val isExtern: Boolean = false): CodeContext() {
|
||||||
val pendingInitializations = mutableMapOf<String, Pos>()
|
val pendingInitializations = mutableMapOf<String, Pos>()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -20,6 +20,7 @@ package net.sergeych.lyng
|
|||||||
import net.sergeych.lyng.Compiler.Companion.compile
|
import net.sergeych.lyng.Compiler.Companion.compile
|
||||||
import net.sergeych.lyng.miniast.*
|
import net.sergeych.lyng.miniast.*
|
||||||
import net.sergeych.lyng.obj.*
|
import net.sergeych.lyng.obj.*
|
||||||
|
import net.sergeych.lyng.pacman.ImportManager
|
||||||
import net.sergeych.lyng.pacman.ImportProvider
|
import net.sergeych.lyng.pacman.ImportProvider
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -115,10 +116,8 @@ class Compiler(
|
|||||||
|
|
||||||
private fun consumePendingDoc(): MiniDoc? {
|
private fun consumePendingDoc(): MiniDoc? {
|
||||||
if (pendingDocLines.isEmpty()) return null
|
if (pendingDocLines.isEmpty()) return null
|
||||||
val raw = pendingDocLines.joinToString("\n").trimEnd()
|
|
||||||
val summary = raw.lines().firstOrNull { it.isNotBlank() }?.trim()
|
|
||||||
val start = pendingDocStart ?: cc.currentPos()
|
val start = pendingDocStart ?: cc.currentPos()
|
||||||
val doc = MiniDoc(MiniRange(start, start), raw = raw, summary = summary)
|
val doc = MiniDoc.parse(MiniRange(start, start), pendingDocLines)
|
||||||
clearPendingDoc()
|
clearPendingDoc()
|
||||||
return doc
|
return doc
|
||||||
}
|
}
|
||||||
@@ -168,9 +167,9 @@ class Compiler(
|
|||||||
miniSink?.onScriptStart(start)
|
miniSink?.onScriptStart(start)
|
||||||
do {
|
do {
|
||||||
val t = cc.current()
|
val t = cc.current()
|
||||||
if (t.type == Token.Type.NEWLINE || t.type == Token.Type.SINLGE_LINE_COMMENT || t.type == Token.Type.MULTILINE_COMMENT) {
|
if (t.type == Token.Type.NEWLINE || t.type == Token.Type.SINGLE_LINE_COMMENT || t.type == Token.Type.MULTILINE_COMMENT) {
|
||||||
when (t.type) {
|
when (t.type) {
|
||||||
Token.Type.SINLGE_LINE_COMMENT, Token.Type.MULTILINE_COMMENT -> pushPendingDocToken(t)
|
Token.Type.SINGLE_LINE_COMMENT, Token.Type.MULTILINE_COMMENT -> pushPendingDocToken(t)
|
||||||
Token.Type.NEWLINE -> {
|
Token.Type.NEWLINE -> {
|
||||||
// A standalone newline not immediately following a comment resets doc buffer
|
// A standalone newline not immediately following a comment resets doc buffer
|
||||||
if (!prevWasComment) clearPendingDoc() else prevWasComment = false
|
if (!prevWasComment) clearPendingDoc() else prevWasComment = false
|
||||||
@@ -315,7 +314,7 @@ class Compiler(
|
|||||||
}
|
}
|
||||||
|
|
||||||
Token.Type.LABEL -> continue
|
Token.Type.LABEL -> continue
|
||||||
Token.Type.SINLGE_LINE_COMMENT, Token.Type.MULTILINE_COMMENT -> continue
|
Token.Type.SINGLE_LINE_COMMENT, Token.Type.MULTILINE_COMMENT -> continue
|
||||||
|
|
||||||
Token.Type.NEWLINE -> continue
|
Token.Type.NEWLINE -> continue
|
||||||
|
|
||||||
@@ -406,7 +405,7 @@ class Compiler(
|
|||||||
val t = cc.next()
|
val t = cc.next()
|
||||||
val startPos = t.pos
|
val startPos = t.pos
|
||||||
when (t.type) {
|
when (t.type) {
|
||||||
// Token.Type.NEWLINE, Token.Type.SINLGE_LINE_COMMENT, Token.Type.MULTILINE_COMMENT-> {
|
// Token.Type.NEWLINE, Token.Type.SINGLE_LINE_COMMENT, Token.Type.MULTILINE_COMMENT-> {
|
||||||
// continue
|
// continue
|
||||||
// }
|
// }
|
||||||
|
|
||||||
@@ -605,7 +604,7 @@ class Compiler(
|
|||||||
// to skip in parseExpression:
|
// to skip in parseExpression:
|
||||||
val current = cc.current()
|
val current = cc.current()
|
||||||
val right =
|
val right =
|
||||||
if (current.type == Token.Type.NEWLINE || current.type == Token.Type.SINLGE_LINE_COMMENT)
|
if (current.type == Token.Type.NEWLINE || current.type == Token.Type.SINGLE_LINE_COMMENT)
|
||||||
null
|
null
|
||||||
else
|
else
|
||||||
parseExpression()
|
parseExpression()
|
||||||
@@ -666,19 +665,25 @@ class Compiler(
|
|||||||
"lambda must have either valid arguments declaration with '->' or no arguments"
|
"lambda must have either valid arguments declaration with '->' or no arguments"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
val paramNames = argsDeclaration?.params?.map { it.name } ?: emptyList()
|
||||||
|
|
||||||
label?.let { cc.labels.add(it) }
|
label?.let { cc.labels.add(it) }
|
||||||
val body = parseBlock(skipLeadingBrace = true)
|
val body = inCodeContext(CodeContext.Function("<lambda>")) {
|
||||||
|
withLocalNames(paramNames.toSet()) {
|
||||||
|
parseBlock(skipLeadingBrace = true)
|
||||||
|
}
|
||||||
|
}
|
||||||
label?.let { cc.labels.remove(it) }
|
label?.let { cc.labels.remove(it) }
|
||||||
|
|
||||||
return ValueFnRef { closureScope ->
|
return ValueFnRef { closureScope ->
|
||||||
statement {
|
statement(body.pos) { scope ->
|
||||||
// and the source closure of the lambda which might have other thisObj.
|
// and the source closure of the lambda which might have other thisObj.
|
||||||
val context = this.applyClosure(closureScope)
|
val context = scope.applyClosure(closureScope)
|
||||||
// Execute lambda body in a closure-aware context. Blocks inside the lambda
|
// Execute lambda body in a closure-aware context. Blocks inside the lambda
|
||||||
// will create child scopes as usual, so re-declarations inside loops work.
|
// will create child scopes as usual, so re-declarations inside loops work.
|
||||||
if (argsDeclaration == null) {
|
if (argsDeclaration == null) {
|
||||||
// no args: automatic var 'it'
|
// no args: automatic var 'it'
|
||||||
val l = args.list
|
val l = scope.args.list
|
||||||
val itValue: Obj = when (l.size) {
|
val itValue: Obj = when (l.size) {
|
||||||
// no args: it == void
|
// no args: it == void
|
||||||
0 -> ObjVoid
|
0 -> ObjVoid
|
||||||
@@ -880,7 +885,7 @@ class Compiler(
|
|||||||
}
|
}
|
||||||
|
|
||||||
Token.Type.NEWLINE -> {}
|
Token.Type.NEWLINE -> {}
|
||||||
Token.Type.MULTILINE_COMMENT, Token.Type.SINLGE_LINE_COMMENT -> {}
|
Token.Type.MULTILINE_COMMENT, Token.Type.SINGLE_LINE_COMMENT -> {}
|
||||||
|
|
||||||
Token.Type.ID -> {
|
Token.Type.ID -> {
|
||||||
// visibility
|
// visibility
|
||||||
@@ -910,12 +915,13 @@ class Compiler(
|
|||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// type information (semantic + mini syntax)
|
||||||
|
val (typeInfo, miniType) = parseTypeDeclarationWithMini()
|
||||||
|
|
||||||
var defaultValue: Statement? = null
|
var defaultValue: Statement? = null
|
||||||
cc.ifNextIs(Token.Type.ASSIGN) {
|
cc.ifNextIs(Token.Type.ASSIGN) {
|
||||||
defaultValue = parseExpression()
|
defaultValue = parseExpression()
|
||||||
}
|
}
|
||||||
// type information (semantic + mini syntax)
|
|
||||||
val (typeInfo, miniType) = parseTypeDeclarationWithMini()
|
|
||||||
val isEllipsis = cc.skipTokenOfType(Token.Type.ELLIPSIS, isOptional = true)
|
val isEllipsis = cc.skipTokenOfType(Token.Type.ELLIPSIS, isOptional = true)
|
||||||
result += ArgsDeclaration.Item(
|
result += ArgsDeclaration.Item(
|
||||||
t.value,
|
t.value,
|
||||||
@@ -973,7 +979,10 @@ class Compiler(
|
|||||||
private fun parseTypeDeclarationWithMini(): Pair<TypeDecl, MiniTypeRef?> {
|
private fun parseTypeDeclarationWithMini(): Pair<TypeDecl, MiniTypeRef?> {
|
||||||
// Only parse a type if a ':' follows; otherwise keep current behavior
|
// Only parse a type if a ':' follows; otherwise keep current behavior
|
||||||
if (!cc.skipTokenOfType(Token.Type.COLON, isOptional = true)) return Pair(TypeDecl.TypeAny, null)
|
if (!cc.skipTokenOfType(Token.Type.COLON, isOptional = true)) return Pair(TypeDecl.TypeAny, null)
|
||||||
|
return parseTypeExpressionWithMini()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun parseTypeExpressionWithMini(): Pair<TypeDecl, MiniTypeRef> {
|
||||||
// Parse a qualified base name: ID ('.' ID)*
|
// Parse a qualified base name: ID ('.' ID)*
|
||||||
val segments = mutableListOf<MiniTypeName.Segment>()
|
val segments = mutableListOf<MiniTypeName.Segment>()
|
||||||
var first = true
|
var first = true
|
||||||
@@ -1009,41 +1018,28 @@ class Compiler(
|
|||||||
else MiniGenericType(MiniRange(typeStart, rangeEnd), base, args, nullable)
|
else MiniGenericType(MiniRange(typeStart, rangeEnd), base, args, nullable)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Optional generic arguments: '<' Type (',' Type)* '>' — single-level only (no nested generics for now)
|
// Optional generic arguments: '<' Type (',' Type)* '>'
|
||||||
var args: MutableList<MiniTypeRef>? = null
|
var miniArgs: MutableList<MiniTypeRef>? = null
|
||||||
|
var semArgs: MutableList<TypeDecl>? = null
|
||||||
val afterBasePos = cc.savePos()
|
val afterBasePos = cc.savePos()
|
||||||
if (cc.skipTokenOfType(Token.Type.LT, isOptional = true)) {
|
if (cc.skipTokenOfType(Token.Type.LT, isOptional = true)) {
|
||||||
args = mutableListOf()
|
miniArgs = mutableListOf()
|
||||||
|
semArgs = mutableListOf()
|
||||||
do {
|
do {
|
||||||
// Parse argument as simple or qualified type (single level), with optional nullable '?'
|
val (argSem, argMini) = parseTypeExpressionWithMini()
|
||||||
val argSegs = mutableListOf<MiniTypeName.Segment>()
|
miniArgs += argMini
|
||||||
var argFirst = true
|
semArgs += argSem
|
||||||
val argStart = cc.currentPos()
|
|
||||||
while (true) {
|
|
||||||
val idTok = if (argFirst) cc.requireToken(
|
|
||||||
Token.Type.ID,
|
|
||||||
"type argument name expected"
|
|
||||||
) else cc.requireToken(Token.Type.ID, "identifier expected after '.' in type argument")
|
|
||||||
argFirst = false
|
|
||||||
argSegs += MiniTypeName.Segment(idTok.value, MiniRange(idTok.pos, idTok.pos))
|
|
||||||
val p = cc.savePos()
|
|
||||||
val tt = cc.next()
|
|
||||||
if (tt.type == Token.Type.DOT) continue else {
|
|
||||||
cc.restorePos(p); break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
val argNullable = cc.skipTokenOfType(Token.Type.QUESTION, isOptional = true)
|
|
||||||
val argEnd = cc.currentPos()
|
|
||||||
val argRef = MiniTypeName(MiniRange(argStart, argEnd), argSegs.toList(), nullable = argNullable)
|
|
||||||
args += argRef
|
|
||||||
|
|
||||||
val sep = cc.next()
|
val sep = cc.next()
|
||||||
when (sep.type) {
|
if (sep.type == Token.Type.COMMA) {
|
||||||
Token.Type.COMMA -> { /* continue */
|
// continue
|
||||||
}
|
} else if (sep.type == Token.Type.GT) {
|
||||||
|
break
|
||||||
Token.Type.GT -> break
|
} else if (sep.type == Token.Type.SHR) {
|
||||||
else -> sep.raiseSyntax("expected ',' or '>' in generic arguments")
|
cc.pushPendingGT()
|
||||||
|
break
|
||||||
|
} else {
|
||||||
|
sep.raiseSyntax("expected ',' or '>' in generic arguments")
|
||||||
}
|
}
|
||||||
} while (true)
|
} while (true)
|
||||||
lastEnd = cc.currentPos()
|
lastEnd = cc.currentPos()
|
||||||
@@ -1052,13 +1048,19 @@ class Compiler(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Nullable suffix after base or generic
|
// Nullable suffix after base or generic
|
||||||
val isNullable = cc.skipTokenOfType(Token.Type.QUESTION, isOptional = true)
|
val isNullable = if (cc.skipTokenOfType(Token.Type.QUESTION, isOptional = true)) {
|
||||||
|
true
|
||||||
|
} else if (cc.skipTokenOfType(Token.Type.IFNULLASSIGN, isOptional = true)) {
|
||||||
|
cc.pushPendingAssign()
|
||||||
|
true
|
||||||
|
} else false
|
||||||
val endPos = cc.currentPos()
|
val endPos = cc.currentPos()
|
||||||
|
|
||||||
val miniRef = buildBaseRef(if (args != null) endPos else lastEnd, args, isNullable)
|
val miniRef = buildBaseRef(if (miniArgs != null) endPos else lastEnd, miniArgs, isNullable)
|
||||||
// Semantic: keep simple for now, just use qualified base name with nullable flag
|
// Semantic: keep simple for now, just use qualified base name with nullable flag
|
||||||
val qualified = segments.joinToString(".") { it.name }
|
val qualified = segments.joinToString(".") { it.name }
|
||||||
val sem = TypeDecl.Simple(qualified, isNullable)
|
val sem = if (semArgs != null) TypeDecl.Generic(qualified, semArgs, isNullable)
|
||||||
|
else TypeDecl.Simple(qualified, isNullable)
|
||||||
return Pair(sem, miniRef)
|
return Pair(sem, miniRef)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1327,7 +1329,7 @@ class Compiler(
|
|||||||
"private", "protected", "static", "abstract", "closed", "override", "extern", "open" -> {
|
"private", "protected", "static", "abstract", "closed", "override", "extern", "open" -> {
|
||||||
modifiers.add(currentToken.value)
|
modifiers.add(currentToken.value)
|
||||||
val next = cc.peekNextNonWhitespace()
|
val next = cc.peekNextNonWhitespace()
|
||||||
if (next.type == Token.Type.ID) {
|
if (next.type == Token.Type.ID || next.type == Token.Type.OBJECT) {
|
||||||
currentToken = cc.next()
|
currentToken = cc.next()
|
||||||
} else {
|
} else {
|
||||||
break
|
break
|
||||||
@@ -1360,39 +1362,60 @@ class Compiler(
|
|||||||
|
|
||||||
val isMember = (codeContexts.lastOrNull() is CodeContext.ClassBody)
|
val isMember = (codeContexts.lastOrNull() is CodeContext.ClassBody)
|
||||||
|
|
||||||
if (!isMember && (isOverride || isClosed))
|
if (!isMember && isClosed)
|
||||||
throw ScriptError(currentToken.pos, "modifiers override and closed are only allowed for class members")
|
throw ScriptError(currentToken.pos, "modifier closed is only allowed for class members")
|
||||||
|
|
||||||
|
if (!isMember && isOverride && currentToken.value != "fun" && currentToken.value != "fn")
|
||||||
|
throw ScriptError(currentToken.pos, "modifier override outside class is only allowed for extension functions")
|
||||||
|
|
||||||
if (!isMember && isAbstract && currentToken.value != "class")
|
if (!isMember && isAbstract && currentToken.value != "class")
|
||||||
throw ScriptError(currentToken.pos, "modifier abstract at top level is only allowed for classes")
|
throw ScriptError(currentToken.pos, "modifier abstract at top level is only allowed for classes")
|
||||||
|
|
||||||
return when (currentToken.value) {
|
return when (currentToken.value) {
|
||||||
"val" -> parseVarDeclaration(false, visibility, isAbstract, isClosed, isOverride, isStatic)
|
"val" -> parseVarDeclaration(false, visibility, isAbstract, isClosed, isOverride, isStatic, isExtern)
|
||||||
"var" -> parseVarDeclaration(true, visibility, isAbstract, isClosed, isOverride, isStatic)
|
"var" -> parseVarDeclaration(true, visibility, isAbstract, isClosed, isOverride, isStatic, isExtern)
|
||||||
"fun", "fn" -> parseFunctionDeclaration(visibility, isAbstract, isClosed, isOverride, isExtern, isStatic)
|
"fun", "fn" -> parseFunctionDeclaration(visibility, isAbstract, isClosed, isOverride, isExtern, isStatic)
|
||||||
"class" -> {
|
"class" -> {
|
||||||
if (isStatic || isClosed || isOverride || isExtern)
|
if (isStatic || isClosed || isOverride)
|
||||||
throw ScriptError(currentToken.pos, "unsupported modifiers for class: ${modifiers.joinToString(" ")}")
|
throw ScriptError(
|
||||||
parseClassDeclaration(isAbstract)
|
currentToken.pos,
|
||||||
|
"unsupported modifiers for class: ${modifiers.joinToString(" ")}"
|
||||||
|
)
|
||||||
|
parseClassDeclaration(isAbstract, isExtern)
|
||||||
}
|
}
|
||||||
|
|
||||||
"object" -> {
|
"object" -> {
|
||||||
if (isStatic || isClosed || isOverride || isExtern || isAbstract)
|
if (isStatic || isClosed || isOverride || isAbstract)
|
||||||
throw ScriptError(currentToken.pos, "unsupported modifiers for object: ${modifiers.joinToString(" ")}")
|
throw ScriptError(
|
||||||
parseObjectDeclaration()
|
currentToken.pos,
|
||||||
|
"unsupported modifiers for object: ${modifiers.joinToString(" ")}"
|
||||||
|
)
|
||||||
|
parseObjectDeclaration(isExtern)
|
||||||
}
|
}
|
||||||
|
|
||||||
"interface" -> {
|
"interface" -> {
|
||||||
if (isStatic || isClosed || isOverride || isExtern || isAbstract)
|
if (isStatic || isClosed || isOverride || isAbstract)
|
||||||
throw ScriptError(
|
throw ScriptError(
|
||||||
currentToken.pos,
|
currentToken.pos,
|
||||||
"unsupported modifiers for interface: ${modifiers.joinToString(" ")}"
|
"unsupported modifiers for interface: ${modifiers.joinToString(" ")}"
|
||||||
)
|
)
|
||||||
// interface is synonym for abstract class
|
// interface is synonym for abstract class
|
||||||
parseClassDeclaration(isAbstract = true)
|
parseClassDeclaration(isAbstract = true, isExtern = isExtern)
|
||||||
}
|
}
|
||||||
|
|
||||||
else -> throw ScriptError(currentToken.pos, "expected declaration after modifiers, found ${currentToken.value}")
|
"enum" -> {
|
||||||
|
if (isStatic || isClosed || isOverride || isAbstract)
|
||||||
|
throw ScriptError(
|
||||||
|
currentToken.pos,
|
||||||
|
"unsupported modifiers for enum: ${modifiers.joinToString(" ")}"
|
||||||
|
)
|
||||||
|
parseEnumDeclaration(isExtern)
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> throw ScriptError(
|
||||||
|
currentToken.pos,
|
||||||
|
"expected declaration after modifiers, found ${currentToken.value}"
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1401,7 +1424,7 @@ class Compiler(
|
|||||||
* @return parsed statement or null if, for example. [id] is not among keywords
|
* @return parsed statement or null if, for example. [id] is not among keywords
|
||||||
*/
|
*/
|
||||||
private suspend fun parseKeywordStatement(id: Token): Statement? = when (id.value) {
|
private suspend fun parseKeywordStatement(id: Token): Statement? = when (id.value) {
|
||||||
"abstract", "closed", "override", "extern", "private", "protected", "static" -> {
|
"abstract", "closed", "override", "extern", "private", "protected", "static", "open" -> {
|
||||||
parseDeclarationWithModifiers(id)
|
parseDeclarationWithModifiers(id)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1456,12 +1479,21 @@ class Compiler(
|
|||||||
|
|
||||||
"init" -> {
|
"init" -> {
|
||||||
if (codeContexts.lastOrNull() is CodeContext.ClassBody && cc.peekNextNonWhitespace().type == Token.Type.LBRACE) {
|
if (codeContexts.lastOrNull() is CodeContext.ClassBody && cc.peekNextNonWhitespace().type == Token.Type.LBRACE) {
|
||||||
|
miniSink?.onEnterFunction(null)
|
||||||
val block = parseBlock()
|
val block = parseBlock()
|
||||||
|
miniSink?.onExitFunction(cc.currentPos())
|
||||||
lastParsedBlockRange?.let { range ->
|
lastParsedBlockRange?.let { range ->
|
||||||
miniSink?.onInitDecl(MiniInitDecl(MiniRange(id.pos, range.end), id.pos))
|
miniSink?.onInitDecl(MiniInitDecl(MiniRange(id.pos, range.end), id.pos))
|
||||||
}
|
}
|
||||||
val initStmt = statement(id.pos) { scp ->
|
val initStmt = statement(id.pos) { scp ->
|
||||||
block.execute(scp)
|
val cls = scp.thisObj.objClass
|
||||||
|
val saved = scp.currentClassCtx
|
||||||
|
scp.currentClassCtx = cls
|
||||||
|
try {
|
||||||
|
block.execute(scp)
|
||||||
|
} finally {
|
||||||
|
scp.currentClassCtx = saved
|
||||||
|
}
|
||||||
ObjVoid
|
ObjVoid
|
||||||
}
|
}
|
||||||
statement {
|
statement {
|
||||||
@@ -1705,19 +1737,25 @@ class Compiler(
|
|||||||
var errorObject = throwStatement.execute(sc)
|
var errorObject = throwStatement.execute(sc)
|
||||||
// Rebind error scope to the throw-site position so ScriptError.pos is accurate
|
// Rebind error scope to the throw-site position so ScriptError.pos is accurate
|
||||||
val throwScope = sc.createChildScope(pos = start)
|
val throwScope = sc.createChildScope(pos = start)
|
||||||
errorObject = when (errorObject) {
|
if (errorObject is ObjString) {
|
||||||
is ObjString -> ObjException(throwScope, errorObject.value)
|
errorObject = ObjException(throwScope, errorObject.value).apply { getStackTrace() }
|
||||||
is ObjException -> ObjException(
|
}
|
||||||
|
if (!errorObject.isInstanceOf(ObjException.Root)) {
|
||||||
|
throwScope.raiseError("this is not an exception object: $errorObject")
|
||||||
|
}
|
||||||
|
if (errorObject is ObjException) {
|
||||||
|
errorObject = ObjException(
|
||||||
errorObject.exceptionClass,
|
errorObject.exceptionClass,
|
||||||
throwScope,
|
throwScope,
|
||||||
errorObject.message,
|
errorObject.message,
|
||||||
errorObject.extraData,
|
errorObject.extraData,
|
||||||
errorObject.useStackTrace
|
errorObject.useStackTrace
|
||||||
)
|
).apply { getStackTrace() }
|
||||||
|
throwScope.raiseError(errorObject)
|
||||||
else -> throwScope.raiseError("this is not an exception object: $errorObject")
|
} else {
|
||||||
|
val msg = errorObject.invokeInstanceMethod(sc, "message").toString(sc).value
|
||||||
|
throwScope.raiseError(errorObject, start, msg)
|
||||||
}
|
}
|
||||||
throwScope.raiseError(errorObject)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1800,25 +1838,25 @@ class Compiler(
|
|||||||
throw e
|
throw e
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
// convert to appropriate exception
|
// convert to appropriate exception
|
||||||
val objException = when (e) {
|
val caughtObj = when (e) {
|
||||||
is ExecutionError -> e.errorObject
|
is ExecutionError -> e.errorObject
|
||||||
else -> ObjUnknownException(this, e.message ?: e.toString())
|
else -> ObjUnknownException(this, e.message ?: e.toString())
|
||||||
}
|
}
|
||||||
// let's see if we should catch it:
|
// let's see if we should catch it:
|
||||||
var isCaught = false
|
var isCaught = false
|
||||||
for (cdata in catches) {
|
for (cdata in catches) {
|
||||||
var exceptionObject: ObjException? = null
|
var match: Obj? = null
|
||||||
for (exceptionClassName in cdata.classNames) {
|
for (exceptionClassName in cdata.classNames) {
|
||||||
val exObj = ObjException.getErrorClass(exceptionClassName)
|
val exObj = this[exceptionClassName]?.value as? ObjClass
|
||||||
?: raiseSymbolNotFound("error clas not exists: $exceptionClassName")
|
?: raiseSymbolNotFound("error class does not exist or is not a class: $exceptionClassName")
|
||||||
if (objException.isInstanceOf(exObj)) {
|
if (caughtObj.isInstanceOf(exObj)) {
|
||||||
exceptionObject = objException
|
match = caughtObj
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (exceptionObject != null) {
|
if (match != null) {
|
||||||
val catchContext = this.createChildScope(pos = cdata.catchVar.pos)
|
val catchContext = this.createChildScope(pos = cdata.catchVar.pos)
|
||||||
catchContext.addItem(cdata.catchVar.value, false, objException)
|
catchContext.addItem(cdata.catchVar.value, false, caughtObj)
|
||||||
result = cdata.block.execute(catchContext)
|
result = cdata.block.execute(catchContext)
|
||||||
isCaught = true
|
isCaught = true
|
||||||
break
|
break
|
||||||
@@ -1835,7 +1873,7 @@ class Compiler(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun parseEnumDeclaration(): Statement {
|
private fun parseEnumDeclaration(isExtern: Boolean = false): Statement {
|
||||||
val nameToken = cc.requireToken(Token.Type.ID)
|
val nameToken = cc.requireToken(Token.Type.ID)
|
||||||
val startPos = pendingDeclStart ?: nameToken.pos
|
val startPos = pendingDeclStart ?: nameToken.pos
|
||||||
val doc = pendingDeclDoc ?: consumePendingDoc()
|
val doc = pendingDeclDoc ?: consumePendingDoc()
|
||||||
@@ -1843,6 +1881,7 @@ class Compiler(
|
|||||||
pendingDeclStart = null
|
pendingDeclStart = null
|
||||||
// so far only simplest enums:
|
// so far only simplest enums:
|
||||||
val names = mutableListOf<String>()
|
val names = mutableListOf<String>()
|
||||||
|
val positions = mutableListOf<Pos>()
|
||||||
// skip '{'
|
// skip '{'
|
||||||
cc.skipTokenOfType(Token.Type.LBRACE)
|
cc.skipTokenOfType(Token.Type.LBRACE)
|
||||||
|
|
||||||
@@ -1851,6 +1890,7 @@ class Compiler(
|
|||||||
when (t.type) {
|
when (t.type) {
|
||||||
Token.Type.ID -> {
|
Token.Type.ID -> {
|
||||||
names += t.value
|
names += t.value
|
||||||
|
positions += t.pos
|
||||||
val t1 = cc.nextNonWhitespace()
|
val t1 = cc.nextNonWhitespace()
|
||||||
when (t1.type) {
|
when (t1.type) {
|
||||||
Token.Type.COMMA ->
|
Token.Type.COMMA ->
|
||||||
@@ -1873,7 +1913,9 @@ class Compiler(
|
|||||||
name = nameToken.value,
|
name = nameToken.value,
|
||||||
entries = names,
|
entries = names,
|
||||||
doc = doc,
|
doc = doc,
|
||||||
nameStart = nameToken.pos
|
nameStart = nameToken.pos,
|
||||||
|
isExtern = isExtern,
|
||||||
|
entryPositions = positions
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -1884,7 +1926,7 @@ class Compiler(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun parseObjectDeclaration(): Statement {
|
private suspend fun parseObjectDeclaration(isExtern: Boolean = false): Statement {
|
||||||
val next = cc.peekNextNonWhitespace()
|
val next = cc.peekNextNonWhitespace()
|
||||||
val nameToken = if (next.type == Token.Type.ID) cc.requireToken(Token.Type.ID) else null
|
val nameToken = if (next.type == Token.Type.ID) cc.requireToken(Token.Type.ID) else null
|
||||||
|
|
||||||
@@ -1916,10 +1958,24 @@ class Compiler(
|
|||||||
|
|
||||||
// Robust body detection
|
// Robust body detection
|
||||||
var classBodyRange: MiniRange? = null
|
var classBodyRange: MiniRange? = null
|
||||||
val bodyInit: Statement? = inCodeContext(CodeContext.ClassBody(className)) {
|
val bodyInit: Statement? = inCodeContext(CodeContext.ClassBody(className, isExtern = isExtern)) {
|
||||||
val saved = cc.savePos()
|
val saved = cc.savePos()
|
||||||
val nextBody = cc.nextNonWhitespace()
|
val nextBody = cc.nextNonWhitespace()
|
||||||
if (nextBody.type == Token.Type.LBRACE) {
|
if (nextBody.type == Token.Type.LBRACE) {
|
||||||
|
// Emit MiniClassDecl before body parsing to track members via enter/exit
|
||||||
|
run {
|
||||||
|
val node = MiniClassDecl(
|
||||||
|
range = MiniRange(startPos, cc.currentPos()),
|
||||||
|
name = className,
|
||||||
|
bases = baseSpecs.map { it.name },
|
||||||
|
bodyRange = null,
|
||||||
|
doc = doc,
|
||||||
|
nameStart = nameToken?.pos ?: startPos,
|
||||||
|
isObject = true,
|
||||||
|
isExtern = isExtern
|
||||||
|
)
|
||||||
|
miniSink?.onEnterClass(node)
|
||||||
|
}
|
||||||
val bodyStart = nextBody.pos
|
val bodyStart = nextBody.pos
|
||||||
val st = withLocalNames(emptySet()) {
|
val st = withLocalNames(emptySet()) {
|
||||||
parseScript()
|
parseScript()
|
||||||
@@ -1927,8 +1983,23 @@ class Compiler(
|
|||||||
val rbTok = cc.next()
|
val rbTok = cc.next()
|
||||||
if (rbTok.type != Token.Type.RBRACE) throw ScriptError(rbTok.pos, "unbalanced braces in object body")
|
if (rbTok.type != Token.Type.RBRACE) throw ScriptError(rbTok.pos, "unbalanced braces in object body")
|
||||||
classBodyRange = MiniRange(bodyStart, rbTok.pos)
|
classBodyRange = MiniRange(bodyStart, rbTok.pos)
|
||||||
|
miniSink?.onExitClass(rbTok.pos)
|
||||||
st
|
st
|
||||||
} else {
|
} else {
|
||||||
|
// No body, but still emit the class
|
||||||
|
run {
|
||||||
|
val node = MiniClassDecl(
|
||||||
|
range = MiniRange(startPos, cc.currentPos()),
|
||||||
|
name = className,
|
||||||
|
bases = baseSpecs.map { it.name },
|
||||||
|
bodyRange = null,
|
||||||
|
doc = doc,
|
||||||
|
nameStart = nameToken?.pos ?: startPos,
|
||||||
|
isObject = true,
|
||||||
|
isExtern = isExtern
|
||||||
|
)
|
||||||
|
miniSink?.onClassDecl(node)
|
||||||
|
}
|
||||||
cc.restorePos(saved)
|
cc.restorePos(saved)
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
@@ -1965,13 +2036,13 @@ class Compiler(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun parseClassDeclaration(isAbstract: Boolean = false): Statement {
|
private suspend fun parseClassDeclaration(isAbstract: Boolean = false, isExtern: Boolean = false): Statement {
|
||||||
val nameToken = cc.requireToken(Token.Type.ID)
|
val nameToken = cc.requireToken(Token.Type.ID)
|
||||||
val startPos = pendingDeclStart ?: nameToken.pos
|
val startPos = pendingDeclStart ?: nameToken.pos
|
||||||
val doc = pendingDeclDoc ?: consumePendingDoc()
|
val doc = pendingDeclDoc ?: consumePendingDoc()
|
||||||
pendingDeclDoc = null
|
pendingDeclDoc = null
|
||||||
pendingDeclStart = null
|
pendingDeclStart = null
|
||||||
return inCodeContext(CodeContext.ClassBody(nameToken.value)) {
|
return inCodeContext(CodeContext.ClassBody(nameToken.value, isExtern = isExtern)) {
|
||||||
val constructorArgsDeclaration =
|
val constructorArgsDeclaration =
|
||||||
if (cc.skipTokenOfType(Token.Type.LPAREN, isOptional = true))
|
if (cc.skipTokenOfType(Token.Type.LPAREN, isOptional = true))
|
||||||
parseArgsDeclaration(isClassDeclaration = true)
|
parseArgsDeclaration(isClassDeclaration = true)
|
||||||
@@ -2009,28 +2080,7 @@ class Compiler(
|
|||||||
val bodyInit: Statement? = run {
|
val bodyInit: Statement? = run {
|
||||||
val saved = cc.savePos()
|
val saved = cc.savePos()
|
||||||
val next = cc.nextNonWhitespace()
|
val next = cc.nextNonWhitespace()
|
||||||
if (next.type == Token.Type.LBRACE) {
|
|
||||||
// parse body
|
|
||||||
val bodyStart = next.pos
|
|
||||||
val st = withLocalNames(constructorArgsDeclaration?.params?.map { it.name }?.toSet() ?: emptySet()) {
|
|
||||||
parseScript()
|
|
||||||
}
|
|
||||||
val rbTok = cc.next()
|
|
||||||
if (rbTok.type != Token.Type.RBRACE) throw ScriptError(rbTok.pos, "unbalanced braces in class body")
|
|
||||||
classBodyRange = MiniRange(bodyStart, rbTok.pos)
|
|
||||||
st
|
|
||||||
} else {
|
|
||||||
// restore if no body starts here
|
|
||||||
cc.restorePos(saved)
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Emit MiniClassDecl with collected base names; bodyRange is omitted for now
|
|
||||||
run {
|
|
||||||
val declRange = MiniRange(startPos, cc.currentPos())
|
|
||||||
val bases = baseSpecs.map { it.name }
|
|
||||||
// Collect constructor fields declared in primary constructor
|
|
||||||
val ctorFields = mutableListOf<MiniCtorField>()
|
val ctorFields = mutableListOf<MiniCtorField>()
|
||||||
constructorArgsDeclaration?.let { ad ->
|
constructorArgsDeclaration?.let { ad ->
|
||||||
for (p in ad.params) {
|
for (p in ad.params) {
|
||||||
@@ -2044,16 +2094,51 @@ class Compiler(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val node = MiniClassDecl(
|
|
||||||
range = declRange,
|
if (next.type == Token.Type.LBRACE) {
|
||||||
name = nameToken.value,
|
// Emit MiniClassDecl before body parsing to track members via enter/exit
|
||||||
bases = bases,
|
run {
|
||||||
bodyRange = classBodyRange,
|
val node = MiniClassDecl(
|
||||||
ctorFields = ctorFields,
|
range = MiniRange(startPos, cc.currentPos()),
|
||||||
doc = doc,
|
name = nameToken.value,
|
||||||
nameStart = nameToken.pos
|
bases = baseSpecs.map { it.name },
|
||||||
)
|
bodyRange = null,
|
||||||
miniSink?.onClassDecl(node)
|
ctorFields = ctorFields,
|
||||||
|
doc = doc,
|
||||||
|
nameStart = nameToken.pos,
|
||||||
|
isExtern = isExtern
|
||||||
|
)
|
||||||
|
miniSink?.onEnterClass(node)
|
||||||
|
}
|
||||||
|
// parse body
|
||||||
|
val bodyStart = next.pos
|
||||||
|
val st = withLocalNames(constructorArgsDeclaration?.params?.map { it.name }?.toSet() ?: emptySet()) {
|
||||||
|
parseScript()
|
||||||
|
}
|
||||||
|
val rbTok = cc.next()
|
||||||
|
if (rbTok.type != Token.Type.RBRACE) throw ScriptError(rbTok.pos, "unbalanced braces in class body")
|
||||||
|
classBodyRange = MiniRange(bodyStart, rbTok.pos)
|
||||||
|
miniSink?.onExitClass(rbTok.pos)
|
||||||
|
st
|
||||||
|
} else {
|
||||||
|
// No body, but still emit the class
|
||||||
|
run {
|
||||||
|
val node = MiniClassDecl(
|
||||||
|
range = MiniRange(startPos, cc.currentPos()),
|
||||||
|
name = nameToken.value,
|
||||||
|
bases = baseSpecs.map { it.name },
|
||||||
|
bodyRange = null,
|
||||||
|
ctorFields = ctorFields,
|
||||||
|
doc = doc,
|
||||||
|
nameStart = nameToken.pos,
|
||||||
|
isExtern = isExtern
|
||||||
|
)
|
||||||
|
miniSink?.onClassDecl(node)
|
||||||
|
}
|
||||||
|
// restore if no body starts here
|
||||||
|
cc.restorePos(saved)
|
||||||
|
null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val initScope = popInitScope()
|
val initScope = popInitScope()
|
||||||
@@ -2127,20 +2212,6 @@ class Compiler(
|
|||||||
for (s in initScope)
|
for (s in initScope)
|
||||||
s.execute(classScope)
|
s.execute(classScope)
|
||||||
}
|
}
|
||||||
// Fallback: ensure any functions declared in class scope are also present as instance methods
|
|
||||||
// (defensive in case some paths skipped cls.addFn during parsing/execution ordering)
|
|
||||||
for ((k, rec) in classScope.objects) {
|
|
||||||
val v = rec.value
|
|
||||||
if (v is Statement) {
|
|
||||||
if (newClass.members[k] == null) {
|
|
||||||
newClass.addFn(k, isMutable = true, pos = rec.importedFrom?.pos ?: nameToken.pos) {
|
|
||||||
(thisObj as? ObjInstance)?.let { i ->
|
|
||||||
v.execute(ClosureScope(this, i.instanceScope))
|
|
||||||
} ?: v.execute(thisObj.autoInstanceScope(this))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
newClass.checkAbstractSatisfaction(nameToken.pos)
|
newClass.checkAbstractSatisfaction(nameToken.pos)
|
||||||
// Debug summary: list registered instance methods and class-scope functions for this class
|
// Debug summary: list registered instance methods and class-scope functions for this class
|
||||||
newClass
|
newClass
|
||||||
@@ -2227,7 +2298,7 @@ class Compiler(
|
|||||||
} else if (sourceObj.isInstanceOf(ObjIterable)) {
|
} else if (sourceObj.isInstanceOf(ObjIterable)) {
|
||||||
loopIterable(forContext, sourceObj, loopSO, body, elseStatement, label, canBreak)
|
loopIterable(forContext, sourceObj, loopSO, body, elseStatement, label, canBreak)
|
||||||
} else {
|
} else {
|
||||||
val size = runCatching { sourceObj.invokeInstanceMethod(forContext, "size").toInt() }
|
val size = runCatching { sourceObj.readField(forContext, "size").value.toInt() }
|
||||||
.getOrElse {
|
.getOrElse {
|
||||||
throw ScriptError(
|
throw ScriptError(
|
||||||
tOp.pos,
|
tOp.pos,
|
||||||
@@ -2593,6 +2664,7 @@ class Compiler(
|
|||||||
isExtern: Boolean = false,
|
isExtern: Boolean = false,
|
||||||
isStatic: Boolean = false,
|
isStatic: Boolean = false,
|
||||||
): Statement {
|
): Statement {
|
||||||
|
val actualExtern = isExtern || (codeContexts.lastOrNull() as? CodeContext.ClassBody)?.isExtern == true
|
||||||
var t = cc.next()
|
var t = cc.next()
|
||||||
val start = t.pos
|
val start = t.pos
|
||||||
var extTypeName: String? = null
|
var extTypeName: String? = null
|
||||||
@@ -2651,8 +2723,7 @@ class Compiler(
|
|||||||
val declDocLocal = pendingDeclDoc
|
val declDocLocal = pendingDeclDoc
|
||||||
val outerLabel = lastLabel
|
val outerLabel = lastLabel
|
||||||
|
|
||||||
// Emit MiniFunDecl before body parsing (body range unknown yet)
|
val node = run {
|
||||||
run {
|
|
||||||
val params = argsDeclaration.params.map { p ->
|
val params = argsDeclaration.params.map { p ->
|
||||||
MiniParam(
|
MiniParam(
|
||||||
name = p.name,
|
name = p.name,
|
||||||
@@ -2669,12 +2740,16 @@ class Compiler(
|
|||||||
body = null,
|
body = null,
|
||||||
doc = declDocLocal,
|
doc = declDocLocal,
|
||||||
nameStart = nameStartPos,
|
nameStart = nameStartPos,
|
||||||
receiver = receiverMini
|
receiver = receiverMini,
|
||||||
|
isExtern = actualExtern,
|
||||||
|
isStatic = isStatic
|
||||||
)
|
)
|
||||||
miniSink?.onFunDecl(node)
|
miniSink?.onFunDecl(node)
|
||||||
pendingDeclDoc = null
|
pendingDeclDoc = null
|
||||||
|
node
|
||||||
}
|
}
|
||||||
|
|
||||||
|
miniSink?.onEnterFunction(node)
|
||||||
return inCodeContext(CodeContext.Function(name)) {
|
return inCodeContext(CodeContext.Function(name)) {
|
||||||
cc.labels.add(name)
|
cc.labels.add(name)
|
||||||
outerLabel?.let { cc.labels.add(it) }
|
outerLabel?.let { cc.labels.add(it) }
|
||||||
@@ -2684,7 +2759,7 @@ class Compiler(
|
|||||||
// Parse function body while tracking declared locals to compute precise capacity hints
|
// Parse function body while tracking declared locals to compute precise capacity hints
|
||||||
currentLocalDeclCount
|
currentLocalDeclCount
|
||||||
localDeclCountStack.add(0)
|
localDeclCountStack.add(0)
|
||||||
val fnStatements = if (isExtern)
|
val fnStatements = if (actualExtern)
|
||||||
statement { raiseError("extern function not provided: $name") }
|
statement { raiseError("extern function not provided: $name") }
|
||||||
else if (isAbstract || isDelegated) {
|
else if (isAbstract || isDelegated) {
|
||||||
null
|
null
|
||||||
@@ -2872,8 +2947,12 @@ class Compiler(
|
|||||||
returnType = returnTypeMini,
|
returnType = returnTypeMini,
|
||||||
body = bodyRange?.let { MiniBlock(it) },
|
body = bodyRange?.let { MiniBlock(it) },
|
||||||
doc = declDocLocal,
|
doc = declDocLocal,
|
||||||
nameStart = nameStartPos
|
nameStart = nameStartPos,
|
||||||
|
receiver = receiverMini,
|
||||||
|
isExtern = actualExtern,
|
||||||
|
isStatic = isStatic
|
||||||
)
|
)
|
||||||
|
miniSink?.onExitFunction(cc.currentPos())
|
||||||
miniSink?.onFunDecl(node)
|
miniSink?.onFunDecl(node)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2906,8 +2985,10 @@ class Compiler(
|
|||||||
isAbstract: Boolean = false,
|
isAbstract: Boolean = false,
|
||||||
isClosed: Boolean = false,
|
isClosed: Boolean = false,
|
||||||
isOverride: Boolean = false,
|
isOverride: Boolean = false,
|
||||||
isStatic: Boolean = false
|
isStatic: Boolean = false,
|
||||||
|
isExtern: Boolean = false
|
||||||
): Statement {
|
): Statement {
|
||||||
|
val actualExtern = isExtern || (codeContexts.lastOrNull() as? CodeContext.ClassBody)?.isExtern == true
|
||||||
val nextToken = cc.next()
|
val nextToken = cc.next()
|
||||||
val start = nextToken.pos
|
val start = nextToken.pos
|
||||||
|
|
||||||
@@ -2929,7 +3010,9 @@ class Compiler(
|
|||||||
type = null,
|
type = null,
|
||||||
initRange = null,
|
initRange = null,
|
||||||
doc = pendingDeclDoc,
|
doc = pendingDeclDoc,
|
||||||
nameStart = namePos
|
nameStart = namePos,
|
||||||
|
isExtern = actualExtern,
|
||||||
|
isStatic = false
|
||||||
)
|
)
|
||||||
miniSink?.onValDecl(node)
|
miniSink?.onValDecl(node)
|
||||||
}
|
}
|
||||||
@@ -3005,31 +3088,88 @@ class Compiler(
|
|||||||
val mark = cc.savePos()
|
val mark = cc.savePos()
|
||||||
cc.restorePos(markBeforeEq)
|
cc.restorePos(markBeforeEq)
|
||||||
cc.skipWsTokens()
|
cc.skipWsTokens()
|
||||||
val next = cc.peekNextNonWhitespace()
|
|
||||||
if (next.isId("get") || next.isId("set") || next.isId("private") || next.isId("protected")) {
|
// Heuristic: if we see 'get(' or 'set(' or 'private set(' or 'protected set(',
|
||||||
|
// look ahead for a body.
|
||||||
|
fun hasAccessorWithBody(): Boolean {
|
||||||
|
val t = cc.peekNextNonWhitespace()
|
||||||
|
if (t.isId("get") || t.isId("set")) {
|
||||||
|
val saved = cc.savePos()
|
||||||
|
cc.next() // consume get/set
|
||||||
|
val nextToken = cc.peekNextNonWhitespace()
|
||||||
|
if (nextToken.type == Token.Type.LPAREN) {
|
||||||
|
cc.next() // consume (
|
||||||
|
var depth = 1
|
||||||
|
while (cc.hasNext() && depth > 0) {
|
||||||
|
val tt = cc.next()
|
||||||
|
if (tt.type == Token.Type.LPAREN) depth++
|
||||||
|
else if (tt.type == Token.Type.RPAREN) depth--
|
||||||
|
}
|
||||||
|
val next = cc.peekNextNonWhitespace()
|
||||||
|
if (next.type == Token.Type.LBRACE || next.type == Token.Type.ASSIGN) {
|
||||||
|
cc.restorePos(saved)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
} else if (nextToken.type == Token.Type.LBRACE || nextToken.type == Token.Type.ASSIGN) {
|
||||||
|
cc.restorePos(saved)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
cc.restorePos(saved)
|
||||||
|
} else if (t.isId("private") || t.isId("protected")) {
|
||||||
|
val saved = cc.savePos()
|
||||||
|
cc.next() // consume modifier
|
||||||
|
if (cc.skipWsTokens().isId("set")) {
|
||||||
|
cc.next() // consume set
|
||||||
|
val nextToken = cc.peekNextNonWhitespace()
|
||||||
|
if (nextToken.type == Token.Type.LPAREN) {
|
||||||
|
cc.next() // consume (
|
||||||
|
var depth = 1
|
||||||
|
while (cc.hasNext() && depth > 0) {
|
||||||
|
val tt = cc.next()
|
||||||
|
if (tt.type == Token.Type.LPAREN) depth++
|
||||||
|
else if (tt.type == Token.Type.RPAREN) depth--
|
||||||
|
}
|
||||||
|
val next = cc.peekNextNonWhitespace()
|
||||||
|
if (next.type == Token.Type.LBRACE || next.type == Token.Type.ASSIGN) {
|
||||||
|
cc.restorePos(saved)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
} else if (nextToken.type == Token.Type.LBRACE || nextToken.type == Token.Type.ASSIGN) {
|
||||||
|
cc.restorePos(saved)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
cc.restorePos(saved)
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hasAccessorWithBody()) {
|
||||||
isProperty = true
|
isProperty = true
|
||||||
cc.restorePos(markBeforeEq)
|
cc.restorePos(markBeforeEq)
|
||||||
cc.skipWsTokens()
|
// Do not consume eqToken if it's an accessor keyword
|
||||||
} else {
|
} else {
|
||||||
cc.restorePos(mark)
|
cc.restorePos(mark)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val effectiveEqToken = if (isProperty) null else eqToken
|
||||||
|
|
||||||
// Register the local name at compile time so that subsequent identifiers can be emitted as fast locals
|
// Register the local name at compile time so that subsequent identifiers can be emitted as fast locals
|
||||||
if (!isStatic) declareLocalName(name)
|
if (!isStatic) declareLocalName(name)
|
||||||
|
|
||||||
val isDelegate = if (isAbstract) {
|
val isDelegate = if (isAbstract || actualExtern) {
|
||||||
if (!isProperty && (eqToken.type == Token.Type.ASSIGN || eqToken.type == Token.Type.BY))
|
if (!isProperty && (effectiveEqToken?.type == Token.Type.ASSIGN || effectiveEqToken?.type == Token.Type.BY))
|
||||||
throw ScriptError(eqToken.pos, "abstract variable $name cannot have an initializer or delegate")
|
throw ScriptError(effectiveEqToken.pos, "${if (isAbstract) "abstract" else "extern"} variable $name cannot have an initializer or delegate")
|
||||||
// Abstract variables don't have initializers
|
// Abstract or extern variables don't have initializers
|
||||||
cc.restorePos(markBeforeEq)
|
cc.restorePos(markBeforeEq)
|
||||||
cc.skipWsTokens()
|
cc.skipWsTokens()
|
||||||
setNull = true
|
setNull = true
|
||||||
false
|
false
|
||||||
} else if (!isProperty && eqToken.type == Token.Type.BY) {
|
} else if (!isProperty && effectiveEqToken?.type == Token.Type.BY) {
|
||||||
true
|
true
|
||||||
} else {
|
} else {
|
||||||
if (!isProperty && eqToken.type != Token.Type.ASSIGN) {
|
if (!isProperty && effectiveEqToken?.type != Token.Type.ASSIGN) {
|
||||||
if (!isMutable && (declaringClassNameCaptured == null) && (extTypeName == null))
|
if (!isMutable && (declaringClassNameCaptured == null) && (extTypeName == null))
|
||||||
throw ScriptError(start, "val must be initialized")
|
throw ScriptError(start, "val must be initialized")
|
||||||
else if (!isMutable && declaringClassNameCaptured != null && extTypeName == null) {
|
else if (!isMutable && declaringClassNameCaptured != null && extTypeName == null) {
|
||||||
@@ -3049,12 +3189,12 @@ class Compiler(
|
|||||||
|
|
||||||
val initialExpression = if (setNull || isProperty) null
|
val initialExpression = if (setNull || isProperty) null
|
||||||
else parseStatement(true)
|
else parseStatement(true)
|
||||||
?: throw ScriptError(eqToken.pos, "Expected initializer expression")
|
?: throw ScriptError(effectiveEqToken!!.pos, "Expected initializer expression")
|
||||||
|
|
||||||
// Emit MiniValDecl for this declaration (before execution wiring), attach doc if any
|
// Emit MiniValDecl for this declaration (before execution wiring), attach doc if any
|
||||||
run {
|
run {
|
||||||
val declRange = MiniRange(pendingDeclStart ?: start, cc.currentPos())
|
val declRange = MiniRange(pendingDeclStart ?: start, cc.currentPos())
|
||||||
val initR = if (setNull || isProperty) null else MiniRange(eqToken.pos, cc.currentPos())
|
val initR = if (setNull || isProperty) null else MiniRange(effectiveEqToken!!.pos, cc.currentPos())
|
||||||
val node = MiniValDecl(
|
val node = MiniValDecl(
|
||||||
range = declRange,
|
range = declRange,
|
||||||
name = name,
|
name = name,
|
||||||
@@ -3063,7 +3203,9 @@ class Compiler(
|
|||||||
initRange = initR,
|
initRange = initR,
|
||||||
doc = pendingDeclDoc,
|
doc = pendingDeclDoc,
|
||||||
nameStart = nameStartPos,
|
nameStart = nameStartPos,
|
||||||
receiver = receiverMini
|
receiver = receiverMini,
|
||||||
|
isExtern = actualExtern,
|
||||||
|
isStatic = isStatic
|
||||||
)
|
)
|
||||||
miniSink?.onValDecl(node)
|
miniSink?.onValDecl(node)
|
||||||
pendingDeclDoc = null
|
pendingDeclDoc = null
|
||||||
@@ -3116,46 +3258,67 @@ class Compiler(
|
|||||||
while (true) {
|
while (true) {
|
||||||
val t = cc.skipWsTokens()
|
val t = cc.skipWsTokens()
|
||||||
if (t.isId("get")) {
|
if (t.isId("get")) {
|
||||||
|
val getStart = cc.currentPos()
|
||||||
cc.next() // consume 'get'
|
cc.next() // consume 'get'
|
||||||
cc.requireToken(Token.Type.LPAREN)
|
if (cc.peekNextNonWhitespace().type == Token.Type.LPAREN) {
|
||||||
cc.requireToken(Token.Type.RPAREN)
|
cc.next() // consume (
|
||||||
|
cc.requireToken(Token.Type.RPAREN)
|
||||||
|
}
|
||||||
|
miniSink?.onEnterFunction(null)
|
||||||
getter = if (cc.peekNextNonWhitespace().type == Token.Type.LBRACE) {
|
getter = if (cc.peekNextNonWhitespace().type == Token.Type.LBRACE) {
|
||||||
cc.skipWsTokens()
|
cc.skipWsTokens()
|
||||||
parseBlock()
|
inCodeContext(CodeContext.Function("<getter>")) {
|
||||||
|
parseBlock()
|
||||||
|
}
|
||||||
} else if (cc.peekNextNonWhitespace().type == Token.Type.ASSIGN) {
|
} else if (cc.peekNextNonWhitespace().type == Token.Type.ASSIGN) {
|
||||||
cc.skipWsTokens()
|
cc.skipWsTokens()
|
||||||
cc.next() // consume '='
|
cc.next() // consume '='
|
||||||
val expr = parseExpression() ?: throw ScriptError(cc.current().pos, "Expected getter expression")
|
inCodeContext(CodeContext.Function("<getter>")) {
|
||||||
expr
|
val expr = parseExpression()
|
||||||
|
?: throw ScriptError(cc.current().pos, "Expected getter expression")
|
||||||
|
expr
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
throw ScriptError(cc.current().pos, "Expected { or = after get()")
|
throw ScriptError(cc.current().pos, "Expected { or = after get()")
|
||||||
}
|
}
|
||||||
|
miniSink?.onExitFunction(cc.currentPos())
|
||||||
} else if (t.isId("set")) {
|
} else if (t.isId("set")) {
|
||||||
|
val setStart = cc.currentPos()
|
||||||
cc.next() // consume 'set'
|
cc.next() // consume 'set'
|
||||||
cc.requireToken(Token.Type.LPAREN)
|
var setArgName = "it"
|
||||||
val setArg = cc.requireToken(Token.Type.ID, "Expected setter argument name")
|
if (cc.peekNextNonWhitespace().type == Token.Type.LPAREN) {
|
||||||
cc.requireToken(Token.Type.RPAREN)
|
cc.next() // consume (
|
||||||
|
setArgName = cc.requireToken(Token.Type.ID, "Expected setter argument name").value
|
||||||
|
cc.requireToken(Token.Type.RPAREN)
|
||||||
|
}
|
||||||
|
miniSink?.onEnterFunction(null)
|
||||||
setter = if (cc.peekNextNonWhitespace().type == Token.Type.LBRACE) {
|
setter = if (cc.peekNextNonWhitespace().type == Token.Type.LBRACE) {
|
||||||
cc.skipWsTokens()
|
cc.skipWsTokens()
|
||||||
val body = parseBlock()
|
val body = inCodeContext(CodeContext.Function("<setter>")) {
|
||||||
|
parseBlock()
|
||||||
|
}
|
||||||
statement(body.pos) { scope ->
|
statement(body.pos) { scope ->
|
||||||
val value = scope.args.list.firstOrNull() ?: ObjNull
|
val value = scope.args.list.firstOrNull() ?: ObjNull
|
||||||
scope.addItem(setArg.value, true, value, recordType = ObjRecord.Type.Argument)
|
scope.addItem(setArgName, true, value, recordType = ObjRecord.Type.Argument)
|
||||||
body.execute(scope)
|
body.execute(scope)
|
||||||
}
|
}
|
||||||
} else if (cc.peekNextNonWhitespace().type == Token.Type.ASSIGN) {
|
} else if (cc.peekNextNonWhitespace().type == Token.Type.ASSIGN) {
|
||||||
cc.skipWsTokens()
|
cc.skipWsTokens()
|
||||||
cc.next() // consume '='
|
cc.next() // consume '='
|
||||||
val expr = parseExpression() ?: throw ScriptError(cc.current().pos, "Expected setter expression")
|
val expr = inCodeContext(CodeContext.Function("<setter>")) {
|
||||||
|
parseExpression()
|
||||||
|
?: throw ScriptError(cc.current().pos, "Expected setter expression")
|
||||||
|
}
|
||||||
val st = expr
|
val st = expr
|
||||||
statement(st.pos) { scope ->
|
statement(st.pos) { scope ->
|
||||||
val value = scope.args.list.firstOrNull() ?: ObjNull
|
val value = scope.args.list.firstOrNull() ?: ObjNull
|
||||||
scope.addItem(setArg.value, true, value, recordType = ObjRecord.Type.Argument)
|
scope.addItem(setArgName, true, value, recordType = ObjRecord.Type.Argument)
|
||||||
st.execute(scope)
|
st.execute(scope)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw ScriptError(cc.current().pos, "Expected { or = after set(...)")
|
throw ScriptError(cc.current().pos, "Expected { or = after set(...)")
|
||||||
}
|
}
|
||||||
|
miniSink?.onExitFunction(cc.currentPos())
|
||||||
} else if (t.isId("private") || t.isId("protected")) {
|
} else if (t.isId("private") || t.isId("protected")) {
|
||||||
val vis = if (t.isId("private")) Visibility.Private else Visibility.Protected
|
val vis = if (t.isId("private")) Visibility.Private else Visibility.Protected
|
||||||
val mark = cc.savePos()
|
val mark = cc.savePos()
|
||||||
@@ -3167,9 +3330,12 @@ class Compiler(
|
|||||||
cc.next() // consume '('
|
cc.next() // consume '('
|
||||||
val setArg = cc.requireToken(Token.Type.ID, "Expected setter argument name")
|
val setArg = cc.requireToken(Token.Type.ID, "Expected setter argument name")
|
||||||
cc.requireToken(Token.Type.RPAREN)
|
cc.requireToken(Token.Type.RPAREN)
|
||||||
setter = if (cc.peekNextNonWhitespace().type == Token.Type.LBRACE) {
|
miniSink?.onEnterFunction(null)
|
||||||
|
val finalSetter = if (cc.peekNextNonWhitespace().type == Token.Type.LBRACE) {
|
||||||
cc.skipWsTokens()
|
cc.skipWsTokens()
|
||||||
val body = parseBlock()
|
val body = inCodeContext(CodeContext.Function("<setter>")) {
|
||||||
|
parseBlock()
|
||||||
|
}
|
||||||
statement(body.pos) { scope ->
|
statement(body.pos) { scope ->
|
||||||
val value = scope.args.list.firstOrNull() ?: ObjNull
|
val value = scope.args.list.firstOrNull() ?: ObjNull
|
||||||
scope.addItem(setArg.value, true, value, recordType = ObjRecord.Type.Argument)
|
scope.addItem(setArg.value, true, value, recordType = ObjRecord.Type.Argument)
|
||||||
@@ -3178,11 +3344,12 @@ class Compiler(
|
|||||||
} else if (cc.peekNextNonWhitespace().type == Token.Type.ASSIGN) {
|
} else if (cc.peekNextNonWhitespace().type == Token.Type.ASSIGN) {
|
||||||
cc.skipWsTokens()
|
cc.skipWsTokens()
|
||||||
cc.next() // consume '='
|
cc.next() // consume '='
|
||||||
val expr = parseExpression() ?: throw ScriptError(
|
val st = inCodeContext(CodeContext.Function("<setter>")) {
|
||||||
cc.current().pos,
|
parseExpression() ?: throw ScriptError(
|
||||||
"Expected setter expression"
|
cc.current().pos,
|
||||||
)
|
"Expected setter expression"
|
||||||
val st = expr
|
)
|
||||||
|
}
|
||||||
statement(st.pos) { scope ->
|
statement(st.pos) { scope ->
|
||||||
val value = scope.args.list.firstOrNull() ?: ObjNull
|
val value = scope.args.list.firstOrNull() ?: ObjNull
|
||||||
scope.addItem(setArg.value, true, value, recordType = ObjRecord.Type.Argument)
|
scope.addItem(setArg.value, true, value, recordType = ObjRecord.Type.Argument)
|
||||||
@@ -3191,6 +3358,10 @@ class Compiler(
|
|||||||
} else {
|
} else {
|
||||||
throw ScriptError(cc.current().pos, "Expected { or = after set(...)")
|
throw ScriptError(cc.current().pos, "Expected { or = after set(...)")
|
||||||
}
|
}
|
||||||
|
setter = finalSetter
|
||||||
|
miniSink?.onExitFunction(cc.currentPos())
|
||||||
|
} else {
|
||||||
|
// private set without body: setter remains null, visibility is restricted
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
cc.restorePos(mark)
|
cc.restorePos(mark)
|
||||||
@@ -3234,6 +3405,7 @@ class Compiler(
|
|||||||
// In true class bodies (not inside a function), store fields under a class-qualified key to support MI collisions
|
// In true class bodies (not inside a function), store fields under a class-qualified key to support MI collisions
|
||||||
// Do NOT infer declaring class from runtime thisObj here; only the compile-time captured
|
// Do NOT infer declaring class from runtime thisObj here; only the compile-time captured
|
||||||
// ClassBody qualifies for class-field storage. Otherwise, this is a plain local.
|
// ClassBody qualifies for class-field storage. Otherwise, this is a plain local.
|
||||||
|
isProperty = getter != null || setter != null
|
||||||
val declaringClassName = declaringClassNameCaptured
|
val declaringClassName = declaringClassNameCaptured
|
||||||
if (declaringClassName == null) {
|
if (declaringClassName == null) {
|
||||||
if (context.containsLocal(name))
|
if (context.containsLocal(name))
|
||||||
@@ -3339,7 +3511,8 @@ class Compiler(
|
|||||||
isAbstract = isAbstract,
|
isAbstract = isAbstract,
|
||||||
isClosed = isClosed,
|
isClosed = isClosed,
|
||||||
isOverride = isOverride,
|
isOverride = isOverride,
|
||||||
pos = start
|
pos = start,
|
||||||
|
prop = prop
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
cls.createField(
|
cls.createField(
|
||||||
@@ -3442,7 +3615,7 @@ class Compiler(
|
|||||||
} else {
|
} else {
|
||||||
// Not in class body: regular local/var declaration
|
// Not in class body: regular local/var declaration
|
||||||
val initValue = initialExpression?.execute(context)?.byValueCopy() ?: ObjNull
|
val initValue = initialExpression?.execute(context)?.byValueCopy() ?: ObjNull
|
||||||
context.addItem(name, isMutable, initValue, visibility, recordType = ObjRecord.Type.Field)
|
context.addItem(name, isMutable, initValue, visibility, recordType = ObjRecord.Type.Other)
|
||||||
initValue
|
initValue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3758,4 +3931,6 @@ class Compiler(
|
|||||||
}
|
}
|
||||||
|
|
||||||
suspend fun eval(code: String) = compile(code).execute()
|
suspend fun eval(code: String) = compile(code).execute()
|
||||||
|
suspend fun evalNamed(name: String, code: String, importManager: ImportManager = Script.defaultImportManager) =
|
||||||
|
compile(Source(name,code), importManager).execute()
|
||||||
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -34,18 +34,43 @@ class CompilerContext(val tokens: List<Token>) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var currentIndex = 0
|
var currentIndex = 0
|
||||||
|
private var pendingGT = 0
|
||||||
|
private var pendingAssign = false
|
||||||
|
|
||||||
fun hasNext() = currentIndex < tokens.size
|
fun hasNext() = currentIndex < tokens.size || pendingGT > 0 || pendingAssign
|
||||||
fun hasPrevious() = currentIndex > 0
|
fun hasPrevious() = currentIndex > 0
|
||||||
fun next() =
|
fun next(): Token {
|
||||||
if (currentIndex < tokens.size) tokens[currentIndex++]
|
if (pendingGT > 0) {
|
||||||
|
pendingGT--
|
||||||
|
val last = tokens[currentIndex - 1]
|
||||||
|
return Token(">", last.pos.copy(column = last.pos.column + 1), Token.Type.GT)
|
||||||
|
}
|
||||||
|
if (pendingAssign) {
|
||||||
|
pendingAssign = false
|
||||||
|
val last = tokens[currentIndex - 1]
|
||||||
|
return Token("=", last.pos.copy(column = last.pos.column + 1), Token.Type.ASSIGN)
|
||||||
|
}
|
||||||
|
return if (currentIndex < tokens.size) tokens[currentIndex++]
|
||||||
else Token("", tokens.last().pos, Token.Type.EOF)
|
else Token("", tokens.last().pos, Token.Type.EOF)
|
||||||
|
}
|
||||||
|
|
||||||
fun previous() = if (!hasPrevious()) throw IllegalStateException("No previous token") else tokens[--currentIndex]
|
fun pushPendingGT() {
|
||||||
|
pendingGT++
|
||||||
|
}
|
||||||
|
|
||||||
fun savePos() = currentIndex
|
fun pushPendingAssign() {
|
||||||
|
pendingAssign = true
|
||||||
|
}
|
||||||
|
|
||||||
|
fun previous() = if (pendingGT > 0 || pendingAssign) {
|
||||||
|
throw IllegalStateException("previous() not supported after pushPending tokens")
|
||||||
|
} else if (!hasPrevious()) throw IllegalStateException("No previous token") else tokens[--currentIndex]
|
||||||
|
|
||||||
|
fun savePos() = (currentIndex shl 3) or (pendingGT and 3) or (if (pendingAssign) 4 else 0)
|
||||||
fun restorePos(pos: Int) {
|
fun restorePos(pos: Int) {
|
||||||
currentIndex = pos
|
currentIndex = pos shr 3
|
||||||
|
pendingGT = pos and 3
|
||||||
|
pendingAssign = (pos and 4) != 0
|
||||||
}
|
}
|
||||||
|
|
||||||
fun ensureLabelIsValid(pos: Pos, label: String) {
|
fun ensureLabelIsValid(pos: Pos, label: String) {
|
||||||
@@ -106,12 +131,13 @@ class CompilerContext(val tokens: List<Token>) {
|
|||||||
errorMessage: String = "expected ${tokenType.name}",
|
errorMessage: String = "expected ${tokenType.name}",
|
||||||
isOptional: Boolean = false
|
isOptional: Boolean = false
|
||||||
): Boolean {
|
): Boolean {
|
||||||
|
val pos = savePos()
|
||||||
val t = next()
|
val t = next()
|
||||||
return if (t.type != tokenType) {
|
return if (t.type != tokenType) {
|
||||||
if (!isOptional) {
|
if (!isOptional) {
|
||||||
throw ScriptError(t.pos, errorMessage)
|
throw ScriptError(t.pos, errorMessage)
|
||||||
} else {
|
} else {
|
||||||
previous()
|
restorePos(pos)
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
} else true
|
} else true
|
||||||
@@ -122,20 +148,25 @@ class CompilerContext(val tokens: List<Token>) {
|
|||||||
* @return true if token was found and skipped
|
* @return true if token was found and skipped
|
||||||
*/
|
*/
|
||||||
fun skipNextIf(vararg types: Token.Type): Boolean {
|
fun skipNextIf(vararg types: Token.Type): Boolean {
|
||||||
|
val pos = savePos()
|
||||||
val t = next()
|
val t = next()
|
||||||
return if (t.type in types)
|
return if (t.type in types)
|
||||||
true
|
true
|
||||||
else {
|
else {
|
||||||
previous()
|
restorePos(pos)
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Suppress("unused")
|
@Suppress("unused")
|
||||||
fun skipTokens(vararg tokenTypes: Token.Type) {
|
fun skipTokens(vararg tokenTypes: Token.Type) {
|
||||||
while (next().type in tokenTypes) { /**/
|
while (hasNext()) {
|
||||||
|
val pos = savePos()
|
||||||
|
if (next().type !in tokenTypes) {
|
||||||
|
restorePos(pos)
|
||||||
|
break
|
||||||
|
}
|
||||||
}
|
}
|
||||||
previous()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun nextNonWhitespace(): Token {
|
fun nextNonWhitespace(): Token {
|
||||||
@@ -151,10 +182,11 @@ class CompilerContext(val tokens: List<Token>) {
|
|||||||
* @return next non-whitespace token without extracting it from tokens list
|
* @return next non-whitespace token without extracting it from tokens list
|
||||||
*/
|
*/
|
||||||
fun peekNextNonWhitespace(): Token {
|
fun peekNextNonWhitespace(): Token {
|
||||||
|
val saved = savePos()
|
||||||
while (true) {
|
while (true) {
|
||||||
val t = next()
|
val t = next()
|
||||||
if (t.type !in wstokens) {
|
if (t.type !in wstokens) {
|
||||||
previous()
|
restorePos(saved)
|
||||||
return t
|
return t
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -162,12 +194,13 @@ class CompilerContext(val tokens: List<Token>) {
|
|||||||
|
|
||||||
|
|
||||||
inline fun ifNextIs(typeId: Token.Type, f: (Token) -> Unit): Boolean {
|
inline fun ifNextIs(typeId: Token.Type, f: (Token) -> Unit): Boolean {
|
||||||
|
val pos = savePos()
|
||||||
val t = next()
|
val t = next()
|
||||||
return if (t.type == typeId) {
|
return if (t.type == typeId) {
|
||||||
f(t)
|
f(t)
|
||||||
true
|
true
|
||||||
} else {
|
} else {
|
||||||
previous()
|
restorePos(pos)
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -214,7 +247,7 @@ class CompilerContext(val tokens: List<Token>) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Token.Type.MULTILINE_COMMENT, Token.Type.SINLGE_LINE_COMMENT, Token.Type.NEWLINE -> {}
|
Token.Type.MULTILINE_COMMENT, Token.Type.SINGLE_LINE_COMMENT, Token.Type.NEWLINE -> {}
|
||||||
else -> {
|
else -> {
|
||||||
restorePos(pos); return false
|
restorePos(pos); return false
|
||||||
}
|
}
|
||||||
@@ -241,6 +274,6 @@ class CompilerContext(val tokens: List<Token>) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
val wstokens = setOf(Token.Type.NEWLINE, Token.Type.MULTILINE_COMMENT, Token.Type.SINLGE_LINE_COMMENT)
|
val wstokens = setOf(Token.Type.NEWLINE, Token.Type.MULTILINE_COMMENT, Token.Type.SINGLE_LINE_COMMENT)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -131,7 +131,7 @@ private class Parser(fromPos: Pos) {
|
|||||||
pos.advance()
|
pos.advance()
|
||||||
val body = loadToEndOfLine()
|
val body = loadToEndOfLine()
|
||||||
// Include the leading '//' and do not trim; keep exact lexeme (excluding preceding codepoint)
|
// Include the leading '//' and do not trim; keep exact lexeme (excluding preceding codepoint)
|
||||||
Token("//" + body, from, Token.Type.SINLGE_LINE_COMMENT)
|
Token("//" + body, from, Token.Type.SINGLE_LINE_COMMENT)
|
||||||
}
|
}
|
||||||
|
|
||||||
'*' -> {
|
'*' -> {
|
||||||
|
|||||||
@@ -70,9 +70,8 @@ open class Scope(
|
|||||||
|
|
||||||
internal fun findExtension(receiverClass: ObjClass, name: String): ObjRecord? {
|
internal fun findExtension(receiverClass: ObjClass, name: String): ObjRecord? {
|
||||||
var s: Scope? = this
|
var s: Scope? = this
|
||||||
val visited = HashSet<Long>(4)
|
var hops = 0
|
||||||
while (s != null) {
|
while (s != null && hops++ < 1024) {
|
||||||
if (!visited.add(s.frameId)) break
|
|
||||||
// Proximity rule: check all extensions in the current scope before going to parent.
|
// Proximity rule: check all extensions in the current scope before going to parent.
|
||||||
// Priority within scope: more specific class in MRO wins.
|
// Priority within scope: more specific class in MRO wins.
|
||||||
for (cls in receiverClass.mro) {
|
for (cls in receiverClass.mro) {
|
||||||
@@ -106,10 +105,20 @@ open class Scope(
|
|||||||
* intertwined closure frames. They traverse the plain parent chain and consult only locals
|
* intertwined closure frames. They traverse the plain parent chain and consult only locals
|
||||||
* and bindings of each frame. Instance/class member fallback must be decided by the caller.
|
* and bindings of each frame. Instance/class member fallback must be decided by the caller.
|
||||||
*/
|
*/
|
||||||
private fun tryGetLocalRecord(s: Scope, name: String, caller: net.sergeych.lyng.obj.ObjClass?): ObjRecord? {
|
internal fun tryGetLocalRecord(s: Scope, name: String, caller: net.sergeych.lyng.obj.ObjClass?): ObjRecord? {
|
||||||
|
caller?.let { ctx ->
|
||||||
|
s.objects[ctx.mangledName(name)]?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) return rec
|
||||||
|
}
|
||||||
|
}
|
||||||
s.objects[name]?.let { rec ->
|
s.objects[name]?.let { rec ->
|
||||||
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller)) return rec
|
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller)) return rec
|
||||||
}
|
}
|
||||||
|
caller?.let { ctx ->
|
||||||
|
s.localBindings[ctx.mangledName(name)]?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) return rec
|
||||||
|
}
|
||||||
|
}
|
||||||
s.localBindings[name]?.let { rec ->
|
s.localBindings[name]?.let { rec ->
|
||||||
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller)) return rec
|
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller)) return rec
|
||||||
}
|
}
|
||||||
@@ -120,14 +129,14 @@ open class Scope(
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun chainLookupIgnoreClosure(name: String): ObjRecord? {
|
internal fun chainLookupIgnoreClosure(name: String, followClosure: Boolean = false, caller: net.sergeych.lyng.obj.ObjClass? = null): ObjRecord? {
|
||||||
var s: Scope? = this
|
var s: Scope? = this
|
||||||
// use frameId to detect unexpected structural cycles in the parent chain
|
// use hop counter to detect unexpected structural cycles in the parent chain
|
||||||
val visited = HashSet<Long>(4)
|
var hops = 0
|
||||||
while (s != null) {
|
val effectiveCaller = caller ?: currentClassCtx
|
||||||
if (!visited.add(s.frameId)) return null
|
while (s != null && hops++ < 1024) {
|
||||||
tryGetLocalRecord(s, name, currentClassCtx)?.let { return it }
|
tryGetLocalRecord(s, name, effectiveCaller)?.let { return it }
|
||||||
s = s.parent
|
s = if (followClosure && s is ClosureScope) s.closureScope else s.parent
|
||||||
}
|
}
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
@@ -144,9 +153,8 @@ open class Scope(
|
|||||||
tryGetLocalRecord(this, name, currentClassCtx)?.let { return it }
|
tryGetLocalRecord(this, name, currentClassCtx)?.let { return it }
|
||||||
// 2) walk parents for plain locals/bindings only
|
// 2) walk parents for plain locals/bindings only
|
||||||
var s = parent
|
var s = parent
|
||||||
val visited = HashSet<Long>(4)
|
var hops = 0
|
||||||
while (s != null) {
|
while (s != null && hops++ < 1024) {
|
||||||
if (!visited.add(s.frameId)) return null
|
|
||||||
tryGetLocalRecord(s, name, currentClassCtx)?.let { return it }
|
tryGetLocalRecord(s, name, currentClassCtx)?.let { return it }
|
||||||
s = s.parent
|
s = s.parent
|
||||||
}
|
}
|
||||||
@@ -169,11 +177,10 @@ open class Scope(
|
|||||||
* This completely avoids invoking overridden `get` implementations, preventing
|
* This completely avoids invoking overridden `get` implementations, preventing
|
||||||
* ping-pong recursion between `ClosureScope` frames.
|
* ping-pong recursion between `ClosureScope` frames.
|
||||||
*/
|
*/
|
||||||
internal fun chainLookupWithMembers(name: String, caller: net.sergeych.lyng.obj.ObjClass? = currentClassCtx): ObjRecord? {
|
internal fun chainLookupWithMembers(name: String, caller: net.sergeych.lyng.obj.ObjClass? = currentClassCtx, followClosure: Boolean = false): ObjRecord? {
|
||||||
var s: Scope? = this
|
var s: Scope? = this
|
||||||
val visited = HashSet<Long>(4)
|
var hops = 0
|
||||||
while (s != null) {
|
while (s != null && hops++ < 1024) {
|
||||||
if (!visited.add(s.frameId)) return null
|
|
||||||
tryGetLocalRecord(s, name, caller)?.let { return it }
|
tryGetLocalRecord(s, name, caller)?.let { return it }
|
||||||
for (cls in s.thisObj.objClass.mro) {
|
for (cls in s.thisObj.objClass.mro) {
|
||||||
s.extensions[cls]?.get(name)?.let { return it }
|
s.extensions[cls]?.get(name)?.let { return it }
|
||||||
@@ -185,7 +192,7 @@ open class Scope(
|
|||||||
} else return rec
|
} else return rec
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
s = s.parent
|
s = if (followClosure && s is ClosureScope) s.closureScope else s.parent
|
||||||
}
|
}
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
@@ -277,16 +284,22 @@ open class Scope(
|
|||||||
raiseError(ObjSymbolNotDefinedException(this, "symbol is not defined: $name"))
|
raiseError(ObjSymbolNotDefinedException(this, "symbol is not defined: $name"))
|
||||||
|
|
||||||
fun raiseError(message: String): Nothing {
|
fun raiseError(message: String): Nothing {
|
||||||
throw ExecutionError(ObjException(this, message))
|
val ex = ObjException(this, message)
|
||||||
|
throw ExecutionError(ex, pos, ex.message.value)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun raiseError(obj: ObjException): Nothing {
|
fun raiseError(obj: ObjException): Nothing {
|
||||||
throw ExecutionError(obj)
|
throw ExecutionError(obj, obj.scope.pos, obj.message.value)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun raiseError(obj: Obj, pos: Pos, message: String): Nothing {
|
||||||
|
throw ExecutionError(obj, pos, message)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Suppress("unused")
|
@Suppress("unused")
|
||||||
fun raiseNotFound(message: String = "not found"): Nothing {
|
fun raiseNotFound(message: String = "not found"): Nothing {
|
||||||
throw ExecutionError(ObjNotFoundException(this, message))
|
val ex = ObjNotFoundException(this, message)
|
||||||
|
throw ExecutionError(ex, ex.scope.pos, ex.message.value)
|
||||||
}
|
}
|
||||||
|
|
||||||
inline fun <reified T : Obj> requiredArg(index: Int): T {
|
inline fun <reified T : Obj> requiredArg(index: Int): T {
|
||||||
@@ -324,29 +337,43 @@ open class Scope(
|
|||||||
|
|
||||||
internal val objects = mutableMapOf<String, ObjRecord>()
|
internal val objects = mutableMapOf<String, ObjRecord>()
|
||||||
|
|
||||||
open operator fun get(name: String): ObjRecord? =
|
open operator fun get(name: String): ObjRecord? {
|
||||||
if (name == "this") thisObj.asReadonly
|
if (name == "this") return thisObj.asReadonly
|
||||||
else {
|
|
||||||
// Prefer direct locals/bindings declared in this frame
|
// 1. Prefer direct locals/bindings declared in this frame
|
||||||
(objects[name]?.let { rec ->
|
tryGetLocalRecord(this, name, currentClassCtx)?.let { return it }
|
||||||
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) rec else null
|
|
||||||
}
|
val p = parent
|
||||||
// Then, check known local bindings in this frame (helps after suspension)
|
|
||||||
?: localBindings[name]?.let { rec ->
|
// 2. If we share thisObj with parent, delegate to parent to maintain
|
||||||
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) rec else null
|
// "locals shadow members" priority across the this-context.
|
||||||
}
|
if (p != null && p.thisObj === thisObj) {
|
||||||
// Walk up ancestry
|
return p.get(name)
|
||||||
?: parent?.get(name)
|
|
||||||
// Finally, fallback to class members on thisObj
|
|
||||||
?: thisObj.objClass.getInstanceMemberOrNull(name)?.let { rec ->
|
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) {
|
|
||||||
if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.Property || rec.isAbstract) null
|
|
||||||
else rec
|
|
||||||
} else null
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 3. Otherwise, we are the "primary" scope for this thisObj (or have no parent),
|
||||||
|
// so check members of thisObj before walking up to a different this-context.
|
||||||
|
val receiver = thisObj
|
||||||
|
val effectiveClass = receiver as? ObjClass ?: receiver.objClass
|
||||||
|
for (cls in effectiveClass.mro) {
|
||||||
|
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
||||||
|
if (rec != null && !rec.isAbstract) {
|
||||||
|
if (canAccessMember(rec.visibility, rec.declaringClass ?: cls, currentClassCtx)) {
|
||||||
|
return rec.copy(receiver = receiver)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Finally, root object fallback
|
||||||
|
Obj.rootObjectType.members[name]?.let { rec ->
|
||||||
|
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) {
|
||||||
|
return rec.copy(receiver = receiver)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4. Finally, walk up ancestry to a scope with a different thisObj context
|
||||||
|
return p?.get(name)
|
||||||
|
}
|
||||||
|
|
||||||
// Slot fast-path API
|
// Slot fast-path API
|
||||||
fun getSlotRecord(index: Int): ObjRecord = slots[index]
|
fun getSlotRecord(index: Int): ObjRecord = slots[index]
|
||||||
fun setSlotValue(index: Int, newValue: Obj) {
|
fun setSlotValue(index: Int, newValue: Obj) {
|
||||||
@@ -365,6 +392,20 @@ open class Scope(
|
|||||||
nameToSlot[name]?.let { slots[it] = record }
|
nameToSlot[name]?.let { slots[it] = record }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clear all references and maps to prevent memory leaks when pooled.
|
||||||
|
*/
|
||||||
|
fun scrub() {
|
||||||
|
this.parent = null
|
||||||
|
this.skipScopeCreation = false
|
||||||
|
this.currentClassCtx = null
|
||||||
|
objects.clear()
|
||||||
|
slots.clear()
|
||||||
|
nameToSlot.clear()
|
||||||
|
localBindings.clear()
|
||||||
|
extensions.clear()
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reset this scope instance so it can be safely reused as a fresh child frame.
|
* Reset this scope instance so it can be safely reused as a fresh child frame.
|
||||||
* Clears locals and slots, assigns new frameId, and sets parent/args/pos/thisObj.
|
* Clears locals and slots, assigns new frameId, and sets parent/args/pos/thisObj.
|
||||||
@@ -374,6 +415,7 @@ open class Scope(
|
|||||||
// that could interact badly with the new parent and produce a cycle.
|
// that could interact badly with the new parent and produce a cycle.
|
||||||
this.parent = null
|
this.parent = null
|
||||||
this.skipScopeCreation = false
|
this.skipScopeCreation = false
|
||||||
|
this.currentClassCtx = parent?.currentClassCtx
|
||||||
// fresh identity for PIC caches
|
// fresh identity for PIC caches
|
||||||
this.frameId = nextFrameId()
|
this.frameId = nextFrameId()
|
||||||
// clear locals and slot maps
|
// clear locals and slot maps
|
||||||
@@ -501,11 +543,15 @@ open class Scope(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Map to a slot for fast local access (ensure consistency)
|
// Map to a slot for fast local access (ensure consistency)
|
||||||
val idx = getSlotIndexOf(name)
|
if (nameToSlot.isEmpty()) {
|
||||||
if (idx == null) {
|
|
||||||
allocateSlotFor(name, rec)
|
allocateSlotFor(name, rec)
|
||||||
} else {
|
} else {
|
||||||
slots[idx] = rec
|
val idx = nameToSlot[name]
|
||||||
|
if (idx == null) {
|
||||||
|
allocateSlotFor(name, rec)
|
||||||
|
} else {
|
||||||
|
slots[idx] = rec
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return rec
|
return rec
|
||||||
}
|
}
|
||||||
@@ -622,46 +668,34 @@ open class Scope(
|
|||||||
}
|
}
|
||||||
|
|
||||||
suspend fun resolve(rec: ObjRecord, name: String): Obj {
|
suspend fun resolve(rec: ObjRecord, name: String): Obj {
|
||||||
if (rec.type == ObjRecord.Type.Delegated) {
|
val receiver = rec.receiver ?: thisObj
|
||||||
val del = rec.delegate ?: run {
|
return receiver.resolveRecord(this, rec, name, rec.declaringClass).value
|
||||||
if (thisObj is ObjInstance) {
|
|
||||||
val res = (thisObj as ObjInstance).resolveRecord(this, rec, name, rec.declaringClass).value
|
|
||||||
rec.value = res
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
raiseError("Internal error: delegated property $name has no delegate")
|
|
||||||
}
|
|
||||||
val th = if (thisObj === ObjVoid) ObjNull else thisObj
|
|
||||||
val res = del.invokeInstanceMethod(this, "getValue", Arguments(th, ObjString(name)), onNotFoundResult = {
|
|
||||||
// If getValue not found, return a wrapper that calls invoke
|
|
||||||
object : Statement() {
|
|
||||||
override val pos: Pos = Pos.builtIn
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
|
||||||
val th2 = if (scope.thisObj === ObjVoid) ObjNull else scope.thisObj
|
|
||||||
val allArgs = (listOf(th2, ObjString(name)) + scope.args.list).toTypedArray()
|
|
||||||
return del.invokeInstanceMethod(scope, "invoke", Arguments(*allArgs))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
rec.value = res
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
return rec.value
|
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun assign(rec: ObjRecord, name: String, newValue: Obj) {
|
suspend fun assign(rec: ObjRecord, name: String, newValue: Obj) {
|
||||||
if (rec.type == ObjRecord.Type.Delegated) {
|
if (rec.type == ObjRecord.Type.Delegated) {
|
||||||
|
val receiver = rec.receiver ?: thisObj
|
||||||
val del = rec.delegate ?: run {
|
val del = rec.delegate ?: run {
|
||||||
if (thisObj is ObjInstance) {
|
if (receiver is ObjInstance) {
|
||||||
(thisObj as ObjInstance).writeField(this, name, newValue)
|
(receiver as ObjInstance).writeField(this, name, newValue)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
raiseError("Internal error: delegated property $name has no delegate")
|
raiseError("Internal error: delegated property $name has no delegate")
|
||||||
}
|
}
|
||||||
val th = if (thisObj === ObjVoid) ObjNull else thisObj
|
val th = if (receiver === ObjVoid) ObjNull else receiver
|
||||||
del.invokeInstanceMethod(this, "setValue", Arguments(th, ObjString(name), newValue))
|
del.invokeInstanceMethod(this, "setValue", Arguments(th, ObjString(name), newValue))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if (rec.value is ObjProperty) {
|
||||||
|
(rec.value as ObjProperty).callSetter(this, rec.receiver ?: thisObj, newValue, rec.declaringClass)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// If it's a member (explicitly tracked by receiver or declaringClass), use writeField.
|
||||||
|
// Important: locals have receiver == null and declaringClass == null (enforced in addItem).
|
||||||
|
if (rec.receiver != null || (rec.declaringClass != null && (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.Property))) {
|
||||||
|
(rec.receiver ?: thisObj).writeField(this, name, newValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
if (!rec.isMutable && rec.value !== ObjUnset) raiseIllegalAssignment("can't reassign val $name")
|
if (!rec.isMutable && rec.value !== ObjUnset) raiseIllegalAssignment("can't reassign val $name")
|
||||||
rec.value = newValue
|
rec.value = newValue
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -21,7 +21,7 @@ import net.sergeych.lyng.obj.Obj
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Expect/actual portable scope frame pool. Used only when [PerfFlags.SCOPE_POOL] is true.
|
* Expect/actual portable scope frame pool. Used only when [PerfFlags.SCOPE_POOL] is true.
|
||||||
* JVM actual provides a ThreadLocal-backed pool; other targets may use a simple global deque.
|
* Provides per-thread pooling on JVM, Android, and Native; global pooling on JS and Wasm.
|
||||||
*/
|
*/
|
||||||
expect object ScopePool {
|
expect object ScopePool {
|
||||||
fun borrow(parent: Scope, args: Arguments, pos: Pos, thisObj: Obj): Scope
|
fun borrow(parent: Scope, args: Arguments, pos: Pos, thisObj: Obj): Scope
|
||||||
|
|||||||
@@ -248,10 +248,9 @@ class Script(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
expectedClass?.let {
|
expectedClass?.let {
|
||||||
if (result !is ObjException)
|
if (!result.isInstanceOf(it)) {
|
||||||
raiseError("Expected $expectedClass, got non-lyng exception $result")
|
val actual = if (result is ObjException) result.exceptionClass else result.objClass
|
||||||
if (result.exceptionClass != expectedClass) {
|
raiseError("Expected $it, got $actual")
|
||||||
raiseError("Expected $expectedClass, got ${result.exceptionClass}")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
result
|
result
|
||||||
@@ -294,10 +293,14 @@ class Script(
|
|||||||
ObjVoid
|
ObjVoid
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delay in milliseconds (plain numeric). For time-aware variants use lyng.time.Duration API.
|
|
||||||
addVoidFn("delay") {
|
addVoidFn("delay") {
|
||||||
val ms = (this.args.firstAndOnly().toDouble()).roundToLong()
|
val a = args.firstAndOnly()
|
||||||
delay(ms)
|
when (a) {
|
||||||
|
is ObjInt -> delay(a.value)
|
||||||
|
is ObjReal -> delay((a.value * 1000).roundToLong())
|
||||||
|
is ObjDuration -> delay(a.duration)
|
||||||
|
else -> raiseIllegalArgument("Expected Int, Real or Duration, got ${a.inspect(this)}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
addConst("Object", rootObjectType)
|
addConst("Object", rootObjectType)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
package net.sergeych.lyng
|
package net.sergeych.lyng
|
||||||
|
|
||||||
import net.sergeych.lyng.obj.ObjException
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
|
||||||
open class ScriptError(val pos: Pos, val errorMessage: String, cause: Throwable? = null) : Exception(
|
open class ScriptError(val pos: Pos, val errorMessage: String, cause: Throwable? = null) : Exception(
|
||||||
"""
|
"""
|
||||||
@@ -33,6 +33,6 @@ open class ScriptError(val pos: Pos, val errorMessage: String, cause: Throwable?
|
|||||||
|
|
||||||
class ScriptFlowIsNoMoreCollected: Exception()
|
class ScriptFlowIsNoMoreCollected: Exception()
|
||||||
|
|
||||||
class ExecutionError(val errorObject: ObjException) : ScriptError(errorObject.scope.pos, errorObject.message.value)
|
class ExecutionError(val errorObject: Obj, pos: Pos, message: String) : ScriptError(pos, message)
|
||||||
|
|
||||||
class ImportException(pos: Pos, message: String) : ScriptError(pos, message)
|
class ImportException(pos: Pos, message: String) : ScriptError(pos, message)
|
||||||
@@ -22,7 +22,7 @@ data class Token(val value: String, val pos: Pos, val type: Type) {
|
|||||||
throw ScriptError(pos, text)
|
throw ScriptError(pos, text)
|
||||||
}
|
}
|
||||||
|
|
||||||
val isComment: Boolean by lazy { type == Type.SINLGE_LINE_COMMENT || type == Type.MULTILINE_COMMENT }
|
val isComment: Boolean by lazy { type == Type.SINGLE_LINE_COMMENT || type == Type.MULTILINE_COMMENT }
|
||||||
|
|
||||||
fun isId(text: String) =
|
fun isId(text: String) =
|
||||||
type == Type.ID && value == text
|
type == Type.ID && value == text
|
||||||
@@ -41,7 +41,7 @@ data class Token(val value: String, val pos: Pos, val type: Type) {
|
|||||||
SHUTTLE,
|
SHUTTLE,
|
||||||
AND, BITAND, OR, BITOR, BITXOR, NOT, BITNOT, DOT, ARROW, EQARROW, QUESTION, COLONCOLON,
|
AND, BITAND, OR, BITOR, BITXOR, NOT, BITNOT, DOT, ARROW, EQARROW, QUESTION, COLONCOLON,
|
||||||
SHL, SHR,
|
SHL, SHR,
|
||||||
SINLGE_LINE_COMMENT, MULTILINE_COMMENT,
|
SINGLE_LINE_COMMENT, MULTILINE_COMMENT,
|
||||||
LABEL, ATLABEL, // label@ at@label
|
LABEL, ATLABEL, // label@ at@label
|
||||||
// type-checking/casting
|
// type-checking/casting
|
||||||
AS, ASNULL, OBJECT,
|
AS, ASNULL, OBJECT,
|
||||||
|
|||||||
@@ -27,5 +27,6 @@ sealed class TypeDecl(val isNullable:Boolean = false) {
|
|||||||
object TypeAny : TypeDecl()
|
object TypeAny : TypeDecl()
|
||||||
object TypeNullableAny : TypeDecl(true)
|
object TypeNullableAny : TypeDecl(true)
|
||||||
|
|
||||||
class Simple(val name: String,isNullable: Boolean) : TypeDecl(isNullable)
|
class Simple(val name: String, isNullable: Boolean) : TypeDecl(isNullable)
|
||||||
|
class Generic(val name: String, val args: List<TypeDecl>, isNullable: Boolean) : TypeDecl(isNullable)
|
||||||
}
|
}
|
||||||
@@ -35,7 +35,8 @@ data class Symbol(
|
|||||||
val kind: SymbolKind,
|
val kind: SymbolKind,
|
||||||
val declStart: Int,
|
val declStart: Int,
|
||||||
val declEnd: Int,
|
val declEnd: Int,
|
||||||
val containerId: Int?
|
val containerId: Int?,
|
||||||
|
val type: String? = null
|
||||||
)
|
)
|
||||||
|
|
||||||
data class Reference(val symbolId: Int, val start: Int, val end: Int)
|
data class Reference(val symbolId: Int, val start: Int, val end: Int)
|
||||||
@@ -97,59 +98,83 @@ object Binder {
|
|||||||
// First pass (classes only): register classes so we can attach methods/fields
|
// First pass (classes only): register classes so we can attach methods/fields
|
||||||
for (d in mini.declarations) if (d is MiniClassDecl) {
|
for (d in mini.declarations) if (d is MiniClassDecl) {
|
||||||
val (s, e) = nameOffsets(d.nameStart, d.name)
|
val (s, e) = nameOffsets(d.nameStart, d.name)
|
||||||
val sym = Symbol(nextId++, d.name, SymbolKind.Class, s, e, containerId = null)
|
val sym = Symbol(nextId++, d.name, SymbolKind.Class, s, e, containerId = null, type = d.name)
|
||||||
symbols += sym
|
symbols += sym
|
||||||
topLevelByName.getOrPut(d.name) { mutableListOf() }.add(sym.id)
|
topLevelByName.getOrPut(d.name) { mutableListOf() }.add(sym.id)
|
||||||
// Prefer explicit body range; otherwise use the whole class declaration range
|
// Prefer explicit body range; otherwise use the whole class declaration range
|
||||||
val bodyStart = d.bodyRange?.start?.let { source.offsetOf(it) } ?: source.offsetOf(d.range.start)
|
val bodyStart = d.bodyRange?.start?.let { source.offsetOf(it) } ?: source.offsetOf(d.range.start)
|
||||||
val bodyEnd = d.bodyRange?.end?.let { source.offsetOf(it) } ?: source.offsetOf(d.range.end)
|
val bodyEnd = d.bodyRange?.end?.let { source.offsetOf(it) } ?: source.offsetOf(d.range.end)
|
||||||
classes += ClassScope(sym.id, bodyStart, bodyEnd, mutableListOf())
|
val classScope = ClassScope(sym.id, bodyStart, bodyEnd, mutableListOf())
|
||||||
|
classes += classScope
|
||||||
// Constructor fields (val/var in primary ctor)
|
// Constructor fields (val/var in primary ctor)
|
||||||
for (cf in d.ctorFields) {
|
for (cf in d.ctorFields) {
|
||||||
val fs = source.offsetOf(cf.nameStart)
|
val fs = source.offsetOf(cf.nameStart)
|
||||||
val fe = fs + cf.name.length
|
val fe = fs + cf.name.length
|
||||||
val kind = if (cf.mutable) SymbolKind.Variable else SymbolKind.Value
|
val kind = if (cf.mutable) SymbolKind.Variable else SymbolKind.Value
|
||||||
val fieldSym = Symbol(nextId++, cf.name, kind, fs, fe, containerId = sym.id)
|
val fieldSym = Symbol(nextId++, cf.name, kind, fs, fe, containerId = sym.id, type = DocLookupUtils.typeOf(cf.type))
|
||||||
symbols += fieldSym
|
symbols += fieldSym
|
||||||
classes.last().fields += fieldSym.id
|
classScope.fields += fieldSym.id
|
||||||
}
|
}
|
||||||
// Class fields (val/var in class body, if any are reported here)
|
// Class fields (val/var in class body, if any are reported here)
|
||||||
for (cf in d.classFields) {
|
for (cf in d.classFields) {
|
||||||
val fs = source.offsetOf(cf.nameStart)
|
val fs = source.offsetOf(cf.nameStart)
|
||||||
val fe = fs + cf.name.length
|
val fe = fs + cf.name.length
|
||||||
val kind = if (cf.mutable) SymbolKind.Variable else SymbolKind.Value
|
val kind = if (cf.mutable) SymbolKind.Variable else SymbolKind.Value
|
||||||
val fieldSym = Symbol(nextId++, cf.name, kind, fs, fe, containerId = sym.id)
|
val fieldSym = Symbol(nextId++, cf.name, kind, fs, fe, containerId = sym.id, type = DocLookupUtils.typeOf(cf.type))
|
||||||
symbols += fieldSym
|
symbols += fieldSym
|
||||||
classes.last().fields += fieldSym.id
|
classScope.fields += fieldSym.id
|
||||||
}
|
}
|
||||||
|
// Members (including fields and methods)
|
||||||
|
for (m in d.members) {
|
||||||
|
if (m is MiniMemberValDecl) {
|
||||||
|
val fs = source.offsetOf(m.nameStart)
|
||||||
|
val fe = fs + m.name.length
|
||||||
|
val kind = if (m.mutable) SymbolKind.Variable else SymbolKind.Value
|
||||||
|
val fieldSym = Symbol(nextId++, m.name, kind, fs, fe, containerId = sym.id, type = DocLookupUtils.typeOf(m.type))
|
||||||
|
symbols += fieldSym
|
||||||
|
classScope.fields += fieldSym.id
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun registerFun(name: String, nameStart: net.sergeych.lyng.Pos, params: List<MiniParam>, returnType: MiniTypeRef?, bodyRange: MiniRange?, isTopLevel: Boolean) {
|
||||||
|
val (s, e) = nameOffsets(nameStart, name)
|
||||||
|
val ownerClass = classContaining(s)
|
||||||
|
val sym = Symbol(nextId++, name, SymbolKind.Function, s, e, containerId = ownerClass?.symId, type = DocLookupUtils.typeOf(returnType))
|
||||||
|
symbols += sym
|
||||||
|
if (isTopLevel) {
|
||||||
|
topLevelByName.getOrPut(name) { mutableListOf() }.add(sym.id)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine body range if present; otherwise, derive a conservative end at decl range end
|
||||||
|
val bodyStart = bodyRange?.start?.let { source.offsetOf(it) } ?: e
|
||||||
|
val bodyEnd = bodyRange?.end?.let { source.offsetOf(it) } ?: e
|
||||||
|
val fnScope = FnScope(sym.id, bodyStart, bodyEnd, mutableListOf(), ownerClass?.symId)
|
||||||
|
|
||||||
|
// Params
|
||||||
|
for (p in params) {
|
||||||
|
val ps = source.offsetOf(p.nameStart)
|
||||||
|
val pe = ps + p.name.length
|
||||||
|
val pk = SymbolKind.Parameter
|
||||||
|
val paramSym = Symbol(nextId++, p.name, pk, ps, pe, containerId = sym.id, type = DocLookupUtils.typeOf(p.type))
|
||||||
|
fnScope.locals += paramSym.id
|
||||||
|
symbols += paramSym
|
||||||
|
}
|
||||||
|
functions += fnScope
|
||||||
}
|
}
|
||||||
|
|
||||||
// Second pass: functions and top-level/class vals/vars
|
// Second pass: functions and top-level/class vals/vars
|
||||||
for (d in mini.declarations) {
|
for (d in mini.declarations) {
|
||||||
when (d) {
|
when (d) {
|
||||||
is MiniClassDecl -> { /* already processed in first pass */ }
|
is MiniClassDecl -> {
|
||||||
is MiniFunDecl -> {
|
for (m in d.members) {
|
||||||
val (s, e) = nameOffsets(d.nameStart, d.name)
|
if (m is MiniMemberFunDecl) {
|
||||||
val ownerClass = classContaining(s)
|
registerFun(m.name, m.nameStart, m.params, m.returnType, m.body?.range, false)
|
||||||
val sym = Symbol(nextId++, d.name, SymbolKind.Function, s, e, containerId = ownerClass?.symId)
|
}
|
||||||
symbols += sym
|
|
||||||
topLevelByName.getOrPut(d.name) { mutableListOf() }.add(sym.id)
|
|
||||||
|
|
||||||
// Determine body range if present; otherwise, derive a conservative end at decl range end
|
|
||||||
val bodyStart = d.body?.range?.start?.let { source.offsetOf(it) } ?: e
|
|
||||||
val bodyEnd = d.body?.range?.end?.let { source.offsetOf(it) } ?: e
|
|
||||||
val fnScope = FnScope(sym.id, bodyStart, bodyEnd, mutableListOf(), ownerClass?.symId)
|
|
||||||
|
|
||||||
// Params
|
|
||||||
for (p in d.params) {
|
|
||||||
val ps = source.offsetOf(p.nameStart)
|
|
||||||
val pe = ps + p.name.length
|
|
||||||
val pk = SymbolKind.Parameter
|
|
||||||
val paramSym = Symbol(nextId++, p.name, pk, ps, pe, containerId = sym.id)
|
|
||||||
fnScope.locals += paramSym.id
|
|
||||||
symbols += paramSym
|
|
||||||
}
|
}
|
||||||
functions += fnScope
|
}
|
||||||
|
is MiniFunDecl -> {
|
||||||
|
registerFun(d.name, d.nameStart, d.params, d.returnType, d.body?.range, true)
|
||||||
}
|
}
|
||||||
is MiniValDecl -> {
|
is MiniValDecl -> {
|
||||||
val (s, e) = nameOffsets(d.nameStart, d.name)
|
val (s, e) = nameOffsets(d.nameStart, d.name)
|
||||||
@@ -157,18 +182,18 @@ object Binder {
|
|||||||
val ownerClass = classContaining(s)
|
val ownerClass = classContaining(s)
|
||||||
if (ownerClass != null) {
|
if (ownerClass != null) {
|
||||||
// class field
|
// class field
|
||||||
val fieldSym = Symbol(nextId++, d.name, kind, s, e, containerId = ownerClass.symId)
|
val fieldSym = Symbol(nextId++, d.name, kind, s, e, containerId = ownerClass.symId, type = DocLookupUtils.typeOf(d.type))
|
||||||
symbols += fieldSym
|
symbols += fieldSym
|
||||||
ownerClass.fields += fieldSym.id
|
ownerClass.fields += fieldSym.id
|
||||||
} else {
|
} else {
|
||||||
val sym = Symbol(nextId++, d.name, kind, s, e, containerId = null)
|
val sym = Symbol(nextId++, d.name, kind, s, e, containerId = null, type = DocLookupUtils.typeOf(d.type))
|
||||||
symbols += sym
|
symbols += sym
|
||||||
topLevelByName.getOrPut(d.name) { mutableListOf() }.add(sym.id)
|
topLevelByName.getOrPut(d.name) { mutableListOf() }.add(sym.id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
is MiniEnumDecl -> {
|
is MiniEnumDecl -> {
|
||||||
val (s, e) = nameOffsets(d.nameStart, d.name)
|
val (s, e) = nameOffsets(d.nameStart, d.name)
|
||||||
val sym = Symbol(nextId++, d.name, SymbolKind.Enum, s, e, containerId = null)
|
val sym = Symbol(nextId++, d.name, SymbolKind.Enum, s, e, containerId = null, type = d.name)
|
||||||
symbols += sym
|
symbols += sym
|
||||||
topLevelByName.getOrPut(d.name) { mutableListOf() }.add(sym.id)
|
topLevelByName.getOrPut(d.name) { mutableListOf() }.add(sym.id)
|
||||||
}
|
}
|
||||||
@@ -187,7 +212,7 @@ object Binder {
|
|||||||
"iterator", "hasNext", "next"
|
"iterator", "hasNext", "next"
|
||||||
)
|
)
|
||||||
for (name in stdFns) {
|
for (name in stdFns) {
|
||||||
val sym = Symbol(nextId++, name, SymbolKind.Function, 0, name.length, containerId = null)
|
val sym = Symbol(nextId++, name, SymbolKind.Function, 0, name.length, containerId = null, type = null)
|
||||||
symbols += sym
|
symbols += sym
|
||||||
topLevelByName.getOrPut(name) { mutableListOf() }.add(sym.id)
|
topLevelByName.getOrPut(name) { mutableListOf() }.add(sym.id)
|
||||||
}
|
}
|
||||||
@@ -204,7 +229,7 @@ object Binder {
|
|||||||
if (containerFn != null) {
|
if (containerFn != null) {
|
||||||
val fnSymId = containerFn.id
|
val fnSymId = containerFn.id
|
||||||
val kind = if (d.mutable) SymbolKind.Variable else SymbolKind.Value
|
val kind = if (d.mutable) SymbolKind.Variable else SymbolKind.Value
|
||||||
val localSym = Symbol(nextId++, d.name, kind, s, e, containerId = fnSymId)
|
val localSym = Symbol(nextId++, d.name, kind, s, e, containerId = fnSymId, type = DocLookupUtils.typeOf(d.type))
|
||||||
symbols += localSym
|
symbols += localSym
|
||||||
containerFn.locals += localSym.id
|
containerFn.locals += localSym.id
|
||||||
}
|
}
|
||||||
@@ -245,11 +270,11 @@ object Binder {
|
|||||||
.maxByOrNull { it.rangeEnd - it.rangeStart }
|
.maxByOrNull { it.rangeEnd - it.rangeStart }
|
||||||
val kind = if (kw.equals("var", true)) SymbolKind.Variable else SymbolKind.Value
|
val kind = if (kw.equals("var", true)) SymbolKind.Variable else SymbolKind.Value
|
||||||
if (inFn != null) {
|
if (inFn != null) {
|
||||||
val localSym = Symbol(nextId++, text.substring(nameStart, nameEnd), kind, nameStart, nameEnd, containerId = inFn.id)
|
val localSym = Symbol(nextId++, text.substring(nameStart, nameEnd), kind, nameStart, nameEnd, containerId = inFn.id, type = null)
|
||||||
symbols += localSym
|
symbols += localSym
|
||||||
inFn.locals += localSym.id
|
inFn.locals += localSym.id
|
||||||
} else {
|
} else {
|
||||||
val localSym = Symbol(nextId++, text.substring(nameStart, nameEnd), kind, nameStart, nameEnd, containerId = null)
|
val localSym = Symbol(nextId++, text.substring(nameStart, nameEnd), kind, nameStart, nameEnd, containerId = null, type = null)
|
||||||
symbols += localSym
|
symbols += localSym
|
||||||
topLevelByName.getOrPut(localSym.name) { mutableListOf() }.add(localSym.id)
|
topLevelByName.getOrPut(localSym.name) { mutableListOf() }.add(localSym.id)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -100,11 +100,16 @@ object LyngFormatter {
|
|||||||
fun isControlHeaderNoBrace(s: String): Boolean {
|
fun isControlHeaderNoBrace(s: String): Boolean {
|
||||||
val t = s.trim()
|
val t = s.trim()
|
||||||
if (t.isEmpty()) return false
|
if (t.isEmpty()) return false
|
||||||
// match: if (...) | else if (...) | else
|
// match: if (...) | else if (...) | else | catch (...) | finally
|
||||||
val isIf = Regex("^if\\s*\\(.*\\)\\s*$").matches(t)
|
if (Regex("^if\\s*\\(.*\\)$").matches(t)) return true
|
||||||
val isElseIf = Regex("^else\\s+if\\s*\\(.*\\)\\s*$").matches(t)
|
if (Regex("^else\\s+if\\s*\\(.*\\)$").matches(t)) return true
|
||||||
val isElse = t == "else"
|
if (t == "else") return true
|
||||||
if (isIf || isElseIf || isElse) return true
|
if (Regex("^catch\\s*\\(.*\\)$").matches(t)) return true
|
||||||
|
if (t == "finally") return true
|
||||||
|
|
||||||
|
// Short definition form: fun x() = or val x =
|
||||||
|
if (Regex("^(override\\s+)?(fun|fn)\\b.*=\\s*$").matches(t)) return true
|
||||||
|
if (Regex("^(private\\s+|protected\\s+|public\\s+|override\\s+)?(val|var)\\b.*=\\s*$").matches(t)) return true
|
||||||
|
|
||||||
// property accessors ending with ) or =
|
// property accessors ending with ) or =
|
||||||
if (isAccessorRelated(t)) {
|
if (isAccessorRelated(t)) {
|
||||||
@@ -113,11 +118,23 @@ object LyngFormatter {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun isDoubleIndentHeader(s: String): Boolean {
|
||||||
|
val t = s.trim()
|
||||||
|
if (!t.endsWith("=")) return false
|
||||||
|
// Is it a function or property definition?
|
||||||
|
if (Regex("\\b(fun|fn|val|var)\\b").containsMatchIn(t)) return true
|
||||||
|
// Is it an accessor?
|
||||||
|
if (isPropertyAccessor(t)) return true
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
for ((i, rawLine) in lines.withIndex()) {
|
for ((i, rawLine) in lines.withIndex()) {
|
||||||
val (parts, nextInBlockComment) = splitIntoParts(rawLine, inBlockComment)
|
val (parts, nextInBlockComment) = splitIntoParts(rawLine, inBlockComment)
|
||||||
val code = parts.filter { it.type == PartType.Code }.joinToString("") { it.text }
|
val code = parts.filter { it.type == PartType.Code }.joinToString("") { it.text }
|
||||||
|
val codeAndStrings = parts.filter { it.type != PartType.BlockComment && it.type != PartType.LineComment }.joinToString("") { it.text }
|
||||||
val trimmedStart = code.dropWhile { it == ' ' || it == '\t' }
|
val trimmedStart = code.dropWhile { it == ' ' || it == '\t' }
|
||||||
val trimmedLine = rawLine.trim()
|
val trimmedLine = rawLine.trim()
|
||||||
|
val trimmedCodeAndStrings = codeAndStrings.trim()
|
||||||
|
|
||||||
// Compute effective indent level for this line
|
// Compute effective indent level for this line
|
||||||
val currentExtraIndent = extraIndents.sum()
|
val currentExtraIndent = extraIndents.sum()
|
||||||
@@ -138,9 +155,15 @@ object LyngFormatter {
|
|||||||
|
|
||||||
// Single-line control header (if/else/else if) without braces: indent the next
|
// Single-line control header (if/else/else if) without braces: indent the next
|
||||||
// non-empty, non-'}', non-'else' line by one extra level
|
// non-empty, non-'}', non-'else' line by one extra level
|
||||||
|
val isContinuation = trimmedStart.startsWith("else") || trimmedStart.startsWith("catch") || trimmedStart.startsWith("finally")
|
||||||
val applyAwaiting = awaitingExtraIndent > 0 && trimmedStart.isNotEmpty() &&
|
val applyAwaiting = awaitingExtraIndent > 0 && trimmedStart.isNotEmpty() &&
|
||||||
!trimmedStart.startsWith("else") && !trimmedStart.startsWith("}")
|
!trimmedStart.startsWith("}")
|
||||||
if (applyAwaiting) effectiveLevel += awaitingExtraIndent
|
var actualAwaiting = 0
|
||||||
|
if (applyAwaiting) {
|
||||||
|
actualAwaiting = awaitingExtraIndent
|
||||||
|
if (isContinuation) actualAwaiting = (actualAwaiting - 1).coerceAtLeast(0)
|
||||||
|
effectiveLevel += actualAwaiting
|
||||||
|
}
|
||||||
|
|
||||||
val firstChar = trimmedStart.firstOrNull()
|
val firstChar = trimmedStart.firstOrNull()
|
||||||
// While inside parentheses, continuation applies scaled by nesting level
|
// While inside parentheses, continuation applies scaled by nesting level
|
||||||
@@ -194,7 +217,7 @@ object LyngFormatter {
|
|||||||
val newBlockLevel = blockLevel
|
val newBlockLevel = blockLevel
|
||||||
if (newBlockLevel > oldBlockLevel) {
|
if (newBlockLevel > oldBlockLevel) {
|
||||||
val isAccessorRelatedLine = isAccessor || (!inBlockComment && isAccessorRelated(code))
|
val isAccessorRelatedLine = isAccessor || (!inBlockComment && isAccessorRelated(code))
|
||||||
val addedThisLine = (if (applyAwaiting) awaitingExtraIndent else 0) + (if (isAccessorRelatedLine) 1 else 0)
|
val addedThisLine = actualAwaiting + (if (isAccessorRelatedLine) 1 else 0)
|
||||||
repeat(newBlockLevel - oldBlockLevel) {
|
repeat(newBlockLevel - oldBlockLevel) {
|
||||||
extraIndents.add(addedThisLine)
|
extraIndents.add(addedThisLine)
|
||||||
}
|
}
|
||||||
@@ -207,23 +230,29 @@ object LyngFormatter {
|
|||||||
inBlockComment = nextInBlockComment
|
inBlockComment = nextInBlockComment
|
||||||
|
|
||||||
// Update awaitingExtraIndent based on current line
|
// Update awaitingExtraIndent based on current line
|
||||||
|
val nextLineTrimmed = lines.getOrNull(i + 1)?.trim() ?: ""
|
||||||
|
val nextIsContinuation = nextLineTrimmed.startsWith("else") ||
|
||||||
|
nextLineTrimmed.startsWith("catch") ||
|
||||||
|
nextLineTrimmed.startsWith("finally")
|
||||||
|
|
||||||
if (applyAwaiting && trimmedStart.isNotEmpty()) {
|
if (applyAwaiting && trimmedStart.isNotEmpty()) {
|
||||||
// we have just applied it.
|
// we have just applied it.
|
||||||
val endsWithBrace = code.trimEnd().endsWith("{")
|
val endsWithBrace = code.trimEnd().endsWith("{")
|
||||||
if (!endsWithBrace && isControlHeaderNoBrace(code)) {
|
if (!endsWithBrace && isControlHeaderNoBrace(trimmedCodeAndStrings)) {
|
||||||
// It's another header, increment
|
// It's another header, increment
|
||||||
val isAccessorRelatedLine = isAccessor || (!inBlockComment && isAccessorRelated(code))
|
val isAccessorOrDouble = isAccessor || (!inBlockComment && isAccessorRelated(code)) || isDoubleIndentHeader(trimmedCodeAndStrings)
|
||||||
awaitingExtraIndent += if (isAccessorRelatedLine) 2 else 1
|
val increment = if (isAccessorOrDouble) 2 else 1
|
||||||
} else {
|
awaitingExtraIndent = actualAwaiting + increment
|
||||||
// It's the body, reset
|
} else if (!nextIsContinuation) {
|
||||||
|
// It's the body, and no continuation follows, so reset
|
||||||
awaitingExtraIndent = 0
|
awaitingExtraIndent = 0
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// start awaiting if current line is a control header without '{'
|
// start awaiting if current line is a control header without '{'
|
||||||
val endsWithBrace = code.trimEnd().endsWith("{")
|
val endsWithBrace = code.trimEnd().endsWith("{")
|
||||||
if (!endsWithBrace && isControlHeaderNoBrace(code)) {
|
if (!endsWithBrace && isControlHeaderNoBrace(trimmedCodeAndStrings)) {
|
||||||
val isAccessorRelatedLine = isAccessor || (!inBlockComment && isAccessorRelated(code))
|
val isAccessorOrDouble = isAccessor || (!inBlockComment && isAccessorRelated(code)) || isDoubleIndentHeader(trimmedCodeAndStrings)
|
||||||
awaitingExtraIndent = if (isAccessorRelatedLine) 2 else 1
|
awaitingExtraIndent = if (isAccessorOrDouble) 2 else 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ private val fallbackKeywordIds = setOf(
|
|||||||
"and", "or", "not",
|
"and", "or", "not",
|
||||||
// declarations & modifiers
|
// declarations & modifiers
|
||||||
"fun", "fn", "class", "interface", "enum", "val", "var", "import", "package",
|
"fun", "fn", "class", "interface", "enum", "val", "var", "import", "package",
|
||||||
"abstract", "closed", "override",
|
"abstract", "closed", "override", "public", "lazy", "dynamic",
|
||||||
"private", "protected", "static", "open", "extern", "init", "get", "set", "by",
|
"private", "protected", "static", "open", "extern", "init", "get", "set", "by",
|
||||||
// control flow and misc
|
// control flow and misc
|
||||||
"if", "else", "when", "while", "do", "for", "try", "catch", "finally",
|
"if", "else", "when", "while", "do", "for", "try", "catch", "finally",
|
||||||
@@ -67,7 +67,7 @@ private fun kindOf(type: Type, value: String): HighlightKind? = when (type) {
|
|||||||
Type.REGEX -> HighlightKind.Regex
|
Type.REGEX -> HighlightKind.Regex
|
||||||
|
|
||||||
// comments
|
// comments
|
||||||
Type.SINLGE_LINE_COMMENT, Type.MULTILINE_COMMENT -> HighlightKind.Comment
|
Type.SINGLE_LINE_COMMENT, Type.MULTILINE_COMMENT -> HighlightKind.Comment
|
||||||
|
|
||||||
// punctuation
|
// punctuation
|
||||||
Type.LPAREN, Type.RPAREN, Type.LBRACE, Type.RBRACE, Type.LBRACKET, Type.RBRACKET,
|
Type.LPAREN, Type.RPAREN, Type.LBRACE, Type.RBRACE, Type.LBRACKET, Type.RBRACKET,
|
||||||
|
|||||||
@@ -148,6 +148,8 @@ class ModuleDocsBuilder internal constructor(private val moduleName: String) {
|
|||||||
body = null,
|
body = null,
|
||||||
doc = md,
|
doc = md,
|
||||||
nameStart = Pos.builtIn,
|
nameStart = Pos.builtIn,
|
||||||
|
isExtern = false,
|
||||||
|
isStatic = false
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -167,6 +169,8 @@ class ModuleDocsBuilder internal constructor(private val moduleName: String) {
|
|||||||
initRange = null,
|
initRange = null,
|
||||||
doc = md,
|
doc = md,
|
||||||
nameStart = Pos.builtIn,
|
nameStart = Pos.builtIn,
|
||||||
|
isExtern = false,
|
||||||
|
isStatic = false
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -236,6 +240,7 @@ class ClassDocsBuilder internal constructor(private val className: String) {
|
|||||||
name = name,
|
name = name,
|
||||||
mutable = mutable,
|
mutable = mutable,
|
||||||
type = type?.toMiniTypeRef(),
|
type = type?.toMiniTypeRef(),
|
||||||
|
initRange = null,
|
||||||
doc = md,
|
doc = md,
|
||||||
nameStart = Pos.builtIn,
|
nameStart = Pos.builtIn,
|
||||||
isStatic = isStatic,
|
isStatic = isStatic,
|
||||||
@@ -250,8 +255,7 @@ class ClassDocsBuilder internal constructor(private val className: String) {
|
|||||||
private fun builtinRange() = MiniRange(Pos.builtIn, Pos.builtIn)
|
private fun builtinRange() = MiniRange(Pos.builtIn, Pos.builtIn)
|
||||||
|
|
||||||
private fun miniDoc(text: String, tags: Map<String, List<String>>): MiniDoc {
|
private fun miniDoc(text: String, tags: Map<String, List<String>>): MiniDoc {
|
||||||
val summary = text.lineSequence().map { it.trim() }.firstOrNull { it.isNotEmpty() }
|
return MiniDoc.parse(builtinRange(), listOf(text), tags)
|
||||||
return MiniDoc(range = builtinRange(), raw = text, summary = summary, tags = tags)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun TypeDoc.toDisplayName(): String = when (this) {
|
private fun TypeDoc.toDisplayName(): String = when (this) {
|
||||||
@@ -534,6 +538,9 @@ private fun buildStdlibDocs(): List<MiniDecl> {
|
|||||||
)
|
)
|
||||||
|
|
||||||
// Concurrency helpers
|
// Concurrency helpers
|
||||||
|
mod.classDoc(name = "Deferred", doc = "Represents a value that will be available in the future.", bases = listOf(type("Obj"))) {
|
||||||
|
method(name = "await", doc = "Suspend until the value is available and return it.")
|
||||||
|
}
|
||||||
mod.funDoc(
|
mod.funDoc(
|
||||||
name = "launch",
|
name = "launch",
|
||||||
doc = StdlibInlineDocIndex.topFunDoc("launch") ?: "Launch an asynchronous task and return a `Deferred`.",
|
doc = StdlibInlineDocIndex.topFunDoc("launch") ?: "Launch an asynchronous task and return a `Deferred`.",
|
||||||
@@ -551,18 +558,33 @@ private fun buildStdlibDocs(): List<MiniDecl> {
|
|||||||
returns = type("lyng.Iterable")
|
returns = type("lyng.Iterable")
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Common types
|
||||||
|
mod.classDoc(name = "Int", doc = "64-bit signed integer.", bases = listOf(type("Obj")))
|
||||||
|
mod.classDoc(name = "Real", doc = "64-bit floating point number.", bases = listOf(type("Obj")))
|
||||||
|
mod.classDoc(name = "Bool", doc = "Boolean value (true or false).", bases = listOf(type("Obj")))
|
||||||
|
mod.classDoc(name = "Char", doc = "Single character (UTF-16 code unit).", bases = listOf(type("Obj")))
|
||||||
|
mod.classDoc(name = "Buffer", doc = "Mutable byte array.", bases = listOf(type("Obj")))
|
||||||
|
mod.classDoc(name = "Regex", doc = "Regular expression.", bases = listOf(type("Obj")))
|
||||||
|
mod.classDoc(name = "Range", doc = "Arithmetic progression.", bases = listOf(type("Obj")))
|
||||||
|
|
||||||
// Common Iterable helpers (document top-level extension-like APIs as class members)
|
// Common Iterable helpers (document top-level extension-like APIs as class members)
|
||||||
mod.classDoc(name = "Iterable", doc = StdlibInlineDocIndex.classDoc("Iterable") ?: "Helper operations for iterable collections.") {
|
mod.classDoc(name = "Iterable", doc = StdlibInlineDocIndex.classDoc("Iterable") ?: "Helper operations for iterable collections.", bases = listOf(type("Obj"))) {
|
||||||
fun md(name: String, fallback: String) = StdlibInlineDocIndex.methodDoc("Iterable", name) ?: fallback
|
fun md(name: String, fallback: String) = StdlibInlineDocIndex.methodDoc("Iterable", name) ?: fallback
|
||||||
method(name = "filter", doc = md("filter", "Filter elements by predicate."), params = listOf(ParamDoc("predicate")), returns = type("lyng.Iterable"))
|
method(name = "filter", doc = md("filter", "Filter elements by predicate."), params = listOf(ParamDoc("predicate")), returns = type("lyng.Iterable"))
|
||||||
|
method(name = "filterFlow", doc = md("filterFlow", "Filter elements by predicate and return a Flow."), params = listOf(ParamDoc("predicate")), returns = type("lyng.Flow"))
|
||||||
|
method(name = "filterNotNull", doc = md("filterNotNull", "Filter non-null elements."), returns = type("lyng.List"))
|
||||||
method(name = "drop", doc = md("drop", "Skip the first N elements."), params = listOf(ParamDoc("n", type("lyng.Int"))), returns = type("lyng.Iterable"))
|
method(name = "drop", doc = md("drop", "Skip the first N elements."), params = listOf(ParamDoc("n", type("lyng.Int"))), returns = type("lyng.Iterable"))
|
||||||
method(name = "first", doc = md("first", "Return the first element or throw if empty."))
|
field(name = "first", doc = md("first", "Return the first element or throw if empty."))
|
||||||
method(name = "last", doc = md("last", "Return the last element or throw if empty."))
|
field(name = "last", doc = md("last", "Return the last element or throw if empty."))
|
||||||
|
method(name = "findFirst", doc = md("findFirst", "Return the first matching element or throw."), params = listOf(ParamDoc("predicate")))
|
||||||
|
method(name = "findFirstOrNull", doc = md("findFirstOrNull", "Return the first matching element or null."), params = listOf(ParamDoc("predicate")))
|
||||||
method(name = "dropLast", doc = md("dropLast", "Drop the last N elements."), params = listOf(ParamDoc("n", type("lyng.Int"))), returns = type("lyng.Iterable"))
|
method(name = "dropLast", doc = md("dropLast", "Drop the last N elements."), params = listOf(ParamDoc("n", type("lyng.Int"))), returns = type("lyng.Iterable"))
|
||||||
method(name = "takeLast", doc = md("takeLast", "Take the last N elements."), params = listOf(ParamDoc("n", type("lyng.Int"))), returns = type("lyng.List"))
|
method(name = "takeLast", doc = md("takeLast", "Take the last N elements."), params = listOf(ParamDoc("n", type("lyng.Int"))), returns = type("lyng.List"))
|
||||||
method(name = "joinToString", doc = md("joinToString", "Join elements into a string with an optional separator and transformer."), params = listOf(ParamDoc("prefix", type("lyng.String")), ParamDoc("transformer")), returns = type("lyng.String"))
|
method(name = "joinToString", doc = md("joinToString", "Join elements into a string with an optional separator and transformer."), params = listOf(ParamDoc("separator", type("lyng.String")), ParamDoc("transformer")), returns = type("lyng.String"))
|
||||||
method(name = "any", doc = md("any", "Return true if any element matches the predicate."), params = listOf(ParamDoc("predicate")), returns = type("lyng.Bool"))
|
method(name = "any", doc = md("any", "Return true if any element matches the predicate."), params = listOf(ParamDoc("predicate")), returns = type("lyng.Bool"))
|
||||||
method(name = "all", doc = md("all", "Return true if all elements match the predicate."), params = listOf(ParamDoc("predicate")), returns = type("lyng.Bool"))
|
method(name = "all", doc = md("all", "Return true if all elements match the predicate."), params = listOf(ParamDoc("predicate")), returns = type("lyng.Bool"))
|
||||||
|
method(name = "forEach", doc = md("forEach", "Execute `action` for each element."), params = listOf(ParamDoc("action")))
|
||||||
|
method(name = "count", doc = md("count", "Count elements matching the predicate."), params = listOf(ParamDoc("predicate")), returns = type("lyng.Int"))
|
||||||
method(name = "sum", doc = md("sum", "Sum all elements; returns null for empty collections."), returns = type("lyng.Number", nullable = true))
|
method(name = "sum", doc = md("sum", "Sum all elements; returns null for empty collections."), returns = type("lyng.Number", nullable = true))
|
||||||
method(name = "sumOf", doc = md("sumOf", "Sum mapped values of elements; returns null for empty collections."), params = listOf(ParamDoc("f")))
|
method(name = "sumOf", doc = md("sumOf", "Sum mapped values of elements; returns null for empty collections."), params = listOf(ParamDoc("f")))
|
||||||
method(name = "minOf", doc = md("minOf", "Minimum of mapped values."), params = listOf(ParamDoc("lambda")))
|
method(name = "minOf", doc = md("minOf", "Minimum of mapped values."), params = listOf(ParamDoc("lambda")))
|
||||||
@@ -591,7 +613,7 @@ private fun buildStdlibDocs(): List<MiniDecl> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Iterator helpers
|
// Iterator helpers
|
||||||
mod.classDoc(name = "Iterator", doc = StdlibInlineDocIndex.classDoc("Iterator") ?: "Iterator protocol for sequential access.") {
|
mod.classDoc(name = "Iterator", doc = StdlibInlineDocIndex.classDoc("Iterator") ?: "Iterator protocol for sequential access.", bases = listOf(type("Obj"))) {
|
||||||
fun md(name: String, fallback: String) = StdlibInlineDocIndex.methodDoc("Iterator", name) ?: fallback
|
fun md(name: String, fallback: String) = StdlibInlineDocIndex.methodDoc("Iterator", name) ?: fallback
|
||||||
method(name = "hasNext", doc = md("hasNext", "Whether another element is available."), returns = type("lyng.Bool"))
|
method(name = "hasNext", doc = md("hasNext", "Whether another element is available."), returns = type("lyng.Bool"))
|
||||||
method(name = "next", doc = md("next", "Return the next element."))
|
method(name = "next", doc = md("next", "Return the next element."))
|
||||||
@@ -600,22 +622,22 @@ private fun buildStdlibDocs(): List<MiniDecl> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Exceptions and utilities
|
// Exceptions and utilities
|
||||||
mod.classDoc(name = "Exception", doc = StdlibInlineDocIndex.classDoc("Exception") ?: "Exception helpers.") {
|
mod.classDoc(name = "Exception", doc = StdlibInlineDocIndex.classDoc("Exception") ?: "Exception helpers.", bases = listOf(type("Obj"))) {
|
||||||
method(name = "printStackTrace", doc = StdlibInlineDocIndex.methodDoc("Exception", "printStackTrace") ?: "Print this exception and its stack trace to standard output.")
|
method(name = "printStackTrace", doc = StdlibInlineDocIndex.methodDoc("Exception", "printStackTrace") ?: "Print this exception and its stack trace to standard output.")
|
||||||
}
|
}
|
||||||
|
|
||||||
mod.classDoc(name = "Enum", doc = StdlibInlineDocIndex.classDoc("Enum") ?: "Base class for all enums.") {
|
mod.classDoc(name = "Enum", doc = StdlibInlineDocIndex.classDoc("Enum") ?: "Base class for all enums.", bases = listOf(type("Obj"))) {
|
||||||
method(name = "name", doc = "Returns the name of this enum constant.", returns = type("lyng.String"))
|
method(name = "name", doc = "Returns the name of this enum constant.", returns = type("lyng.String"))
|
||||||
method(name = "ordinal", doc = "Returns the ordinal of this enum constant.", returns = type("lyng.Int"))
|
method(name = "ordinal", doc = "Returns the ordinal of this enum constant.", returns = type("lyng.Int"))
|
||||||
}
|
}
|
||||||
|
|
||||||
mod.classDoc(name = "String", doc = StdlibInlineDocIndex.classDoc("String") ?: "String helpers.") {
|
mod.classDoc(name = "String", doc = StdlibInlineDocIndex.classDoc("String") ?: "String helpers.", bases = listOf(type("Obj"))) {
|
||||||
// Only include inline-source method here; Kotlin-embedded methods are now documented via DocHelpers near definitions.
|
// Only include inline-source method here; Kotlin-embedded methods are now documented via DocHelpers near definitions.
|
||||||
method(name = "re", doc = StdlibInlineDocIndex.methodDoc("String", "re") ?: "Compile this string into a regular expression.", returns = type("lyng.Regex"))
|
method(name = "re", doc = StdlibInlineDocIndex.methodDoc("String", "re") ?: "Compile this string into a regular expression.", params = listOf(ParamDoc("flags", type("lyng.String"))), returns = type("lyng.Regex"))
|
||||||
}
|
}
|
||||||
|
|
||||||
// StackTraceEntry structure
|
// StackTraceEntry structure
|
||||||
mod.classDoc(name = "StackTraceEntry", doc = StdlibInlineDocIndex.classDoc("StackTraceEntry") ?: "Represents a single stack trace element.") {
|
mod.classDoc(name = "StackTraceEntry", doc = StdlibInlineDocIndex.classDoc("StackTraceEntry") ?: "Represents a single stack trace element.", bases = listOf(type("Obj"))) {
|
||||||
// Fields are not present as declarations in root.lyng's class header docs. Keep seeded defaults.
|
// Fields are not present as declarations in root.lyng's class header docs. Keep seeded defaults.
|
||||||
field(name = "sourceName", doc = "Source (file) name.", type = type("lyng.String"))
|
field(name = "sourceName", doc = "Source (file) name.", type = type("lyng.String"))
|
||||||
field(name = "line", doc = "Line number (1-based).", type = type("lyng.Int"))
|
field(name = "line", doc = "Line number (1-based).", type = type("lyng.Int"))
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ package net.sergeych.lyng.miniast
|
|||||||
import net.sergeych.lyng.Compiler
|
import net.sergeych.lyng.Compiler
|
||||||
import net.sergeych.lyng.Script
|
import net.sergeych.lyng.Script
|
||||||
import net.sergeych.lyng.Source
|
import net.sergeych.lyng.Source
|
||||||
|
import net.sergeych.lyng.binding.BindingSnapshot
|
||||||
import net.sergeych.lyng.highlight.offsetOf
|
import net.sergeych.lyng.highlight.offsetOf
|
||||||
import net.sergeych.lyng.pacman.ImportProvider
|
import net.sergeych.lyng.pacman.ImportProvider
|
||||||
|
|
||||||
@@ -32,6 +33,7 @@ data class CompletionItem(
|
|||||||
val kind: Kind,
|
val kind: Kind,
|
||||||
val tailText: String? = null,
|
val tailText: String? = null,
|
||||||
val typeText: String? = null,
|
val typeText: String? = null,
|
||||||
|
val priority: Double = 0.0,
|
||||||
)
|
)
|
||||||
|
|
||||||
enum class Kind { Function, Class_, Enum, Value, Method, Field }
|
enum class Kind { Function, Class_, Enum, Value, Method, Field }
|
||||||
@@ -58,11 +60,11 @@ object CompletionEngineLight {
|
|||||||
return completeSuspend(text, idx)
|
return completeSuspend(text, idx)
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun completeSuspend(text: String, caret: Int): List<CompletionItem> {
|
suspend fun completeSuspend(text: String, caret: Int, providedMini: MiniScript? = null, binding: BindingSnapshot? = null): List<CompletionItem> {
|
||||||
// Ensure stdlib Obj*-defined docs (e.g., String methods) are initialized before registry lookup
|
// Ensure stdlib Obj*-defined docs (e.g., String methods) are initialized before registry lookup
|
||||||
StdlibDocsBootstrap.ensure()
|
StdlibDocsBootstrap.ensure()
|
||||||
val prefix = prefixAt(text, caret)
|
val prefix = prefixAt(text, caret)
|
||||||
val mini = buildMiniAst(text)
|
val mini = providedMini ?: buildMiniAst(text)
|
||||||
val imported: List<String> = DocLookupUtils.canonicalImportedModules(mini ?: return emptyList(), text)
|
val imported: List<String> = DocLookupUtils.canonicalImportedModules(mini ?: return emptyList(), text)
|
||||||
|
|
||||||
val cap = 200
|
val cap = 200
|
||||||
@@ -72,7 +74,12 @@ object CompletionEngineLight {
|
|||||||
val word = DocLookupUtils.wordRangeAt(text, caret)
|
val word = DocLookupUtils.wordRangeAt(text, caret)
|
||||||
val memberDot = DocLookupUtils.findDotLeft(text, word?.first ?: caret)
|
val memberDot = DocLookupUtils.findDotLeft(text, word?.first ?: caret)
|
||||||
if (memberDot != null) {
|
if (memberDot != null) {
|
||||||
|
val inferredCls = (DocLookupUtils.guessReturnClassFromMemberCallBeforeMini(mini, text, memberDot, imported, binding) ?: DocLookupUtils.guessReceiverClass(text, memberDot, imported, mini))
|
||||||
// 0) Try chained member call return type inference
|
// 0) Try chained member call return type inference
|
||||||
|
DocLookupUtils.guessReturnClassFromMemberCallBeforeMini(mini, text, memberDot, imported, binding)?.let { cls ->
|
||||||
|
offerMembersAdd(out, prefix, imported, cls, mini)
|
||||||
|
return out
|
||||||
|
}
|
||||||
DocLookupUtils.guessReturnClassFromMemberCallBefore(text, memberDot, imported, mini)?.let { cls ->
|
DocLookupUtils.guessReturnClassFromMemberCallBefore(text, memberDot, imported, mini)?.let { cls ->
|
||||||
offerMembersAdd(out, prefix, imported, cls, mini)
|
offerMembersAdd(out, prefix, imported, cls, mini)
|
||||||
return out
|
return out
|
||||||
@@ -88,7 +95,7 @@ object CompletionEngineLight {
|
|||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
// 1) Receiver inference fallback
|
// 1) Receiver inference fallback
|
||||||
(DocLookupUtils.guessReceiverClassViaMini(mini, text, memberDot, imported) ?: DocLookupUtils.guessReceiverClass(text, memberDot, imported, mini))?.let { cls ->
|
(DocLookupUtils.guessReceiverClassViaMini(mini, text, memberDot, imported, binding) ?: DocLookupUtils.guessReceiverClass(text, memberDot, imported, mini))?.let { cls ->
|
||||||
offerMembersAdd(out, prefix, imported, cls, mini)
|
offerMembersAdd(out, prefix, imported, cls, mini)
|
||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
@@ -97,11 +104,16 @@ object CompletionEngineLight {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Global identifiers: params > local decls > imported > stdlib; Functions > Classes > Values; alphabetical
|
// Global identifiers: params > local decls > imported > stdlib; Functions > Classes > Values; alphabetical
|
||||||
if (mini != null) {
|
offerParamsInScope(out, prefix, mini, text, caret)
|
||||||
offerParamsInScope(out, prefix, mini, text, caret)
|
|
||||||
|
val locals = DocLookupUtils.extractLocalsAt(text, caret)
|
||||||
|
for (name in locals) {
|
||||||
|
if (name.startsWith(prefix, true)) {
|
||||||
|
out.add(CompletionItem(name, Kind.Value, priority = 150.0))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val decls = mini?.declarations ?: emptyList()
|
val decls = mini.declarations
|
||||||
val funs = decls.filterIsInstance<MiniFunDecl>().sortedBy { it.name.lowercase() }
|
val funs = decls.filterIsInstance<MiniFunDecl>().sortedBy { it.name.lowercase() }
|
||||||
val classes = decls.filterIsInstance<MiniClassDecl>().sortedBy { it.name.lowercase() }
|
val classes = decls.filterIsInstance<MiniClassDecl>().sortedBy { it.name.lowercase() }
|
||||||
val enums = decls.filterIsInstance<MiniEnumDecl>().sortedBy { it.name.lowercase() }
|
val enums = decls.filterIsInstance<MiniEnumDecl>().sortedBy { it.name.lowercase() }
|
||||||
@@ -158,17 +170,17 @@ object CompletionEngineLight {
|
|||||||
when (node) {
|
when (node) {
|
||||||
is MiniFunDecl -> {
|
is MiniFunDecl -> {
|
||||||
for (p in node.params) {
|
for (p in node.params) {
|
||||||
add(CompletionItem(p.name, Kind.Value, typeText = typeOf(p.type)))
|
add(CompletionItem(p.name, Kind.Value, typeText = typeOf(p.type), priority = 200.0))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
is MiniClassDecl -> {
|
is MiniClassDecl -> {
|
||||||
// Propose constructor parameters (ctorFields)
|
// Propose constructor parameters (ctorFields)
|
||||||
for (p in node.ctorFields) {
|
for (p in node.ctorFields) {
|
||||||
add(CompletionItem(p.name, if (p.mutable) Kind.Value else Kind.Field, typeText = typeOf(p.type)))
|
add(CompletionItem(p.name, if (p.mutable) Kind.Value else Kind.Field, typeText = typeOf(p.type), priority = 200.0))
|
||||||
}
|
}
|
||||||
// Propose class-level fields
|
// Propose class-level fields
|
||||||
for (p in node.classFields) {
|
for (p in node.classFields) {
|
||||||
add(CompletionItem(p.name, if (p.mutable) Kind.Value else Kind.Field, typeText = typeOf(p.type)))
|
add(CompletionItem(p.name, if (p.mutable) Kind.Value else Kind.Field, typeText = typeOf(p.type), priority = 100.0))
|
||||||
}
|
}
|
||||||
// Process members (methods/fields)
|
// Process members (methods/fields)
|
||||||
for (m in node.members) {
|
for (m in node.members) {
|
||||||
@@ -179,10 +191,10 @@ object CompletionEngineLight {
|
|||||||
when (m) {
|
when (m) {
|
||||||
is MiniMemberFunDecl -> {
|
is MiniMemberFunDecl -> {
|
||||||
val params = m.params.joinToString(", ") { it.name }
|
val params = m.params.joinToString(", ") { it.name }
|
||||||
add(CompletionItem(m.name, Kind.Method, tailText = "(${params})", typeText = typeOf(m.returnType)))
|
add(CompletionItem(m.name, Kind.Method, tailText = "(${params})", typeText = typeOf(m.returnType), priority = 100.0))
|
||||||
}
|
}
|
||||||
is MiniMemberValDecl -> {
|
is MiniMemberValDecl -> {
|
||||||
add(CompletionItem(m.name, if (m.mutable) Kind.Value else Kind.Field, typeText = typeOf(m.type)))
|
add(CompletionItem(m.name, if (m.mutable) Kind.Value else Kind.Field, typeText = typeOf(m.type), priority = 100.0))
|
||||||
}
|
}
|
||||||
is MiniInitDecl -> {}
|
is MiniInitDecl -> {}
|
||||||
}
|
}
|
||||||
@@ -190,7 +202,7 @@ object CompletionEngineLight {
|
|||||||
}
|
}
|
||||||
is MiniMemberFunDecl -> {
|
is MiniMemberFunDecl -> {
|
||||||
for (p in node.params) {
|
for (p in node.params) {
|
||||||
add(CompletionItem(p.name, Kind.Value, typeText = typeOf(p.type)))
|
add(CompletionItem(p.name, Kind.Value, typeText = typeOf(p.type), priority = 200.0))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else -> {}
|
else -> {}
|
||||||
@@ -227,6 +239,9 @@ object CompletionEngineLight {
|
|||||||
fun addMembersOf(name: String, direct: Boolean) {
|
fun addMembersOf(name: String, direct: Boolean) {
|
||||||
val cls = classes[name] ?: return
|
val cls = classes[name] ?: return
|
||||||
val target = if (direct) directMap else inheritedMap
|
val target = if (direct) directMap else inheritedMap
|
||||||
|
for (cf in cls.ctorFields + cls.classFields) {
|
||||||
|
target.getOrPut(cf.name) { mutableListOf() }.add(DocLookupUtils.toMemberVal(cf))
|
||||||
|
}
|
||||||
for (m in cls.members) target.getOrPut(m.name) { mutableListOf() }.add(m)
|
for (m in cls.members) target.getOrPut(m.name) { mutableListOf() }.add(m)
|
||||||
for (b in cls.bases) if (visited.add(b)) addMembersOf(b, false)
|
for (b in cls.bases) if (visited.add(b)) addMembersOf(b, false)
|
||||||
}
|
}
|
||||||
@@ -240,14 +255,22 @@ object CompletionEngineLight {
|
|||||||
"Array" -> listOf("Collection", "Iterable").forEach { if (visited.add(it)) addMembersOf(it, false) }
|
"Array" -> listOf("Collection", "Iterable").forEach { if (visited.add(it)) addMembersOf(it, false) }
|
||||||
}
|
}
|
||||||
|
|
||||||
fun emitGroup(map: LinkedHashMap<String, MutableList<MiniMemberDecl>>) {
|
fun emitGroup(map: LinkedHashMap<String, MutableList<MiniMemberDecl>>, groupPriority: Double) {
|
||||||
for (name in map.keys.sortedBy { it.lowercase() }) {
|
for (name in map.keys.sortedBy { it.lowercase() }) {
|
||||||
val variants = map[name] ?: continue
|
val variants = map[name] ?: continue
|
||||||
// Prefer a method with a known return type; else any method; else first variant
|
// Choose a representative for display:
|
||||||
|
// 1) Prefer a method with return type AND parameters
|
||||||
|
// 2) Prefer a method with parameters
|
||||||
|
// 3) Prefer a method with return type
|
||||||
|
// 4) Else any method
|
||||||
|
// 5) Else the first variant
|
||||||
val rep =
|
val rep =
|
||||||
variants.asSequence()
|
variants.asSequence().filterIsInstance<MiniMemberFunDecl>()
|
||||||
.filterIsInstance<MiniMemberFunDecl>()
|
.firstOrNull { it.returnType != null && it.params.isNotEmpty() }
|
||||||
.firstOrNull { it.returnType != null }
|
?: variants.asSequence().filterIsInstance<MiniMemberFunDecl>()
|
||||||
|
.firstOrNull { it.params.isNotEmpty() }
|
||||||
|
?: variants.asSequence().filterIsInstance<MiniMemberFunDecl>()
|
||||||
|
.firstOrNull { it.returnType != null }
|
||||||
?: variants.firstOrNull { it is MiniMemberFunDecl }
|
?: variants.firstOrNull { it is MiniMemberFunDecl }
|
||||||
?: variants.first()
|
?: variants.first()
|
||||||
when (rep) {
|
when (rep) {
|
||||||
@@ -255,7 +278,7 @@ object CompletionEngineLight {
|
|||||||
val params = rep.params.joinToString(", ") { it.name }
|
val params = rep.params.joinToString(", ") { it.name }
|
||||||
val extra = variants.count { it is MiniMemberFunDecl } - 1
|
val extra = variants.count { it is MiniMemberFunDecl } - 1
|
||||||
val ov = if (extra > 0) " (+$extra overloads)" else ""
|
val ov = if (extra > 0) " (+$extra overloads)" else ""
|
||||||
val ci = CompletionItem(name, Kind.Method, tailText = "(${params})$ov", typeText = typeOf(rep.returnType))
|
val ci = CompletionItem(name, Kind.Method, tailText = "(${params})$ov", typeText = typeOf(rep.returnType), priority = groupPriority)
|
||||||
if (ci.name.startsWith(prefix, true)) out += ci
|
if (ci.name.startsWith(prefix, true)) out += ci
|
||||||
}
|
}
|
||||||
is MiniMemberValDecl -> {
|
is MiniMemberValDecl -> {
|
||||||
@@ -263,7 +286,7 @@ object CompletionEngineLight {
|
|||||||
val chosen = variants.asSequence()
|
val chosen = variants.asSequence()
|
||||||
.filterIsInstance<MiniMemberValDecl>()
|
.filterIsInstance<MiniMemberValDecl>()
|
||||||
.firstOrNull { it.type != null } ?: rep
|
.firstOrNull { it.type != null } ?: rep
|
||||||
val ci = CompletionItem(name, Kind.Field, typeText = typeOf(chosen.type))
|
val ci = CompletionItem(name, Kind.Field, typeText = typeOf(chosen.type), priority = groupPriority)
|
||||||
if (ci.name.startsWith(prefix, true)) out += ci
|
if (ci.name.startsWith(prefix, true)) out += ci
|
||||||
}
|
}
|
||||||
is MiniInitDecl -> {}
|
is MiniInitDecl -> {}
|
||||||
@@ -271,36 +294,41 @@ object CompletionEngineLight {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
emitGroup(directMap)
|
emitGroup(directMap, 100.0)
|
||||||
emitGroup(inheritedMap)
|
emitGroup(inheritedMap, 0.0)
|
||||||
|
|
||||||
// Supplement with stdlib extension members defined in root.lyng (e.g., fun String.re(...))
|
// Supplement with extension members (both stdlib and local)
|
||||||
run {
|
run {
|
||||||
val already = (directMap.keys + inheritedMap.keys).toMutableSet()
|
val already = (directMap.keys + inheritedMap.keys).toMutableSet()
|
||||||
val ext = BuiltinDocRegistry.extensionMemberNamesFor(className)
|
val extensions = DocLookupUtils.collectExtensionMemberNames(imported, className, mini)
|
||||||
for (name in ext) {
|
for (name in extensions) {
|
||||||
if (already.contains(name)) continue
|
if (already.contains(name)) continue
|
||||||
val resolved = DocLookupUtils.resolveMemberWithInheritance(imported, className, name)
|
val resolved = DocLookupUtils.resolveMemberWithInheritance(imported, className, name, mini)
|
||||||
if (resolved != null) {
|
if (resolved != null) {
|
||||||
when (val member = resolved.second) {
|
val m = resolved.second
|
||||||
|
val ci = when (m) {
|
||||||
is MiniMemberFunDecl -> {
|
is MiniMemberFunDecl -> {
|
||||||
val params = member.params.joinToString(", ") { it.name }
|
val params = m.params.joinToString(", ") { it.name }
|
||||||
val ci = CompletionItem(name, Kind.Method, tailText = "(${params})", typeText = typeOf(member.returnType))
|
CompletionItem(name, Kind.Method, tailText = "(${params})", typeText = typeOf(m.returnType), priority = 50.0)
|
||||||
if (ci.name.startsWith(prefix, true)) out += ci
|
|
||||||
already.add(name)
|
|
||||||
}
|
}
|
||||||
is MiniMemberValDecl -> {
|
is MiniFunDecl -> {
|
||||||
val ci = CompletionItem(name, Kind.Field, typeText = typeOf(member.type))
|
val params = m.params.joinToString(", ") { it.name }
|
||||||
if (ci.name.startsWith(prefix, true)) out += ci
|
CompletionItem(name, Kind.Method, tailText = "(${params})", typeText = typeOf(m.returnType), priority = 50.0)
|
||||||
already.add(name)
|
|
||||||
}
|
}
|
||||||
is MiniInitDecl -> {}
|
is MiniMemberValDecl -> CompletionItem(name, Kind.Field, typeText = typeOf(m.type), priority = 50.0)
|
||||||
|
is MiniValDecl -> CompletionItem(name, Kind.Field, typeText = typeOf(m.type), priority = 50.0)
|
||||||
|
else -> CompletionItem(name, Kind.Method, tailText = "()", typeText = null, priority = 50.0)
|
||||||
|
}
|
||||||
|
if (ci.name.startsWith(prefix, true)) {
|
||||||
|
out += ci
|
||||||
|
already.add(name)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Fallback: emit simple method name without detailed types
|
val ci = CompletionItem(name, Kind.Method, tailText = "()", typeText = null, priority = 50.0)
|
||||||
val ci = CompletionItem(name, Kind.Method, tailText = "()", typeText = null)
|
if (ci.name.startsWith(prefix, true)) {
|
||||||
if (ci.name.startsWith(prefix, true)) out += ci
|
out += ci
|
||||||
already.add(name)
|
already.add(name)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -320,16 +348,9 @@ object CompletionEngineLight {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun typeOf(t: MiniTypeRef?): String = when (t) {
|
private fun typeOf(t: MiniTypeRef?): String {
|
||||||
null -> ""
|
val s = DocLookupUtils.typeOf(t)
|
||||||
is MiniTypeName -> t.segments.lastOrNull()?.name?.let { ": $it" } ?: ""
|
return if (s.isEmpty()) "" else ": $s"
|
||||||
is MiniGenericType -> {
|
|
||||||
val base = typeOf(t.base).removePrefix(": ")
|
|
||||||
val args = t.args.joinToString(",") { typeOf(it).removePrefix(": ") }
|
|
||||||
": ${base}<${args}>"
|
|
||||||
}
|
|
||||||
is MiniFunctionType -> ": (fn)"
|
|
||||||
is MiniTypeVar -> ": ${t.name}"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Note: we intentionally skip "params in scope" in the isolated engine to avoid PSI/offset mapping.
|
// Note: we intentionally skip "params in scope" in the isolated engine to avoid PSI/offset mapping.
|
||||||
|
|||||||
@@ -78,6 +78,11 @@ object DocLookupUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (m in members) {
|
for (m in members) {
|
||||||
|
if (m is MiniMemberFunDecl) {
|
||||||
|
for (p in m.params) {
|
||||||
|
if (matches(p.nameStart, p.name.length)) return p.name to "Parameter"
|
||||||
|
}
|
||||||
|
}
|
||||||
if (matches(m.nameStart, m.name.length)) {
|
if (matches(m.nameStart, m.name.length)) {
|
||||||
val kind = when (m) {
|
val kind = when (m) {
|
||||||
is MiniMemberFunDecl -> "Function"
|
is MiniMemberFunDecl -> "Function"
|
||||||
@@ -91,14 +96,28 @@ object DocLookupUtils {
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
fun findTypeByRange(mini: MiniScript?, name: String, startOffset: Int): MiniTypeRef? {
|
fun findEnclosingClass(mini: MiniScript, offset: Int): MiniClassDecl? {
|
||||||
|
val src = mini.range.start.source
|
||||||
|
return mini.declarations.filterIsInstance<MiniClassDecl>()
|
||||||
|
.filter {
|
||||||
|
val start = src.offsetOf(it.range.start)
|
||||||
|
val end = src.offsetOf(it.range.end)
|
||||||
|
offset in start..end
|
||||||
|
}
|
||||||
|
.minByOrNull {
|
||||||
|
src.offsetOf(it.range.end) - src.offsetOf(it.range.start)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun findTypeByRange(mini: MiniScript?, name: String, startOffset: Int, text: String? = null, imported: List<String>? = null): MiniTypeRef? {
|
||||||
if (mini == null) return null
|
if (mini == null) return null
|
||||||
val src = mini.range.start.source
|
val src = mini.range.start.source
|
||||||
|
fun matches(p: net.sergeych.lyng.Pos, len: Int) = src.offsetOf(p).let { s -> startOffset >= s && startOffset < s + len }
|
||||||
|
|
||||||
for (d in mini.declarations) {
|
for (d in mini.declarations) {
|
||||||
if (d.name == name && src.offsetOf(d.nameStart) == startOffset) {
|
if (d.name == name && matches(d.nameStart, d.name.length)) {
|
||||||
return when (d) {
|
return when (d) {
|
||||||
is MiniValDecl -> d.type
|
is MiniValDecl -> d.type ?: if (text != null && imported != null) inferTypeRefForVal(d, text, imported, mini) else null
|
||||||
is MiniFunDecl -> d.returnType
|
is MiniFunDecl -> d.returnType
|
||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
@@ -106,25 +125,33 @@ object DocLookupUtils {
|
|||||||
|
|
||||||
if (d is MiniFunDecl) {
|
if (d is MiniFunDecl) {
|
||||||
for (p in d.params) {
|
for (p in d.params) {
|
||||||
if (p.name == name && src.offsetOf(p.nameStart) == startOffset) return p.type
|
if (p.name == name && matches(p.nameStart, p.name.length)) return p.type
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (d is MiniClassDecl) {
|
if (d is MiniClassDecl) {
|
||||||
for (m in d.members) {
|
for (m in d.members) {
|
||||||
if (m.name == name && src.offsetOf(m.nameStart) == startOffset) {
|
if (m is MiniMemberFunDecl) {
|
||||||
|
for (p in m.params) {
|
||||||
|
if (p.name == name && matches(p.nameStart, p.name.length)) return p.type
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (m.name == name && matches(m.nameStart, m.name.length)) {
|
||||||
return when (m) {
|
return when (m) {
|
||||||
is MiniMemberFunDecl -> m.returnType
|
is MiniMemberFunDecl -> m.returnType
|
||||||
is MiniMemberValDecl -> m.type
|
is MiniMemberValDecl -> m.type ?: if (text != null && imported != null) {
|
||||||
|
inferTypeRefFromInitRange(m.initRange, m.nameStart, text, imported, mini)
|
||||||
|
} else null
|
||||||
|
|
||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (cf in d.ctorFields) {
|
for (cf in d.ctorFields) {
|
||||||
if (cf.name == name && src.offsetOf(cf.nameStart) == startOffset) return cf.type
|
if (cf.name == name && matches(cf.nameStart, cf.name.length)) return cf.type
|
||||||
}
|
}
|
||||||
for (cf in d.classFields) {
|
for (cf in d.classFields) {
|
||||||
if (cf.name == name && src.offsetOf(cf.nameStart) == startOffset) return cf.type
|
if (cf.name == name && matches(cf.nameStart, cf.name.length)) return cf.type
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -157,6 +184,21 @@ object DocLookupUtils {
|
|||||||
return result.toList()
|
return result.toList()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun extractLocalsAt(text: String, offset: Int): Set<String> {
|
||||||
|
val res = mutableSetOf<String>()
|
||||||
|
// 1) find val/var declarations
|
||||||
|
val re = Regex("(?:^|[\\n;])\\s*(?:val|var)\\s+([A-Za-z_][A-Za-z0-9_]*)")
|
||||||
|
re.findAll(text).forEach { m ->
|
||||||
|
if (m.range.first < offset) res.add(m.groupValues[1])
|
||||||
|
}
|
||||||
|
// 2) find implicit assignments
|
||||||
|
val re2 = Regex("(?:^|[\\n;])\\s*([A-Za-z_][A-Za-z0-9_]*)\\s*=[^=]")
|
||||||
|
re2.findAll(text).forEach { m ->
|
||||||
|
if (m.range.first < offset) res.add(m.groupValues[1])
|
||||||
|
}
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
|
||||||
fun extractImportsFromText(text: String): List<String> {
|
fun extractImportsFromText(text: String): List<String> {
|
||||||
val result = LinkedHashSet<String>()
|
val result = LinkedHashSet<String>()
|
||||||
val re = Regex("^\\s*import\\s+([a-zA-Z_][a-zA-Z0-9_]*(?:\\.[a-zA-Z_][a-zA-Z0-9_]*)*)", RegexOption.MULTILINE)
|
val re = Regex("^\\s*import\\s+([a-zA-Z_][a-zA-Z0-9_]*(?:\\.[a-zA-Z_][a-zA-Z0-9_]*)*)", RegexOption.MULTILINE)
|
||||||
@@ -204,10 +246,14 @@ object DocLookupUtils {
|
|||||||
val rep = list.first()
|
val rep = list.first()
|
||||||
val bases = LinkedHashSet<String>()
|
val bases = LinkedHashSet<String>()
|
||||||
val members = LinkedHashMap<String, MutableList<MiniMemberDecl>>()
|
val members = LinkedHashMap<String, MutableList<MiniMemberDecl>>()
|
||||||
|
val ctorFields = LinkedHashMap<String, MiniCtorField>()
|
||||||
|
val classFields = LinkedHashMap<String, MiniCtorField>()
|
||||||
var doc: MiniDoc? = null
|
var doc: MiniDoc? = null
|
||||||
for (c in list) {
|
for (c in list) {
|
||||||
bases.addAll(c.bases)
|
bases.addAll(c.bases)
|
||||||
if (doc == null && c.doc != null && c.doc.raw.isNotBlank()) doc = c.doc
|
if (doc == null && c.doc != null && c.doc.raw.isNotBlank()) doc = c.doc
|
||||||
|
for (cf in c.ctorFields) ctorFields[cf.name] = cf
|
||||||
|
for (cf in c.classFields) classFields[cf.name] = cf
|
||||||
for (m in c.members) {
|
for (m in c.members) {
|
||||||
// Group by name to keep overloads together
|
// Group by name to keep overloads together
|
||||||
members.getOrPut(m.name) { mutableListOf() }.add(m)
|
members.getOrPut(m.name) { mutableListOf() }.add(m)
|
||||||
@@ -220,8 +266,8 @@ object DocLookupUtils {
|
|||||||
name = rep.name,
|
name = rep.name,
|
||||||
bases = bases.toList(),
|
bases = bases.toList(),
|
||||||
bodyRange = rep.bodyRange,
|
bodyRange = rep.bodyRange,
|
||||||
ctorFields = rep.ctorFields,
|
ctorFields = ctorFields.values.toList(),
|
||||||
classFields = rep.classFields,
|
classFields = classFields.values.toList(),
|
||||||
doc = doc,
|
doc = doc,
|
||||||
nameStart = rep.nameStart,
|
nameStart = rep.nameStart,
|
||||||
members = mergedMembers
|
members = mergedMembers
|
||||||
@@ -232,24 +278,88 @@ object DocLookupUtils {
|
|||||||
for ((name, list) in buckets) {
|
for ((name, list) in buckets) {
|
||||||
result[name] = mergeClassDecls(name, list)
|
result[name] = mergeClassDecls(name, list)
|
||||||
}
|
}
|
||||||
|
// Root object alias
|
||||||
|
if (result.containsKey("Obj") && !result.containsKey("Any")) {
|
||||||
|
result["Any"] = result["Obj"]!!
|
||||||
|
}
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
fun resolveMemberWithInheritance(importedModules: List<String>, className: String, member: String, localMini: MiniScript? = null): Pair<String, MiniMemberDecl>? {
|
internal fun toMemberVal(cf: MiniCtorField): MiniMemberValDecl = MiniMemberValDecl(
|
||||||
|
range = MiniRange(cf.nameStart, cf.nameStart),
|
||||||
|
name = cf.name,
|
||||||
|
mutable = cf.mutable,
|
||||||
|
type = cf.type,
|
||||||
|
initRange = null,
|
||||||
|
doc = null,
|
||||||
|
nameStart = cf.nameStart,
|
||||||
|
isStatic = false,
|
||||||
|
isExtern = false
|
||||||
|
)
|
||||||
|
|
||||||
|
fun resolveMemberWithInheritance(importedModules: List<String>, className: String, member: String, localMini: MiniScript? = null): Pair<String, MiniNamedDecl>? {
|
||||||
val classes = aggregateClasses(importedModules, localMini)
|
val classes = aggregateClasses(importedModules, localMini)
|
||||||
fun dfs(name: String, visited: MutableSet<String>): Pair<String, MiniMemberDecl>? {
|
fun dfs(name: String, visited: MutableSet<String>): Pair<String, MiniNamedDecl>? {
|
||||||
val cls = classes[name] ?: return null
|
|
||||||
cls.members.firstOrNull { it.name == member }?.let { return name to it }
|
|
||||||
if (!visited.add(name)) return null
|
if (!visited.add(name)) return null
|
||||||
for (baseName in cls.bases) {
|
val cls = classes[name]
|
||||||
dfs(baseName, visited)?.let { return it }
|
if (cls != null) {
|
||||||
|
cls.members.firstOrNull { it.name == member }?.let { return name to it }
|
||||||
|
cls.ctorFields.firstOrNull { it.name == member }?.let { return name to toMemberVal(it) }
|
||||||
|
cls.classFields.firstOrNull { it.name == member }?.let { return name to toMemberVal(it) }
|
||||||
|
for (baseName in cls.bases) {
|
||||||
|
dfs(baseName, visited)?.let { return it }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
// 1) local extensions in this class or bases
|
||||||
|
localMini?.declarations?.firstOrNull { d ->
|
||||||
|
(d is MiniFunDecl && d.receiver != null && simpleClassNameOf(d.receiver) == name && d.name == member) ||
|
||||||
|
(d is MiniValDecl && d.receiver != null && simpleClassNameOf(d.receiver) == name && d.name == member)
|
||||||
|
}?.let { return name to it as MiniNamedDecl }
|
||||||
|
|
||||||
|
// 2) built-in extensions from BuiltinDocRegistry
|
||||||
|
for (mod in importedModules) {
|
||||||
|
val decls = BuiltinDocRegistry.docsForModule(mod)
|
||||||
|
decls.firstOrNull { d ->
|
||||||
|
(d is MiniFunDecl && d.receiver != null && simpleClassNameOf(d.receiver) == name && d.name == member) ||
|
||||||
|
(d is MiniValDecl && d.receiver != null && simpleClassNameOf(d.receiver) == name && d.name == member)
|
||||||
|
}?.let { return name to it as MiniNamedDecl }
|
||||||
|
}
|
||||||
|
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
return dfs(className, mutableSetOf())
|
return dfs(className, mutableSetOf())
|
||||||
}
|
}
|
||||||
|
|
||||||
fun findMemberAcrossClasses(importedModules: List<String>, member: String, localMini: MiniScript? = null): Pair<String, MiniMemberDecl>? {
|
fun collectExtensionMemberNames(importedModules: List<String>, className: String, localMini: MiniScript? = null): Set<String> {
|
||||||
|
val classes = aggregateClasses(importedModules, localMini)
|
||||||
|
val visited = mutableSetOf<String>()
|
||||||
|
val result = mutableSetOf<String>()
|
||||||
|
|
||||||
|
fun dfs(name: String) {
|
||||||
|
if (!visited.add(name)) return
|
||||||
|
// 1) stdlib extensions from BuiltinDocRegistry
|
||||||
|
result.addAll(BuiltinDocRegistry.extensionMemberNamesFor(name))
|
||||||
|
// 2) local extensions from mini
|
||||||
|
localMini?.declarations?.forEach { d ->
|
||||||
|
if (d is MiniFunDecl && d.receiver != null && simpleClassNameOf(d.receiver) == name) result.add(d.name)
|
||||||
|
if (d is MiniValDecl && d.receiver != null && simpleClassNameOf(d.receiver) == name) result.add(d.name)
|
||||||
|
}
|
||||||
|
// 3) bases
|
||||||
|
classes[name]?.bases?.forEach { dfs(it) }
|
||||||
|
}
|
||||||
|
|
||||||
|
dfs(className)
|
||||||
|
// Hardcoded supplements for common containers if not explicitly in bases
|
||||||
|
if (className == "List" || className == "Array") {
|
||||||
|
dfs("Collection")
|
||||||
|
dfs("Iterable")
|
||||||
|
}
|
||||||
|
dfs("Any")
|
||||||
|
dfs("Obj")
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
fun findMemberAcrossClasses(importedModules: List<String>, member: String, localMini: MiniScript? = null): Pair<String, MiniNamedDecl>? {
|
||||||
val classes = aggregateClasses(importedModules, localMini)
|
val classes = aggregateClasses(importedModules, localMini)
|
||||||
// Preferred order for ambiguous common ops
|
// Preferred order for ambiguous common ops
|
||||||
val preference = listOf("Iterable", "Iterator", "List")
|
val preference = listOf("Iterable", "Iterator", "List")
|
||||||
@@ -301,6 +411,12 @@ object DocLookupUtils {
|
|||||||
if (mini == null) return null
|
if (mini == null) return null
|
||||||
val i = prevNonWs(text, dotPos - 1)
|
val i = prevNonWs(text, dotPos - 1)
|
||||||
if (i < 0) return null
|
if (i < 0) return null
|
||||||
|
|
||||||
|
// Handle indexing x[0]. or literal [1].
|
||||||
|
if (text[i] == ']') {
|
||||||
|
return guessReceiverClass(text, dotPos, imported, mini)
|
||||||
|
}
|
||||||
|
|
||||||
val wordRange = wordRangeAt(text, i + 1) ?: return null
|
val wordRange = wordRangeAt(text, i + 1) ?: return null
|
||||||
val ident = text.substring(wordRange.first, wordRange.second)
|
val ident = text.substring(wordRange.first, wordRange.second)
|
||||||
|
|
||||||
@@ -310,14 +426,14 @@ object DocLookupUtils {
|
|||||||
if (ref != null) {
|
if (ref != null) {
|
||||||
val sym = binding.symbols.firstOrNull { it.id == ref.symbolId }
|
val sym = binding.symbols.firstOrNull { it.id == ref.symbolId }
|
||||||
if (sym != null) {
|
if (sym != null) {
|
||||||
val type = findTypeByRange(mini, sym.name, sym.declStart)
|
val type = findTypeByRange(mini, sym.name, sym.declStart, text, imported)
|
||||||
simpleClassNameOf(type)?.let { return it }
|
simpleClassNameOf(type)?.let { return it }
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Check if it's a declaration (e.g. static access to a class)
|
// Check if it's a declaration (e.g. static access to a class)
|
||||||
val sym = binding.symbols.firstOrNull { it.declStart == wordRange.first && it.name == ident }
|
val sym = binding.symbols.firstOrNull { it.declStart == wordRange.first && it.name == ident }
|
||||||
if (sym != null) {
|
if (sym != null) {
|
||||||
val type = findTypeByRange(mini, sym.name, sym.declStart)
|
val type = findTypeByRange(mini, sym.name, sym.declStart, text, imported)
|
||||||
simpleClassNameOf(type)?.let { return it }
|
simpleClassNameOf(type)?.let { return it }
|
||||||
// if it's a class/enum, return its name directly
|
// if it's a class/enum, return its name directly
|
||||||
if (sym.kind == net.sergeych.lyng.binding.SymbolKind.Class || sym.kind == net.sergeych.lyng.binding.SymbolKind.Enum) return sym.name
|
if (sym.kind == net.sergeych.lyng.binding.SymbolKind.Class || sym.kind == net.sergeych.lyng.binding.SymbolKind.Enum) return sym.name
|
||||||
@@ -325,13 +441,17 @@ object DocLookupUtils {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1) Global declarations in current file (val/var/fun/class/enum)
|
// 1) Declarations in current file (val/var/fun/class/enum), prioritized by proximity
|
||||||
val d = mini.declarations.firstOrNull { it.name == ident }
|
val src = mini.range.start.source
|
||||||
|
val d = mini.declarations
|
||||||
|
.filter { it.name == ident && src.offsetOf(it.nameStart) < dotPos }
|
||||||
|
.maxByOrNull { src.offsetOf(it.nameStart) }
|
||||||
|
|
||||||
if (d != null) {
|
if (d != null) {
|
||||||
return when (d) {
|
return when (d) {
|
||||||
is MiniClassDecl -> d.name
|
is MiniClassDecl -> d.name
|
||||||
is MiniEnumDecl -> d.name
|
is MiniEnumDecl -> d.name
|
||||||
is MiniValDecl -> simpleClassNameOf(d.type)
|
is MiniValDecl -> simpleClassNameOf(d.type ?: inferTypeRefForVal(d, text, imported, mini))
|
||||||
is MiniFunDecl -> simpleClassNameOf(d.returnType)
|
is MiniFunDecl -> simpleClassNameOf(d.returnType)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -343,6 +463,9 @@ object DocLookupUtils {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 2a) Try to find plain assignment in text if not found in declarations: x = test()
|
||||||
|
inferTypeFromAssignmentInText(ident, text, imported, mini, beforeOffset = dotPos)?.let { return simpleClassNameOf(it) }
|
||||||
|
|
||||||
// 3) Recursive chaining: Base.ident.
|
// 3) Recursive chaining: Base.ident.
|
||||||
val dotBefore = findDotLeft(text, wordRange.first)
|
val dotBefore = findDotLeft(text, wordRange.first)
|
||||||
if (dotBefore != null) {
|
if (dotBefore != null) {
|
||||||
@@ -353,7 +476,7 @@ object DocLookupUtils {
|
|||||||
if (resolved != null) {
|
if (resolved != null) {
|
||||||
val rt = when (val m = resolved.second) {
|
val rt = when (val m = resolved.second) {
|
||||||
is MiniMemberFunDecl -> m.returnType
|
is MiniMemberFunDecl -> m.returnType
|
||||||
is MiniMemberValDecl -> m.type
|
is MiniMemberValDecl -> m.type ?: inferTypeRefFromInitRange(m.initRange, m.nameStart, text, imported, mini)
|
||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
return simpleClassNameOf(rt)
|
return simpleClassNameOf(rt)
|
||||||
@@ -368,6 +491,43 @@ object DocLookupUtils {
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun inferTypeFromAssignmentInText(ident: String, text: String, imported: List<String>, mini: MiniScript?, beforeOffset: Int = Int.MAX_VALUE): MiniTypeRef? {
|
||||||
|
// Heuristic: search for "val ident =" or "ident =" in text
|
||||||
|
val re = Regex("(?:^|[\\n;])\\s*(?:val|var)?\\s*${ident}\\s*(?::\\s*([A-Za-z_][A-Za-z0-9_]*))?\\s*(?:=|by)\\s*([^\\n;]+)")
|
||||||
|
val match = re.findAll(text)
|
||||||
|
.filter { it.range.first < beforeOffset }
|
||||||
|
.lastOrNull() ?: return null
|
||||||
|
val explicitType = match.groupValues.getOrNull(1)?.takeIf { it.isNotBlank() }
|
||||||
|
if (explicitType != null) return syntheticTypeRef(explicitType)
|
||||||
|
val expr = match.groupValues.getOrNull(2)?.let { stripComments(it) } ?: return null
|
||||||
|
return inferTypeRefFromExpression(expr, imported, mini, contextText = text, beforeOffset = beforeOffset)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun stripComments(text: String): String {
|
||||||
|
var result = ""
|
||||||
|
var i = 0
|
||||||
|
var inString = false
|
||||||
|
while (i < text.length) {
|
||||||
|
val ch = text[i]
|
||||||
|
if (ch == '"' && (i == 0 || text[i - 1] != '\\')) {
|
||||||
|
inString = !inString
|
||||||
|
}
|
||||||
|
if (!inString && ch == '/' && i + 1 < text.length) {
|
||||||
|
if (text[i + 1] == '/') break // single line comment
|
||||||
|
if (text[i + 1] == '*') {
|
||||||
|
// Skip block comment
|
||||||
|
i += 2
|
||||||
|
while (i + 1 < text.length && !(text[i] == '*' && text[i + 1] == '/')) i++
|
||||||
|
i += 2 // Skip '*/'
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result += ch
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
return result.trim()
|
||||||
|
}
|
||||||
|
|
||||||
fun guessReturnClassFromMemberCallBeforeMini(mini: MiniScript?, text: String, dotPos: Int, imported: List<String>, binding: BindingSnapshot? = null): String? {
|
fun guessReturnClassFromMemberCallBeforeMini(mini: MiniScript?, text: String, dotPos: Int, imported: List<String>, binding: BindingSnapshot? = null): String? {
|
||||||
if (mini == null) return null
|
if (mini == null) return null
|
||||||
var i = prevNonWs(text, dotPos - 1)
|
var i = prevNonWs(text, dotPos - 1)
|
||||||
@@ -420,7 +580,9 @@ object DocLookupUtils {
|
|||||||
val rt = when (m) {
|
val rt = when (m) {
|
||||||
is MiniMemberFunDecl -> m.returnType
|
is MiniMemberFunDecl -> m.returnType
|
||||||
is MiniMemberValDecl -> m.type
|
is MiniMemberValDecl -> m.type
|
||||||
is MiniInitDecl -> null
|
is MiniFunDecl -> m.returnType
|
||||||
|
is MiniValDecl -> m.type
|
||||||
|
else -> null
|
||||||
}
|
}
|
||||||
simpleClassNameOf(rt)
|
simpleClassNameOf(rt)
|
||||||
}
|
}
|
||||||
@@ -430,6 +592,7 @@ object DocLookupUtils {
|
|||||||
|
|
||||||
fun scanLocalClassMembersFromText(mini: MiniScript, text: String, cls: MiniClassDecl): Map<String, ScannedSig> {
|
fun scanLocalClassMembersFromText(mini: MiniScript, text: String, cls: MiniClassDecl): Map<String, ScannedSig> {
|
||||||
val src = mini.range.start.source
|
val src = mini.range.start.source
|
||||||
|
if (cls.nameStart.source != src) return emptyMap()
|
||||||
val start = src.offsetOf(cls.bodyRange?.start ?: cls.range.start)
|
val start = src.offsetOf(cls.bodyRange?.start ?: cls.range.start)
|
||||||
val end = src.offsetOf(cls.bodyRange?.end ?: cls.range.end).coerceAtMost(text.length)
|
val end = src.offsetOf(cls.bodyRange?.end ?: cls.range.end).coerceAtMost(text.length)
|
||||||
if (start !in 0..end) return emptyMap()
|
if (start !in 0..end) return emptyMap()
|
||||||
@@ -454,13 +617,25 @@ object DocLookupUtils {
|
|||||||
return map
|
return map
|
||||||
}
|
}
|
||||||
|
|
||||||
fun guessReceiverClass(text: String, dotPos: Int, imported: List<String>, mini: MiniScript? = null): String? {
|
fun guessReceiverClass(text: String, dotPos: Int, imported: List<String>, mini: MiniScript? = null, beforeOffset: Int = dotPos): String? {
|
||||||
guessClassFromCallBefore(text, dotPos, imported, mini)?.let { return it }
|
guessClassFromCallBefore(text, dotPos, imported, mini)?.let { return it }
|
||||||
var i = prevNonWs(text, dotPos - 1)
|
var i = prevNonWs(text, dotPos - 1)
|
||||||
if (i >= 0) {
|
if (i >= 0) {
|
||||||
when (text[i]) {
|
when (text[i]) {
|
||||||
'"' -> return "String"
|
'"' -> return "String"
|
||||||
']' -> return "List"
|
']' -> {
|
||||||
|
// Check if literal or indexing
|
||||||
|
val matchingOpen = findMatchingOpenBracket(text, i)
|
||||||
|
if (matchingOpen != null && matchingOpen > 0) {
|
||||||
|
val beforeOpen = prevNonWs(text, matchingOpen - 1)
|
||||||
|
if (beforeOpen >= 0 && (isIdentChar(text[beforeOpen]) || text[beforeOpen] == ')' || text[beforeOpen] == ']')) {
|
||||||
|
// Likely indexing: infer type of full expression
|
||||||
|
val exprText = text.substring(0, i + 1)
|
||||||
|
return simpleClassNameOf(inferTypeRefFromExpression(exprText, imported, mini, beforeOffset = beforeOffset))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "List"
|
||||||
|
}
|
||||||
'}' -> return "Dict"
|
'}' -> return "Dict"
|
||||||
')' -> {
|
')' -> {
|
||||||
// Parenthesized expression: walk back to matching '(' and inspect the inner expression
|
// Parenthesized expression: walk back to matching '(' and inspect the inner expression
|
||||||
@@ -512,6 +687,12 @@ object DocLookupUtils {
|
|||||||
val identRange = wordRangeAt(text, i + 1)
|
val identRange = wordRangeAt(text, i + 1)
|
||||||
if (identRange != null) {
|
if (identRange != null) {
|
||||||
val ident = text.substring(identRange.first, identRange.second)
|
val ident = text.substring(identRange.first, identRange.second)
|
||||||
|
|
||||||
|
// 3a) Handle plain "this"
|
||||||
|
if (ident == "this" && mini != null) {
|
||||||
|
findEnclosingClass(mini, identRange.first)?.let { return it.name }
|
||||||
|
}
|
||||||
|
|
||||||
// if it's "as Type", we want Type
|
// if it's "as Type", we want Type
|
||||||
var k = prevNonWs(text, identRange.first - 1)
|
var k = prevNonWs(text, identRange.first - 1)
|
||||||
if (k >= 1 && text[k] == 's' && text[k - 1] == 'a' && (k - 1 == 0 || !text[k - 2].isLetterOrDigit())) {
|
if (k >= 1 && text[k] == 's' && text[k - 1] == 'a' && (k - 1 == 0 || !text[k - 2].isLetterOrDigit())) {
|
||||||
@@ -563,7 +744,9 @@ object DocLookupUtils {
|
|||||||
val ret = when (member) {
|
val ret = when (member) {
|
||||||
is MiniMemberFunDecl -> member.returnType
|
is MiniMemberFunDecl -> member.returnType
|
||||||
is MiniMemberValDecl -> member.type
|
is MiniMemberValDecl -> member.type
|
||||||
is MiniInitDecl -> null
|
is MiniFunDecl -> member.returnType
|
||||||
|
is MiniValDecl -> member.type
|
||||||
|
else -> null
|
||||||
}
|
}
|
||||||
return simpleClassNameOf(ret)
|
return simpleClassNameOf(ret)
|
||||||
}
|
}
|
||||||
@@ -626,11 +809,216 @@ object DocLookupUtils {
|
|||||||
val ret = when (member) {
|
val ret = when (member) {
|
||||||
is MiniMemberFunDecl -> member.returnType
|
is MiniMemberFunDecl -> member.returnType
|
||||||
is MiniMemberValDecl -> member.type
|
is MiniMemberValDecl -> member.type
|
||||||
is MiniInitDecl -> null
|
is MiniFunDecl -> member.returnType
|
||||||
|
is MiniValDecl -> member.type
|
||||||
|
else -> null
|
||||||
}
|
}
|
||||||
return simpleClassNameOf(ret)
|
return simpleClassNameOf(ret)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun inferTypeRefFromExpression(text: String, imported: List<String>, mini: MiniScript? = null, contextText: String? = null, beforeOffset: Int = Int.MAX_VALUE): MiniTypeRef? {
|
||||||
|
val trimmed = stripComments(text)
|
||||||
|
if (trimmed.isEmpty()) return null
|
||||||
|
val fullText = contextText ?: text
|
||||||
|
|
||||||
|
// 1) Literals
|
||||||
|
if (trimmed.startsWith("\"")) return syntheticTypeRef("String")
|
||||||
|
if (trimmed.startsWith("[")) return syntheticTypeRef("List")
|
||||||
|
if (trimmed.startsWith("{")) return syntheticTypeRef("Dict")
|
||||||
|
if (trimmed == "true" || trimmed == "false") return syntheticTypeRef("Boolean")
|
||||||
|
if (trimmed.all { it.isDigit() || it == '.' || it == '_' || it == 'e' || it == 'E' }) {
|
||||||
|
val hasDigits = trimmed.any { it.isDigit() }
|
||||||
|
if (hasDigits)
|
||||||
|
return if (trimmed.contains('.') || trimmed.contains('e', ignoreCase = true)) syntheticTypeRef("Real") else syntheticTypeRef("Int")
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2) Function/Constructor calls or Indexing
|
||||||
|
if (trimmed.endsWith(")")) {
|
||||||
|
val openParen = findMatchingOpenParen(trimmed, trimmed.length - 1)
|
||||||
|
if (openParen != null && openParen > 0) {
|
||||||
|
var j = openParen - 1
|
||||||
|
while (j >= 0 && trimmed[j].isWhitespace()) j--
|
||||||
|
val end = j + 1
|
||||||
|
while (j >= 0 && isIdentChar(trimmed[j])) j--
|
||||||
|
val start = j + 1
|
||||||
|
if (start < end) {
|
||||||
|
val callee = trimmed.substring(start, end)
|
||||||
|
|
||||||
|
// Check if it's a member call (dot before callee)
|
||||||
|
var k = start - 1
|
||||||
|
while (k >= 0 && trimmed[k].isWhitespace()) k--
|
||||||
|
if (k >= 0 && trimmed[k] == '.') {
|
||||||
|
val prevDot = k
|
||||||
|
// Recursive: try to infer type of what's before the dot
|
||||||
|
val receiverText = trimmed.substring(0, prevDot)
|
||||||
|
val receiverType = inferTypeRefFromExpression(receiverText, imported, mini, contextText = fullText, beforeOffset = beforeOffset)
|
||||||
|
val receiverClass = simpleClassNameOf(receiverType)
|
||||||
|
if (receiverClass != null) {
|
||||||
|
val resolved = resolveMemberWithInheritance(imported, receiverClass, callee, mini)
|
||||||
|
if (resolved != null) {
|
||||||
|
return when (val m = resolved.second) {
|
||||||
|
is MiniMemberFunDecl -> m.returnType
|
||||||
|
is MiniMemberValDecl -> m.type ?: inferTypeRefFromInitRange(m.initRange, m.nameStart, fullText, imported, mini)
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Top-level call or constructor
|
||||||
|
val classes = aggregateClasses(imported, mini)
|
||||||
|
if (classes.containsKey(callee)) return syntheticTypeRef(callee)
|
||||||
|
|
||||||
|
for (mod in imported) {
|
||||||
|
val decls = BuiltinDocRegistry.docsForModule(mod)
|
||||||
|
val fn = decls.asSequence().filterIsInstance<MiniFunDecl>().firstOrNull { it.name == callee }
|
||||||
|
if (fn != null) return fn.returnType
|
||||||
|
}
|
||||||
|
mini?.declarations?.filterIsInstance<MiniFunDecl>()?.firstOrNull { it.name == callee }?.let { return it.returnType }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (trimmed.endsWith("]")) {
|
||||||
|
val openBracket = findMatchingOpenBracket(trimmed, trimmed.length - 1)
|
||||||
|
if (openBracket != null && openBracket > 0) {
|
||||||
|
val receiverText = trimmed.substring(0, openBracket).trim()
|
||||||
|
if (receiverText.isNotEmpty()) {
|
||||||
|
val receiverType = inferTypeRefFromExpression(receiverText, imported, mini, contextText = fullText, beforeOffset = beforeOffset)
|
||||||
|
if (receiverType is MiniGenericType) {
|
||||||
|
val baseName = simpleClassNameOf(receiverType.base)
|
||||||
|
if (baseName == "List" && receiverType.args.isNotEmpty()) {
|
||||||
|
return receiverType.args[0]
|
||||||
|
}
|
||||||
|
if (baseName == "Map" && receiverType.args.size >= 2) {
|
||||||
|
return receiverType.args[1]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Fallback for non-generic collections or if base name matches
|
||||||
|
val baseName = simpleClassNameOf(receiverType)
|
||||||
|
if (baseName == "List" || baseName == "Array" || baseName == "String") {
|
||||||
|
if (baseName == "String") return syntheticTypeRef("Char")
|
||||||
|
return syntheticTypeRef("Any")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3) Member field or simple identifier at the end
|
||||||
|
val lastWord = wordRangeAt(trimmed, trimmed.length)
|
||||||
|
if (lastWord != null && lastWord.second == trimmed.length) {
|
||||||
|
val ident = trimmed.substring(lastWord.first, lastWord.second)
|
||||||
|
var k = lastWord.first - 1
|
||||||
|
while (k >= 0 && trimmed[k].isWhitespace()) k--
|
||||||
|
if (k >= 0 && trimmed[k] == '.') {
|
||||||
|
// Member field: receiver.ident
|
||||||
|
val receiverText = trimmed.substring(0, k).trim()
|
||||||
|
val receiverType = inferTypeRefFromExpression(receiverText, imported, mini, contextText = fullText, beforeOffset = beforeOffset)
|
||||||
|
val receiverClass = simpleClassNameOf(receiverType)
|
||||||
|
if (receiverClass != null) {
|
||||||
|
val resolved = resolveMemberWithInheritance(imported, receiverClass, ident, mini)
|
||||||
|
if (resolved != null) {
|
||||||
|
return when (val m = resolved.second) {
|
||||||
|
is MiniMemberFunDecl -> m.returnType
|
||||||
|
is MiniMemberValDecl -> m.type ?: inferTypeRefFromInitRange(m.initRange, m.nameStart, fullText, imported, mini)
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Simple identifier
|
||||||
|
// 1) Declarations in current file (val/var/fun/class/enum), prioritized by proximity
|
||||||
|
val src = mini?.range?.start?.source
|
||||||
|
val d = if (src != null) {
|
||||||
|
mini.declarations
|
||||||
|
.filter { it.name == ident && src.offsetOf(it.nameStart) < beforeOffset }
|
||||||
|
.maxByOrNull { src.offsetOf(it.nameStart) }
|
||||||
|
} else {
|
||||||
|
mini?.declarations?.firstOrNull { it.name == ident }
|
||||||
|
}
|
||||||
|
|
||||||
|
if (d != null) {
|
||||||
|
return when (d) {
|
||||||
|
is MiniClassDecl -> syntheticTypeRef(d.name)
|
||||||
|
is MiniEnumDecl -> syntheticTypeRef(d.name)
|
||||||
|
is MiniValDecl -> d.type ?: inferTypeRefForVal(d, fullText, imported, mini)
|
||||||
|
is MiniFunDecl -> d.returnType
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2) Parameters in any function
|
||||||
|
for (fd in mini?.declarations?.filterIsInstance<MiniFunDecl>() ?: emptyList()) {
|
||||||
|
for (p in fd.params) {
|
||||||
|
if (p.name == ident) return p.type
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3) Try to find plain assignment in text: ident = expr
|
||||||
|
inferTypeFromAssignmentInText(ident, fullText, imported, mini, beforeOffset = beforeOffset)?.let { return it }
|
||||||
|
|
||||||
|
// 4) Check if it's a known class (static access)
|
||||||
|
val classes = aggregateClasses(imported, mini)
|
||||||
|
if (classes.containsKey(ident)) return syntheticTypeRef(ident)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun findMatchingOpenBracket(text: String, closeBracketPos: Int): Int? {
|
||||||
|
if (closeBracketPos < 0 || closeBracketPos >= text.length || text[closeBracketPos] != ']') return null
|
||||||
|
var depth = 0
|
||||||
|
var i = closeBracketPos - 1
|
||||||
|
while (i >= 0) {
|
||||||
|
when (text[i]) {
|
||||||
|
']' -> depth++
|
||||||
|
'[' -> if (depth == 0) return i else depth--
|
||||||
|
}
|
||||||
|
i--
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun findMatchingOpenParen(text: String, closeParenPos: Int): Int? {
|
||||||
|
if (closeParenPos < 0 || closeParenPos >= text.length || text[closeParenPos] != ')') return null
|
||||||
|
var depth = 0
|
||||||
|
var i = closeParenPos - 1
|
||||||
|
while (i >= 0) {
|
||||||
|
when (text[i]) {
|
||||||
|
')' -> depth++
|
||||||
|
'(' -> if (depth == 0) return i else depth--
|
||||||
|
}
|
||||||
|
i--
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun syntheticTypeRef(name: String): MiniTypeRef =
|
||||||
|
MiniTypeName(MiniRange(net.sergeych.lyng.Pos.builtIn, net.sergeych.lyng.Pos.builtIn),
|
||||||
|
listOf(MiniTypeName.Segment(name, MiniRange(net.sergeych.lyng.Pos.builtIn, net.sergeych.lyng.Pos.builtIn))), false)
|
||||||
|
|
||||||
|
fun inferTypeRefForVal(vd: MiniValDecl, text: String, imported: List<String>, mini: MiniScript?): MiniTypeRef? {
|
||||||
|
return inferTypeRefFromInitRange(vd.initRange, vd.nameStart, text, imported, mini)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun inferTypeRefFromInitRange(initRange: MiniRange?, nameStart: net.sergeych.lyng.Pos, text: String, imported: List<String>, mini: MiniScript?): MiniTypeRef? {
|
||||||
|
val range = initRange ?: return null
|
||||||
|
val src = mini?.range?.start?.source ?: return null
|
||||||
|
val start = src.offsetOf(range.start)
|
||||||
|
val end = src.offsetOf(range.end)
|
||||||
|
if (start < 0 || start >= end || end > text.length) return null
|
||||||
|
|
||||||
|
var exprText = text.substring(start, end).trim()
|
||||||
|
if (exprText.startsWith("=")) {
|
||||||
|
exprText = exprText.substring(1).trim()
|
||||||
|
}
|
||||||
|
if (exprText.startsWith("by")) {
|
||||||
|
exprText = exprText.substring(2).trim()
|
||||||
|
}
|
||||||
|
val beforeOffset = src.offsetOf(nameStart)
|
||||||
|
return inferTypeRefFromExpression(exprText, imported, mini, contextText = text, beforeOffset = beforeOffset)
|
||||||
|
}
|
||||||
|
|
||||||
fun simpleClassNameOf(t: MiniTypeRef?): String? = when (t) {
|
fun simpleClassNameOf(t: MiniTypeRef?): String? = when (t) {
|
||||||
null -> null
|
null -> null
|
||||||
is MiniTypeName -> t.segments.lastOrNull()?.name
|
is MiniTypeName -> t.segments.lastOrNull()?.name
|
||||||
@@ -639,6 +1027,17 @@ object DocLookupUtils {
|
|||||||
is MiniTypeVar -> null
|
is MiniTypeVar -> null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun typeOf(t: MiniTypeRef?): String = when (t) {
|
||||||
|
is MiniTypeName -> t.segments.joinToString(".") { it.name } + (if (t.nullable) "?" else "")
|
||||||
|
is MiniGenericType -> typeOf(t.base) + "<" + t.args.joinToString(", ") { typeOf(it) } + ">" + (if (t.nullable) "?" else "")
|
||||||
|
is MiniFunctionType -> {
|
||||||
|
val r = t.receiver?.let { typeOf(it) + "." } ?: ""
|
||||||
|
r + "(" + t.params.joinToString(", ") { typeOf(it) } + ") -> " + typeOf(t.returnType) + (if (t.nullable) "?" else "")
|
||||||
|
}
|
||||||
|
is MiniTypeVar -> t.name + (if (t.nullable) "?" else "")
|
||||||
|
null -> ""
|
||||||
|
}
|
||||||
|
|
||||||
fun findDotLeft(text: String, offset: Int): Int? {
|
fun findDotLeft(text: String, offset: Int): Int? {
|
||||||
var i = (offset - 1).coerceAtLeast(0)
|
var i = (offset - 1).coerceAtLeast(0)
|
||||||
while (i >= 0 && text[i].isWhitespace()) i--
|
while (i >= 0 && text[i].isWhitespace()) i--
|
||||||
@@ -666,13 +1065,13 @@ object DocLookupUtils {
|
|||||||
fun enumToSyntheticClass(en: MiniEnumDecl): MiniClassDecl {
|
fun enumToSyntheticClass(en: MiniEnumDecl): MiniClassDecl {
|
||||||
val staticMembers = mutableListOf<MiniMemberDecl>()
|
val staticMembers = mutableListOf<MiniMemberDecl>()
|
||||||
// entries: List
|
// entries: List
|
||||||
staticMembers.add(MiniMemberValDecl(en.range, "entries", false, null, null, en.nameStart, isStatic = true))
|
staticMembers.add(MiniMemberValDecl(en.range, "entries", false, null, null, null, en.nameStart, isStatic = true))
|
||||||
// valueOf(name: String): Enum
|
// valueOf(name: String): Enum
|
||||||
staticMembers.add(MiniMemberFunDecl(en.range, "valueOf", listOf(MiniParam("name", null, en.nameStart)), null, null, en.nameStart, isStatic = true))
|
staticMembers.add(MiniMemberFunDecl(en.range, "valueOf", listOf(MiniParam("name", null, en.nameStart)), null, null, en.nameStart, isStatic = true))
|
||||||
|
|
||||||
// Also add each entry as a static member (const)
|
// Also add each entry as a static member (const)
|
||||||
for (entry in en.entries) {
|
for (entry in en.entries) {
|
||||||
staticMembers.add(MiniMemberValDecl(en.range, entry, false, MiniTypeName(en.range, listOf(MiniTypeName.Segment(en.name, en.range)), false), null, en.nameStart, isStatic = true))
|
staticMembers.add(MiniMemberValDecl(en.range, entry, false, MiniTypeName(en.range, listOf(MiniTypeName.Segment(en.name, en.range)), false), null, null, en.nameStart, isStatic = true))
|
||||||
}
|
}
|
||||||
|
|
||||||
return MiniClassDecl(
|
return MiniClassDecl(
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -145,6 +145,23 @@ fun ObjClass.addClassFnDoc(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun ObjClass.addPropertyDoc(
|
||||||
|
name: String,
|
||||||
|
doc: String,
|
||||||
|
type: TypeDoc? = null,
|
||||||
|
visibility: Visibility = Visibility.Public,
|
||||||
|
moduleName: String? = null,
|
||||||
|
getter: (suspend Scope.() -> Obj)? = null,
|
||||||
|
setter: (suspend Scope.(Obj) -> Unit)? = null
|
||||||
|
) {
|
||||||
|
addProperty(name, getter, setter, visibility)
|
||||||
|
BuiltinDocRegistry.module(moduleName ?: ownerModuleNameFromClassOrUnknown()) {
|
||||||
|
classDoc(this@addPropertyDoc.className, doc = "") {
|
||||||
|
field(name = name, doc = doc, type = type, mutable = setter != null)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun ObjClass.addClassConstDoc(
|
fun ObjClass.addClassConstDoc(
|
||||||
name: String,
|
name: String,
|
||||||
value: Obj,
|
value: Obj,
|
||||||
|
|||||||
@@ -39,7 +39,56 @@ data class MiniDoc(
|
|||||||
val raw: String,
|
val raw: String,
|
||||||
val summary: String?,
|
val summary: String?,
|
||||||
val tags: Map<String, List<String>> = emptyMap()
|
val tags: Map<String, List<String>> = emptyMap()
|
||||||
)
|
) {
|
||||||
|
companion object {
|
||||||
|
fun parse(range: MiniRange, lines: Iterable<String>, extraTags: Map<String, List<String>> = emptyMap()): MiniDoc {
|
||||||
|
val parsedTags = mutableMapOf<String, MutableList<String>>()
|
||||||
|
var currentTag: String? = null
|
||||||
|
val currentContent = StringBuilder()
|
||||||
|
|
||||||
|
fun flush() {
|
||||||
|
currentTag?.let { tag ->
|
||||||
|
parsedTags.getOrPut(tag) { mutableListOf() }.add(currentContent.toString().trim())
|
||||||
|
}
|
||||||
|
currentContent.setLength(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
val descriptionLines = mutableListOf<String>()
|
||||||
|
var inTags = false
|
||||||
|
|
||||||
|
for (rawLine in lines) {
|
||||||
|
for (line in rawLine.lines()) {
|
||||||
|
val trimmed = line.trim()
|
||||||
|
if (trimmed.startsWith("@")) {
|
||||||
|
inTags = true
|
||||||
|
flush()
|
||||||
|
val parts = trimmed.substring(1).split(Regex("\\s+"), 2)
|
||||||
|
currentTag = parts[0]
|
||||||
|
currentContent.append(parts.getOrNull(1) ?: "")
|
||||||
|
} else {
|
||||||
|
if (inTags) {
|
||||||
|
if (currentContent.isNotEmpty()) currentContent.append("\n")
|
||||||
|
currentContent.append(line)
|
||||||
|
} else {
|
||||||
|
descriptionLines.add(line)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
flush()
|
||||||
|
|
||||||
|
val raw = descriptionLines.joinToString("\n").trimEnd()
|
||||||
|
val summary = raw.lines().firstOrNull { it.isNotBlank() }?.trim()
|
||||||
|
|
||||||
|
val finalTags = parsedTags.toMutableMap()
|
||||||
|
extraTags.forEach { (k, v) ->
|
||||||
|
finalTags.getOrPut(k) { mutableListOf() }.addAll(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
return MiniDoc(range, raw, summary, finalTags)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sealed interface MiniNode { val range: MiniRange }
|
sealed interface MiniNode { val range: MiniRange }
|
||||||
|
|
||||||
@@ -81,13 +130,17 @@ data class MiniTypeVar(
|
|||||||
) : MiniTypeRef
|
) : MiniTypeRef
|
||||||
|
|
||||||
// Script and declarations (lean subset; can be extended later)
|
// Script and declarations (lean subset; can be extended later)
|
||||||
sealed interface MiniDecl : MiniNode {
|
sealed interface MiniNamedDecl : MiniNode {
|
||||||
val name: String
|
val name: String
|
||||||
val doc: MiniDoc?
|
val doc: MiniDoc?
|
||||||
// Start position of the declaration name identifier in source; end can be derived as start + name.length
|
// Start position of the declaration name identifier in source; end can be derived as start + name.length
|
||||||
val nameStart: Pos
|
val nameStart: Pos
|
||||||
|
val isExtern: Boolean
|
||||||
|
val isStatic: Boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sealed interface MiniDecl : MiniNamedDecl
|
||||||
|
|
||||||
data class MiniScript(
|
data class MiniScript(
|
||||||
override val range: MiniRange,
|
override val range: MiniRange,
|
||||||
val declarations: MutableList<MiniDecl> = mutableListOf(),
|
val declarations: MutableList<MiniDecl> = mutableListOf(),
|
||||||
@@ -110,7 +163,9 @@ data class MiniFunDecl(
|
|||||||
val body: MiniBlock?,
|
val body: MiniBlock?,
|
||||||
override val doc: MiniDoc?,
|
override val doc: MiniDoc?,
|
||||||
override val nameStart: Pos,
|
override val nameStart: Pos,
|
||||||
val receiver: MiniTypeRef? = null
|
val receiver: MiniTypeRef? = null,
|
||||||
|
override val isExtern: Boolean = false,
|
||||||
|
override val isStatic: Boolean = false,
|
||||||
) : MiniDecl
|
) : MiniDecl
|
||||||
|
|
||||||
data class MiniValDecl(
|
data class MiniValDecl(
|
||||||
@@ -121,7 +176,9 @@ data class MiniValDecl(
|
|||||||
val initRange: MiniRange?,
|
val initRange: MiniRange?,
|
||||||
override val doc: MiniDoc?,
|
override val doc: MiniDoc?,
|
||||||
override val nameStart: Pos,
|
override val nameStart: Pos,
|
||||||
val receiver: MiniTypeRef? = null
|
val receiver: MiniTypeRef? = null,
|
||||||
|
override val isExtern: Boolean = false,
|
||||||
|
override val isStatic: Boolean = false,
|
||||||
) : MiniDecl
|
) : MiniDecl
|
||||||
|
|
||||||
data class MiniClassDecl(
|
data class MiniClassDecl(
|
||||||
@@ -134,7 +191,10 @@ data class MiniClassDecl(
|
|||||||
override val doc: MiniDoc?,
|
override val doc: MiniDoc?,
|
||||||
override val nameStart: Pos,
|
override val nameStart: Pos,
|
||||||
// Built-in extension: list of member declarations (functions and fields)
|
// Built-in extension: list of member declarations (functions and fields)
|
||||||
val members: List<MiniMemberDecl> = emptyList()
|
val members: List<MiniMemberDecl> = emptyList(),
|
||||||
|
override val isExtern: Boolean = false,
|
||||||
|
override val isStatic: Boolean = false,
|
||||||
|
val isObject: Boolean = false
|
||||||
) : MiniDecl
|
) : MiniDecl
|
||||||
|
|
||||||
data class MiniEnumDecl(
|
data class MiniEnumDecl(
|
||||||
@@ -142,7 +202,10 @@ data class MiniEnumDecl(
|
|||||||
override val name: String,
|
override val name: String,
|
||||||
val entries: List<String>,
|
val entries: List<String>,
|
||||||
override val doc: MiniDoc?,
|
override val doc: MiniDoc?,
|
||||||
override val nameStart: Pos
|
override val nameStart: Pos,
|
||||||
|
override val isExtern: Boolean = false,
|
||||||
|
override val isStatic: Boolean = false,
|
||||||
|
val entryPositions: List<Pos> = emptyList()
|
||||||
) : MiniDecl
|
) : MiniDecl
|
||||||
|
|
||||||
data class MiniCtorField(
|
data class MiniCtorField(
|
||||||
@@ -166,11 +229,8 @@ data class MiniIdentifier(
|
|||||||
) : MiniNode
|
) : MiniNode
|
||||||
|
|
||||||
// --- Class member declarations (for built-in/registry docs) ---
|
// --- Class member declarations (for built-in/registry docs) ---
|
||||||
sealed interface MiniMemberDecl : MiniNode {
|
sealed interface MiniMemberDecl : MiniNamedDecl {
|
||||||
val name: String
|
override val isStatic: Boolean
|
||||||
val doc: MiniDoc?
|
|
||||||
val nameStart: Pos
|
|
||||||
val isStatic: Boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
data class MiniMemberFunDecl(
|
data class MiniMemberFunDecl(
|
||||||
@@ -181,6 +241,8 @@ data class MiniMemberFunDecl(
|
|||||||
override val doc: MiniDoc?,
|
override val doc: MiniDoc?,
|
||||||
override val nameStart: Pos,
|
override val nameStart: Pos,
|
||||||
override val isStatic: Boolean = false,
|
override val isStatic: Boolean = false,
|
||||||
|
override val isExtern: Boolean = false,
|
||||||
|
val body: MiniBlock? = null
|
||||||
) : MiniMemberDecl
|
) : MiniMemberDecl
|
||||||
|
|
||||||
data class MiniMemberValDecl(
|
data class MiniMemberValDecl(
|
||||||
@@ -188,9 +250,11 @@ data class MiniMemberValDecl(
|
|||||||
override val name: String,
|
override val name: String,
|
||||||
val mutable: Boolean,
|
val mutable: Boolean,
|
||||||
val type: MiniTypeRef?,
|
val type: MiniTypeRef?,
|
||||||
|
val initRange: MiniRange?,
|
||||||
override val doc: MiniDoc?,
|
override val doc: MiniDoc?,
|
||||||
override val nameStart: Pos,
|
override val nameStart: Pos,
|
||||||
override val isStatic: Boolean = false,
|
override val isStatic: Boolean = false,
|
||||||
|
override val isExtern: Boolean = false,
|
||||||
) : MiniMemberDecl
|
) : MiniMemberDecl
|
||||||
|
|
||||||
data class MiniInitDecl(
|
data class MiniInitDecl(
|
||||||
@@ -200,6 +264,7 @@ data class MiniInitDecl(
|
|||||||
override val name: String get() = "init"
|
override val name: String get() = "init"
|
||||||
override val doc: MiniDoc? get() = null
|
override val doc: MiniDoc? get() = null
|
||||||
override val isStatic: Boolean get() = false
|
override val isStatic: Boolean get() = false
|
||||||
|
override val isExtern: Boolean get() = false
|
||||||
}
|
}
|
||||||
|
|
||||||
// Streaming sink to collect mini-AST during parsing. Implementations may assemble a tree or process events.
|
// Streaming sink to collect mini-AST during parsing. Implementations may assemble a tree or process events.
|
||||||
@@ -209,6 +274,12 @@ interface MiniAstSink {
|
|||||||
|
|
||||||
fun onDocCandidate(doc: MiniDoc) {}
|
fun onDocCandidate(doc: MiniDoc) {}
|
||||||
|
|
||||||
|
fun onEnterClass(node: MiniClassDecl) {}
|
||||||
|
fun onExitClass(end: Pos) {}
|
||||||
|
|
||||||
|
fun onEnterFunction(node: MiniFunDecl?) {}
|
||||||
|
fun onExitFunction(end: Pos) {}
|
||||||
|
|
||||||
fun onImport(node: MiniImport) {}
|
fun onImport(node: MiniImport) {}
|
||||||
fun onFunDecl(node: MiniFunDecl) {}
|
fun onFunDecl(node: MiniFunDecl) {}
|
||||||
fun onValDecl(node: MiniValDecl) {}
|
fun onValDecl(node: MiniValDecl) {}
|
||||||
@@ -238,8 +309,10 @@ interface MiniTypeTrace {
|
|||||||
class MiniAstBuilder : MiniAstSink {
|
class MiniAstBuilder : MiniAstSink {
|
||||||
private var currentScript: MiniScript? = null
|
private var currentScript: MiniScript? = null
|
||||||
private val blocks = ArrayDeque<MiniBlock>()
|
private val blocks = ArrayDeque<MiniBlock>()
|
||||||
|
private val classStack = ArrayDeque<MiniClassDecl>()
|
||||||
private var lastDoc: MiniDoc? = null
|
private var lastDoc: MiniDoc? = null
|
||||||
private var scriptDepth: Int = 0
|
private var scriptDepth: Int = 0
|
||||||
|
private var functionDepth: Int = 0
|
||||||
|
|
||||||
fun build(): MiniScript? = currentScript
|
fun build(): MiniScript? = currentScript
|
||||||
|
|
||||||
@@ -262,26 +335,119 @@ class MiniAstBuilder : MiniAstSink {
|
|||||||
lastDoc = doc
|
lastDoc = doc
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onEnterClass(node: MiniClassDecl) {
|
||||||
|
val attach = node.copy(doc = node.doc ?: lastDoc)
|
||||||
|
classStack.addLast(attach)
|
||||||
|
lastDoc = null
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onExitClass(end: Pos) {
|
||||||
|
val finished = classStack.removeLastOrNull()
|
||||||
|
if (finished != null) {
|
||||||
|
val updated = finished.copy(range = MiniRange(finished.range.start, end))
|
||||||
|
// Always add to top-level for now to ensure visibility in light engine
|
||||||
|
currentScript?.declarations?.add(updated)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onEnterFunction(node: MiniFunDecl?) {
|
||||||
|
functionDepth++
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onExitFunction(end: Pos) {
|
||||||
|
functionDepth--
|
||||||
|
}
|
||||||
|
|
||||||
override fun onImport(node: MiniImport) {
|
override fun onImport(node: MiniImport) {
|
||||||
currentScript?.imports?.add(node)
|
currentScript?.imports?.add(node)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onFunDecl(node: MiniFunDecl) {
|
override fun onFunDecl(node: MiniFunDecl) {
|
||||||
val attach = node.copy(doc = node.doc ?: lastDoc)
|
val attach = node.copy(doc = node.doc ?: lastDoc)
|
||||||
currentScript?.declarations?.add(attach)
|
val currentClass = classStack.lastOrNull()
|
||||||
|
if (currentClass != null && functionDepth == 0) {
|
||||||
|
// Convert MiniFunDecl to MiniMemberFunDecl for inclusion in members
|
||||||
|
val member = MiniMemberFunDecl(
|
||||||
|
range = attach.range,
|
||||||
|
name = attach.name,
|
||||||
|
params = attach.params,
|
||||||
|
returnType = attach.returnType,
|
||||||
|
doc = attach.doc,
|
||||||
|
nameStart = attach.nameStart,
|
||||||
|
isStatic = attach.isStatic,
|
||||||
|
isExtern = attach.isExtern,
|
||||||
|
body = attach.body
|
||||||
|
)
|
||||||
|
// Need to update the class in the stack since it's immutable-ish (data class)
|
||||||
|
// Check if we already have this member (from a previous onFunDecl call for the same function)
|
||||||
|
val existing = currentClass.members.filterIsInstance<MiniMemberFunDecl>().find { it.name == attach.name && it.nameStart == attach.nameStart }
|
||||||
|
if (existing != null) {
|
||||||
|
val members = currentClass.members.map { if (it === existing) member else it }
|
||||||
|
classStack.removeLast()
|
||||||
|
classStack.addLast(currentClass.copy(members = members))
|
||||||
|
} else {
|
||||||
|
classStack.removeLast()
|
||||||
|
classStack.addLast(currentClass.copy(members = currentClass.members + member))
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Check if already in declarations to avoid duplication
|
||||||
|
val existing = currentScript?.declarations?.find { it.name == attach.name && it.nameStart == attach.nameStart }
|
||||||
|
if (existing != null) {
|
||||||
|
val idx = currentScript?.declarations?.indexOf(existing) ?: -1
|
||||||
|
if (idx >= 0) currentScript?.declarations?.set(idx, attach)
|
||||||
|
} else {
|
||||||
|
currentScript?.declarations?.add(attach)
|
||||||
|
}
|
||||||
|
}
|
||||||
lastDoc = null
|
lastDoc = null
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onValDecl(node: MiniValDecl) {
|
override fun onValDecl(node: MiniValDecl) {
|
||||||
val attach = node.copy(doc = node.doc ?: lastDoc)
|
val attach = node.copy(doc = node.doc ?: lastDoc)
|
||||||
currentScript?.declarations?.add(attach)
|
val currentClass = classStack.lastOrNull()
|
||||||
|
if (currentClass != null && functionDepth == 0) {
|
||||||
|
val member = MiniMemberValDecl(
|
||||||
|
range = attach.range,
|
||||||
|
name = attach.name,
|
||||||
|
mutable = attach.mutable,
|
||||||
|
type = attach.type,
|
||||||
|
initRange = attach.initRange,
|
||||||
|
doc = attach.doc,
|
||||||
|
nameStart = attach.nameStart,
|
||||||
|
isStatic = attach.isStatic,
|
||||||
|
isExtern = attach.isExtern
|
||||||
|
)
|
||||||
|
// Duplicates for vals are rare but possible if Compiler calls it twice
|
||||||
|
val existing = currentClass.members.filterIsInstance<MiniMemberValDecl>().find { it.name == attach.name && it.nameStart == attach.nameStart }
|
||||||
|
if (existing != null) {
|
||||||
|
val members = currentClass.members.map { if (it === existing) member else it }
|
||||||
|
classStack.removeLast()
|
||||||
|
classStack.addLast(currentClass.copy(members = members))
|
||||||
|
} else {
|
||||||
|
classStack.removeLast()
|
||||||
|
classStack.addLast(currentClass.copy(members = currentClass.members + member))
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
val existing = currentScript?.declarations?.find { it.name == attach.name && it.nameStart == attach.nameStart }
|
||||||
|
if (existing != null) {
|
||||||
|
val idx = currentScript?.declarations?.indexOf(existing) ?: -1
|
||||||
|
if (idx >= 0) currentScript?.declarations?.set(idx, attach)
|
||||||
|
} else {
|
||||||
|
currentScript?.declarations?.add(attach)
|
||||||
|
}
|
||||||
|
}
|
||||||
lastDoc = null
|
lastDoc = null
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onClassDecl(node: MiniClassDecl) {
|
override fun onClassDecl(node: MiniClassDecl) {
|
||||||
val attach = node.copy(doc = node.doc ?: lastDoc)
|
// This is the old way, we might want to deprecate it or make it call onEnterClass
|
||||||
currentScript?.declarations?.add(attach)
|
// For now, if we are NOT using enter/exit, keep behavior.
|
||||||
lastDoc = null
|
// But Compiler.kt will be updated to use enter/exit.
|
||||||
|
if (classStack.isEmpty()) {
|
||||||
|
val attach = node.copy(doc = node.doc ?: lastDoc)
|
||||||
|
currentScript?.declarations?.add(attach)
|
||||||
|
lastDoc = null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onEnumDecl(node: MiniEnumDecl) {
|
override fun onEnumDecl(node: MiniEnumDecl) {
|
||||||
|
|||||||
@@ -4,8 +4,6 @@
|
|||||||
*/
|
*/
|
||||||
package net.sergeych.lyng.miniast
|
package net.sergeych.lyng.miniast
|
||||||
|
|
||||||
import net.sergeych.lyng.obj.ObjString
|
|
||||||
|
|
||||||
object StdlibDocsBootstrap {
|
object StdlibDocsBootstrap {
|
||||||
// Simple idempotent guard; races are harmless as initializer side-effects are idempotent
|
// Simple idempotent guard; races are harmless as initializer side-effects are idempotent
|
||||||
private var ensured = false
|
private var ensured = false
|
||||||
@@ -16,7 +14,25 @@ object StdlibDocsBootstrap {
|
|||||||
// Touch core Obj* types whose docs are registered via addFnDoc/addConstDoc
|
// Touch core Obj* types whose docs are registered via addFnDoc/addConstDoc
|
||||||
// Accessing .type forces their static initializers to run and register docs.
|
// Accessing .type forces their static initializers to run and register docs.
|
||||||
@Suppress("UNUSED_VARIABLE")
|
@Suppress("UNUSED_VARIABLE")
|
||||||
val _string = ObjString.type
|
val _string = net.sergeych.lyng.obj.ObjString.type
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
|
val _any = net.sergeych.lyng.obj.Obj.rootObjectType
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
|
val _list = net.sergeych.lyng.obj.ObjList.type
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
|
val _map = net.sergeych.lyng.obj.ObjMap.type
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
|
val _int = net.sergeych.lyng.obj.ObjInt.type
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
|
val _real = net.sergeych.lyng.obj.ObjReal.type
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
|
val _bool = net.sergeych.lyng.obj.ObjBool.type
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
|
val _regex = net.sergeych.lyng.obj.ObjRegex.type
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
|
val _range = net.sergeych.lyng.obj.ObjRange.type
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
|
val _buffer = net.sergeych.lyng.obj.ObjBuffer.type
|
||||||
} catch (_: Throwable) {
|
} catch (_: Throwable) {
|
||||||
// Best-effort; absence should not break consumers
|
// Best-effort; absence should not break consumers
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
@@ -25,6 +25,9 @@ import kotlinx.serialization.json.JsonElement
|
|||||||
import kotlinx.serialization.json.JsonNull
|
import kotlinx.serialization.json.JsonNull
|
||||||
import kotlinx.serialization.serializer
|
import kotlinx.serialization.serializer
|
||||||
import net.sergeych.lyng.*
|
import net.sergeych.lyng.*
|
||||||
|
import net.sergeych.lyng.miniast.ParamDoc
|
||||||
|
import net.sergeych.lyng.miniast.addFnDoc
|
||||||
|
import net.sergeych.lyng.miniast.type
|
||||||
import net.sergeych.lynon.LynonDecoder
|
import net.sergeych.lynon.LynonDecoder
|
||||||
import net.sergeych.lynon.LynonEncoder
|
import net.sergeych.lynon.LynonEncoder
|
||||||
import net.sergeych.lynon.LynonType
|
import net.sergeych.lynon.LynonType
|
||||||
@@ -61,7 +64,12 @@ open class Obj {
|
|||||||
@Suppress("SuspiciousEqualsCombination")
|
@Suppress("SuspiciousEqualsCombination")
|
||||||
fun isInstanceOf(someClass: Obj) = someClass === objClass ||
|
fun isInstanceOf(someClass: Obj) = someClass === objClass ||
|
||||||
objClass.allParentsSet.contains(someClass) ||
|
objClass.allParentsSet.contains(someClass) ||
|
||||||
someClass == rootObjectType
|
someClass == rootObjectType ||
|
||||||
|
(someClass is ObjClass && objClass.allImplementingNames.contains(someClass.className))
|
||||||
|
|
||||||
|
fun isInstanceOf(className: String) =
|
||||||
|
objClass.mro.any { it.className == className } ||
|
||||||
|
objClass.allImplementingNames.contains(className)
|
||||||
|
|
||||||
|
|
||||||
suspend fun invokeInstanceMethod(scope: Scope, name: String, vararg args: Obj): Obj =
|
suspend fun invokeInstanceMethod(scope: Scope, name: String, vararg args: Obj): Obj =
|
||||||
@@ -85,23 +93,45 @@ open class Obj {
|
|||||||
args: Arguments = Arguments.EMPTY,
|
args: Arguments = Arguments.EMPTY,
|
||||||
onNotFoundResult: (suspend () -> Obj?)? = null
|
onNotFoundResult: (suspend () -> Obj?)? = null
|
||||||
): Obj {
|
): Obj {
|
||||||
|
// 0. Prefer private member of current class context
|
||||||
|
scope.currentClassCtx?.let { caller ->
|
||||||
|
caller.members[name]?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private && !rec.isAbstract) {
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (args.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, this, caller)
|
||||||
|
} else if (rec.type != ObjRecord.Type.Delegated) {
|
||||||
|
return rec.value.invoke(scope, this, args, caller)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 1. Hierarchy members (excluding root fallback)
|
// 1. Hierarchy members (excluding root fallback)
|
||||||
for (cls in objClass.mro) {
|
for (cls in objClass.mro) {
|
||||||
if (cls.className == "Obj") break
|
if (cls.className == "Obj") break
|
||||||
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
||||||
if (rec != null && !rec.isAbstract && rec.type != ObjRecord.Type.Property) {
|
if (rec != null && !rec.isAbstract) {
|
||||||
val decl = rec.declaringClass ?: cls
|
val decl = rec.declaringClass ?: cls
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
||||||
return rec.value.invoke(scope, this, args, decl)
|
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (args.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, this, decl)
|
||||||
|
} else if (rec.type != ObjRecord.Type.Delegated) {
|
||||||
|
return rec.value.invoke(scope, this, args, decl)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Extensions in scope
|
// 2. Extensions in scope
|
||||||
val extension = scope.findExtension(objClass, name)
|
val extension = scope.findExtension(objClass, name)
|
||||||
if (extension != null) {
|
if (extension != null) {
|
||||||
return extension.value.invoke(scope, this, args)
|
if (extension.type == ObjRecord.Type.Property) {
|
||||||
|
if (args.isEmpty()) return (extension.value as ObjProperty).callGetter(scope, this, extension.declaringClass)
|
||||||
|
} else if (extension.type != ObjRecord.Type.Delegated) {
|
||||||
|
return extension.value.invoke(scope, this, args)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. Root object fallback
|
// 3. Root object fallback
|
||||||
@@ -112,7 +142,12 @@ open class Obj {
|
|||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
||||||
return rec.value.invoke(scope, this, args, decl)
|
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (args.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, this, decl)
|
||||||
|
} else if (rec.type != ObjRecord.Type.Delegated) {
|
||||||
|
return rec.value.invoke(scope, this, args, decl)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -139,11 +174,17 @@ open class Obj {
|
|||||||
open suspend fun compareTo(scope: Scope, other: Obj): Int {
|
open suspend fun compareTo(scope: Scope, other: Obj): Int {
|
||||||
if (other === this) return 0
|
if (other === this) return 0
|
||||||
if (other === ObjNull || other === ObjUnset || other === ObjVoid) return 2
|
if (other === ObjNull || other === ObjUnset || other === ObjVoid) return 2
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "compareTo", Arguments(other)) {
|
||||||
|
scope.raiseNotImplemented("compareTo for ${objClass.className}")
|
||||||
|
}.cast<ObjInt>(scope).toInt()
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun equals(scope: Scope, other: Obj): Boolean {
|
open suspend fun equals(scope: Scope, other: Obj): Boolean {
|
||||||
if (other === this) return true
|
if (other === this) return true
|
||||||
|
val m = objClass.getInstanceMemberOrNull("equals") ?: scope.findExtension(objClass, "equals")
|
||||||
|
if (m != null) {
|
||||||
|
return invokeInstanceMethod(scope, "equals", Arguments(other)).toBool()
|
||||||
|
}
|
||||||
return try {
|
return try {
|
||||||
compareTo(scope, other) == 0
|
compareTo(scope, other) == 0
|
||||||
} catch (e: ExecutionError) {
|
} catch (e: ExecutionError) {
|
||||||
@@ -221,46 +262,66 @@ open class Obj {
|
|||||||
* Class of the object: definition of member functions (top-level), etc.
|
* Class of the object: definition of member functions (top-level), etc.
|
||||||
* Note that using lazy allows to avoid endless recursion here
|
* Note that using lazy allows to avoid endless recursion here
|
||||||
*/
|
*/
|
||||||
open val objClass: ObjClass = rootObjectType
|
open val objClass: ObjClass get() = rootObjectType
|
||||||
|
|
||||||
open suspend fun plus(scope: Scope, other: Obj): Obj {
|
open suspend fun plus(scope: Scope, other: Obj): Obj {
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "plus", Arguments(other)) {
|
||||||
|
scope.raiseNotImplemented("plus for ${objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun minus(scope: Scope, other: Obj): Obj {
|
open suspend fun minus(scope: Scope, other: Obj): Obj {
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "minus", Arguments(other)) {
|
||||||
|
scope.raiseNotImplemented("minus for ${objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun negate(scope: Scope): Obj {
|
open suspend fun negate(scope: Scope): Obj {
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "negate", Arguments.EMPTY) {
|
||||||
|
scope.raiseNotImplemented("negate for ${objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun mul(scope: Scope, other: Obj): Obj {
|
open suspend fun mul(scope: Scope, other: Obj): Obj {
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "mul", Arguments(other)) {
|
||||||
|
scope.raiseNotImplemented("mul for ${objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun div(scope: Scope, other: Obj): Obj {
|
open suspend fun div(scope: Scope, other: Obj): Obj {
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "div", Arguments(other)) {
|
||||||
|
scope.raiseNotImplemented("div for ${objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun mod(scope: Scope, other: Obj): Obj {
|
open suspend fun mod(scope: Scope, other: Obj): Obj {
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "mod", Arguments(other)) {
|
||||||
|
scope.raiseNotImplemented("mod for ${objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun logicalNot(scope: Scope): Obj {
|
open suspend fun logicalNot(scope: Scope): Obj {
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "logicalNot", Arguments.EMPTY) {
|
||||||
|
scope.raiseNotImplemented("logicalNot for ${objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun logicalAnd(scope: Scope, other: Obj): Obj {
|
open suspend fun logicalAnd(scope: Scope, other: Obj): Obj {
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "logicalAnd", Arguments(other)) {
|
||||||
|
scope.raiseNotImplemented("logicalAnd for ${objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun logicalOr(scope: Scope, other: Obj): Obj {
|
open suspend fun logicalOr(scope: Scope, other: Obj): Obj {
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "logicalOr", Arguments(other)) {
|
||||||
|
scope.raiseNotImplemented("logicalOr for ${objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun operatorMatch(scope: Scope, other: Obj): Obj {
|
open suspend fun operatorMatch(scope: Scope, other: Obj): Obj {
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "operatorMatch", Arguments(other)) {
|
||||||
|
scope.raiseNotImplemented("operatorMatch for ${objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun operatorNotMatch(scope: Scope, other: Obj): Obj {
|
open suspend fun operatorNotMatch(scope: Scope, other: Obj): Obj {
|
||||||
@@ -269,27 +330,39 @@ open class Obj {
|
|||||||
|
|
||||||
// Bitwise ops default (override in numeric types that support them)
|
// Bitwise ops default (override in numeric types that support them)
|
||||||
open suspend fun bitAnd(scope: Scope, other: Obj): Obj {
|
open suspend fun bitAnd(scope: Scope, other: Obj): Obj {
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "bitAnd", Arguments(other)) {
|
||||||
|
scope.raiseNotImplemented("bitAnd for ${objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun bitOr(scope: Scope, other: Obj): Obj {
|
open suspend fun bitOr(scope: Scope, other: Obj): Obj {
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "bitOr", Arguments(other)) {
|
||||||
|
scope.raiseNotImplemented("bitOr for ${objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun bitXor(scope: Scope, other: Obj): Obj {
|
open suspend fun bitXor(scope: Scope, other: Obj): Obj {
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "bitXor", Arguments(other)) {
|
||||||
|
scope.raiseNotImplemented("bitXor for ${objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun shl(scope: Scope, other: Obj): Obj {
|
open suspend fun shl(scope: Scope, other: Obj): Obj {
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "shl", Arguments(other)) {
|
||||||
|
scope.raiseNotImplemented("shl for ${objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun shr(scope: Scope, other: Obj): Obj {
|
open suspend fun shr(scope: Scope, other: Obj): Obj {
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "shr", Arguments(other)) {
|
||||||
|
scope.raiseNotImplemented("shr for ${objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun bitNot(scope: Scope): Obj {
|
open suspend fun bitNot(scope: Scope): Obj {
|
||||||
scope.raiseNotImplemented()
|
return invokeInstanceMethod(scope, "bitNot", Arguments.EMPTY) {
|
||||||
|
scope.raiseNotImplemented("bitNot for ${objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun assign(scope: Scope, other: Obj): Obj? = null
|
open suspend fun assign(scope: Scope, other: Obj): Obj? = null
|
||||||
@@ -301,15 +374,43 @@ open class Obj {
|
|||||||
* if( the operation is not defined, it returns null and the compiler would try
|
* if( the operation is not defined, it returns null and the compiler would try
|
||||||
* to generate it as 'this = this + other', reassigning its variable
|
* to generate it as 'this = this + other', reassigning its variable
|
||||||
*/
|
*/
|
||||||
open suspend fun plusAssign(scope: Scope, other: Obj): Obj? = null
|
open suspend fun plusAssign(scope: Scope, other: Obj): Obj? {
|
||||||
|
val m = objClass.getInstanceMemberOrNull("plusAssign") ?: scope.findExtension(objClass, "plusAssign")
|
||||||
|
return if (m != null) {
|
||||||
|
invokeInstanceMethod(scope, "plusAssign", Arguments(other))
|
||||||
|
} else null
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* `-=` operations, see [plusAssign]
|
* `-=` operations, see [plusAssign]
|
||||||
*/
|
*/
|
||||||
open suspend fun minusAssign(scope: Scope, other: Obj): Obj? = null
|
open suspend fun minusAssign(scope: Scope, other: Obj): Obj? {
|
||||||
open suspend fun mulAssign(scope: Scope, other: Obj): Obj? = null
|
val m = objClass.getInstanceMemberOrNull("minusAssign") ?: scope.findExtension(objClass, "minusAssign")
|
||||||
open suspend fun divAssign(scope: Scope, other: Obj): Obj? = null
|
return if (m != null) {
|
||||||
open suspend fun modAssign(scope: Scope, other: Obj): Obj? = null
|
invokeInstanceMethod(scope, "minusAssign", Arguments(other))
|
||||||
|
} else null
|
||||||
|
}
|
||||||
|
|
||||||
|
open suspend fun mulAssign(scope: Scope, other: Obj): Obj? {
|
||||||
|
val m = objClass.getInstanceMemberOrNull("mulAssign") ?: scope.findExtension(objClass, "mulAssign")
|
||||||
|
return if (m != null) {
|
||||||
|
invokeInstanceMethod(scope, "mulAssign", Arguments(other))
|
||||||
|
} else null
|
||||||
|
}
|
||||||
|
|
||||||
|
open suspend fun divAssign(scope: Scope, other: Obj): Obj? {
|
||||||
|
val m = objClass.getInstanceMemberOrNull("divAssign") ?: scope.findExtension(objClass, "divAssign")
|
||||||
|
return if (m != null) {
|
||||||
|
invokeInstanceMethod(scope, "divAssign", Arguments(other))
|
||||||
|
} else null
|
||||||
|
}
|
||||||
|
|
||||||
|
open suspend fun modAssign(scope: Scope, other: Obj): Obj? {
|
||||||
|
val m = objClass.getInstanceMemberOrNull("modAssign") ?: scope.findExtension(objClass, "modAssign")
|
||||||
|
return if (m != null) {
|
||||||
|
invokeInstanceMethod(scope, "modAssign", Arguments(other))
|
||||||
|
} else null
|
||||||
|
}
|
||||||
|
|
||||||
open suspend fun getAndIncrement(scope: Scope): Obj {
|
open suspend fun getAndIncrement(scope: Scope): Obj {
|
||||||
scope.raiseNotImplemented()
|
scope.raiseNotImplemented()
|
||||||
@@ -341,29 +442,52 @@ open class Obj {
|
|||||||
// suspend fun <T> sync(block: () -> T): T = monitor.withLock { block() }
|
// suspend fun <T> sync(block: () -> T): T = monitor.withLock { block() }
|
||||||
|
|
||||||
open suspend fun readField(scope: Scope, name: String): ObjRecord {
|
open suspend fun readField(scope: Scope, name: String): ObjRecord {
|
||||||
|
// 0. Prefer private member of current class context
|
||||||
|
scope.currentClassCtx?.let { caller ->
|
||||||
|
caller.members[name]?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private && !rec.isAbstract) {
|
||||||
|
val resolved = resolveRecord(scope, rec, name, caller)
|
||||||
|
if (resolved.type == ObjRecord.Type.Fun && resolved.value is Statement)
|
||||||
|
return resolved.copy(value = resolved.value.invoke(scope, this, Arguments.EMPTY, caller))
|
||||||
|
return resolved
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 1. Hierarchy members (excluding root fallback)
|
// 1. Hierarchy members (excluding root fallback)
|
||||||
for (cls in objClass.mro) {
|
for (cls in objClass.mro) {
|
||||||
if (cls.className == "Obj") break
|
if (cls.className == "Obj") break
|
||||||
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
||||||
if (rec != null) {
|
if (rec != null && !rec.isAbstract) {
|
||||||
if (!rec.isAbstract) {
|
val decl = rec.declaringClass ?: cls
|
||||||
return resolveRecord(scope, rec, name, rec.declaringClass)
|
val resolved = resolveRecord(scope, rec, name, decl)
|
||||||
}
|
if (resolved.type == ObjRecord.Type.Fun && resolved.value is Statement)
|
||||||
|
return resolved.copy(value = resolved.value.invoke(scope, this, Arguments.EMPTY, decl))
|
||||||
|
return resolved
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Extensions
|
// 2. Extensions
|
||||||
val extension = scope.findExtension(objClass, name)
|
val extension = scope.findExtension(objClass, name)
|
||||||
if (extension != null) {
|
if (extension != null) {
|
||||||
return resolveRecord(scope, extension, name, extension.declaringClass)
|
val resolved = resolveRecord(scope, extension, name, extension.declaringClass)
|
||||||
|
if (resolved.type == ObjRecord.Type.Fun && resolved.value is Statement)
|
||||||
|
return resolved.copy(value = resolved.value.invoke(scope, this, Arguments.EMPTY, extension.declaringClass))
|
||||||
|
return resolved
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. Root fallback
|
// 3. Root fallback
|
||||||
for (cls in objClass.mro) {
|
for (cls in objClass.mro) {
|
||||||
if (cls.className == "Obj") {
|
if (cls.className == "Obj") {
|
||||||
cls.members[name]?.let {
|
cls.members[name]?.let { rec ->
|
||||||
val decl = it.declaringClass ?: cls
|
val decl = rec.declaringClass ?: cls
|
||||||
return resolveRecord(scope, it, name, decl)
|
val caller = scope.currentClassCtx
|
||||||
|
if (!canAccessMember(rec.visibility, decl, caller))
|
||||||
|
scope.raiseError(ObjIllegalAccessException(scope, "can't access field ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
||||||
|
val resolved = resolveRecord(scope, rec, name, decl)
|
||||||
|
if (resolved.type == ObjRecord.Type.Fun && resolved.value is Statement)
|
||||||
|
return resolved.copy(value = resolved.value.invoke(scope, this, Arguments.EMPTY, decl))
|
||||||
|
return resolved
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -376,17 +500,29 @@ open class Obj {
|
|||||||
open suspend fun resolveRecord(scope: Scope, obj: ObjRecord, name: String, decl: ObjClass?): ObjRecord {
|
open suspend fun resolveRecord(scope: Scope, obj: ObjRecord, name: String, decl: ObjClass?): ObjRecord {
|
||||||
if (obj.type == ObjRecord.Type.Delegated) {
|
if (obj.type == ObjRecord.Type.Delegated) {
|
||||||
val del = obj.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate")
|
val del = obj.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate")
|
||||||
|
val th = if (this === ObjVoid) ObjNull else this
|
||||||
|
val res = del.invokeInstanceMethod(scope, "getValue", Arguments(th, ObjString(name)), onNotFoundResult = {
|
||||||
|
// If getValue not found, return a wrapper that calls invoke
|
||||||
|
object : Statement() {
|
||||||
|
override val pos: Pos = Pos.builtIn
|
||||||
|
override suspend fun execute(s: Scope): Obj {
|
||||||
|
val th2 = if (s.thisObj === ObjVoid) ObjNull else s.thisObj
|
||||||
|
val allArgs = (listOf(th2, ObjString(name)) + s.args.list).toTypedArray()
|
||||||
|
return del.invokeInstanceMethod(s, "invoke", Arguments(*allArgs))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
return obj.copy(
|
return obj.copy(
|
||||||
value = del.invokeInstanceMethod(scope, "getValue", Arguments(this, ObjString(name))),
|
value = res,
|
||||||
type = ObjRecord.Type.Other
|
type = ObjRecord.Type.Other
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
val value = obj.value
|
val value = obj.value
|
||||||
if (value is ObjProperty) {
|
if (value is ObjProperty || obj.type == ObjRecord.Type.Property) {
|
||||||
return ObjRecord(value.callGetter(scope, this, decl), obj.isMutable)
|
val prop = if (value is ObjProperty) value else (value as? Statement)?.execute(scope.createChildScope(scope.pos, newThisObj = this)) as? ObjProperty
|
||||||
}
|
?: scope.raiseError("Expected ObjProperty for property member $name, got ${value::class}")
|
||||||
if (value is Statement && decl != null) {
|
val res = prop.callGetter(scope, this, decl)
|
||||||
return ObjRecord(value.execute(scope.createChildScope(scope.pos, newThisObj = this)), obj.isMutable)
|
return ObjRecord(res, obj.isMutable)
|
||||||
}
|
}
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
// Check visibility for non-property members here if they weren't checked before
|
// Check visibility for non-property members here if they weren't checked before
|
||||||
@@ -398,13 +534,24 @@ open class Obj {
|
|||||||
open suspend fun writeField(scope: Scope, name: String, newValue: Obj) {
|
open suspend fun writeField(scope: Scope, name: String, newValue: Obj) {
|
||||||
willMutate(scope)
|
willMutate(scope)
|
||||||
var field: ObjRecord? = null
|
var field: ObjRecord? = null
|
||||||
|
// 0. Prefer private member of current class context
|
||||||
|
scope.currentClassCtx?.let { caller ->
|
||||||
|
caller.members[name]?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private && !rec.isAbstract) {
|
||||||
|
field = rec
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 1. Hierarchy members (excluding root fallback)
|
// 1. Hierarchy members (excluding root fallback)
|
||||||
for (cls in objClass.mro) {
|
if (field == null) {
|
||||||
if (cls.className == "Obj") break
|
for (cls in objClass.mro) {
|
||||||
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
if (cls.className == "Obj") break
|
||||||
if (rec != null && !rec.isAbstract) {
|
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
||||||
field = rec
|
if (rec != null && !rec.isAbstract) {
|
||||||
break
|
field = rec
|
||||||
|
break
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 2. Extensions
|
// 2. Extensions
|
||||||
@@ -438,12 +585,19 @@ open class Obj {
|
|||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun getAt(scope: Scope, index: Obj): Obj {
|
open suspend fun getAt(scope: Scope, index: Obj): Obj {
|
||||||
|
if (index is ObjString) {
|
||||||
|
return readField(scope, index.value).value
|
||||||
|
}
|
||||||
scope.raiseNotImplemented("indexing")
|
scope.raiseNotImplemented("indexing")
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun getAt(scope: Scope, index: Int): Obj = getAt(scope, ObjInt(index.toLong()))
|
suspend fun getAt(scope: Scope, index: Int): Obj = getAt(scope, ObjInt(index.toLong()))
|
||||||
|
|
||||||
open suspend fun putAt(scope: Scope, index: Obj, newValue: Obj) {
|
open suspend fun putAt(scope: Scope, index: Obj, newValue: Obj) {
|
||||||
|
if (index is ObjString) {
|
||||||
|
writeField(scope, index.value, newValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
scope.raiseNotImplemented("indexing")
|
scope.raiseNotImplemented("indexing")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -523,20 +677,46 @@ open class Obj {
|
|||||||
companion object {
|
companion object {
|
||||||
|
|
||||||
val rootObjectType = ObjClass("Obj").apply {
|
val rootObjectType = ObjClass("Obj").apply {
|
||||||
addFn("toString", true) {
|
addFnDoc(
|
||||||
|
name = "toString",
|
||||||
|
doc = "Returns a string representation of the object.",
|
||||||
|
returns = type("lyng.String"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
thisObj.toString(this, true)
|
thisObj.toString(this, true)
|
||||||
}
|
}
|
||||||
addFn("inspect", true) {
|
addFnDoc(
|
||||||
|
name = "inspect",
|
||||||
|
doc = "Returns a detailed string representation for debugging.",
|
||||||
|
returns = type("lyng.String"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
thisObj.inspect(this).toObj()
|
thisObj.inspect(this).toObj()
|
||||||
}
|
}
|
||||||
addFn("contains") {
|
addFnDoc(
|
||||||
|
name = "contains",
|
||||||
|
doc = "Returns true if the object contains the given element.",
|
||||||
|
params = listOf(ParamDoc("element")),
|
||||||
|
returns = type("lyng.Bool"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
ObjBool(thisObj.contains(this, args.firstAndOnly()))
|
ObjBool(thisObj.contains(this, args.firstAndOnly()))
|
||||||
}
|
}
|
||||||
// utilities
|
// utilities
|
||||||
addFn("let") {
|
addFnDoc(
|
||||||
|
name = "let",
|
||||||
|
doc = "Calls the specified function block with `this` value as its argument and returns its result.",
|
||||||
|
params = listOf(ParamDoc("block")),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
args.firstAndOnly().callOn(createChildScope(Arguments(thisObj)))
|
args.firstAndOnly().callOn(createChildScope(Arguments(thisObj)))
|
||||||
}
|
}
|
||||||
addFn("apply") {
|
addFnDoc(
|
||||||
|
name = "apply",
|
||||||
|
doc = "Calls the specified function block with `this` value as its receiver and returns `this` value.",
|
||||||
|
params = listOf(ParamDoc("block")),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
val body = args.firstAndOnly()
|
val body = args.firstAndOnly()
|
||||||
(thisObj as? ObjInstance)?.let {
|
(thisObj as? ObjInstance)?.let {
|
||||||
body.callOn(ApplyScope(this, it.instanceScope))
|
body.callOn(ApplyScope(this, it.instanceScope))
|
||||||
@@ -545,11 +725,21 @@ open class Obj {
|
|||||||
}
|
}
|
||||||
thisObj
|
thisObj
|
||||||
}
|
}
|
||||||
addFn("also") {
|
addFnDoc(
|
||||||
|
name = "also",
|
||||||
|
doc = "Calls the specified function block with `this` value as its argument and returns `this` value.",
|
||||||
|
params = listOf(ParamDoc("block")),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
args.firstAndOnly().callOn(createChildScope(Arguments(thisObj)))
|
args.firstAndOnly().callOn(createChildScope(Arguments(thisObj)))
|
||||||
thisObj
|
thisObj
|
||||||
}
|
}
|
||||||
addFn("run") {
|
addFnDoc(
|
||||||
|
name = "run",
|
||||||
|
doc = "Calls the specified function block with `this` value as its receiver and returns its result.",
|
||||||
|
params = listOf(ParamDoc("block")),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
args.firstAndOnly().callOn(this)
|
args.firstAndOnly().callOn(this)
|
||||||
}
|
}
|
||||||
addFn("getAt") {
|
addFn("getAt") {
|
||||||
@@ -562,15 +752,18 @@ open class Obj {
|
|||||||
thisObj.putAt(this, requiredArg<Obj>(0), newValue)
|
thisObj.putAt(this, requiredArg<Obj>(0), newValue)
|
||||||
newValue
|
newValue
|
||||||
}
|
}
|
||||||
addFn("toJsonString") {
|
addFnDoc(
|
||||||
|
name = "toJsonString",
|
||||||
|
doc = "Encodes this object to a JSON string.",
|
||||||
|
returns = type("lyng.String"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
thisObj.toJson(this).toString().toObj()
|
thisObj.toJson(this).toString().toObj()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Suppress("NOTHING_TO_INLINE")
|
fun from(obj: Any?): Obj {
|
||||||
inline fun from(obj: Any?): Obj {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
return when (obj) {
|
return when (obj) {
|
||||||
is Obj -> obj
|
is Obj -> obj
|
||||||
is Double -> ObjReal(obj)
|
is Double -> ObjReal(obj)
|
||||||
@@ -579,16 +772,16 @@ open class Obj {
|
|||||||
is Long -> ObjInt.of(obj)
|
is Long -> ObjInt.of(obj)
|
||||||
is String -> ObjString(obj)
|
is String -> ObjString(obj)
|
||||||
is CharSequence -> ObjString(obj.toString())
|
is CharSequence -> ObjString(obj.toString())
|
||||||
|
is Char -> ObjChar(obj)
|
||||||
is Boolean -> ObjBool(obj)
|
is Boolean -> ObjBool(obj)
|
||||||
is Set<*> -> ObjSet((obj as Set<Obj>).toMutableSet())
|
is Set<*> -> ObjSet(obj.map { from(it) }.toMutableSet())
|
||||||
|
is List<*> -> ObjList(obj.map { from(it) }.toMutableList())
|
||||||
|
is Map<*, *> -> ObjMap(obj.entries.associate { from(it.key) to from(it.value) }.toMutableMap())
|
||||||
|
is Map.Entry<*, *> -> ObjMapEntry(from(obj.key), from(obj.value))
|
||||||
|
is Enum<*> -> ObjString(obj.name)
|
||||||
Unit -> ObjVoid
|
Unit -> ObjVoid
|
||||||
null -> ObjNull
|
null -> ObjNull
|
||||||
is Iterator<*> -> ObjKotlinIterator(obj)
|
is Iterator<*> -> ObjKotlinIterator(obj as Iterator<Any?>)
|
||||||
is Map.Entry<*, *> -> {
|
|
||||||
obj as MutableMap.MutableEntry<Obj, Obj>
|
|
||||||
ObjMapEntry(obj.key, obj.value)
|
|
||||||
}
|
|
||||||
|
|
||||||
else -> throw IllegalArgumentException("cannot convert to Obj: $obj")
|
else -> throw IllegalArgumentException("cannot convert to Obj: $obj")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -17,10 +17,7 @@
|
|||||||
|
|
||||||
package net.sergeych.lyng.obj
|
package net.sergeych.lyng.obj
|
||||||
|
|
||||||
import net.sergeych.lyng.miniast.ParamDoc
|
import net.sergeych.lyng.miniast.*
|
||||||
import net.sergeych.lyng.miniast.TypeGenericDoc
|
|
||||||
import net.sergeych.lyng.miniast.addFnDoc
|
|
||||||
import net.sergeych.lyng.miniast.type
|
|
||||||
|
|
||||||
val ObjArray by lazy {
|
val ObjArray by lazy {
|
||||||
|
|
||||||
@@ -52,32 +49,35 @@ val ObjArray by lazy {
|
|||||||
ObjFalse
|
ObjFalse
|
||||||
}
|
}
|
||||||
|
|
||||||
addFnDoc(
|
addPropertyDoc(
|
||||||
name = "last",
|
name = "last",
|
||||||
doc = "The last element of this array.",
|
doc = "The last element of this array.",
|
||||||
returns = type("lyng.Any"),
|
type = type("lyng.Any"),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib",
|
||||||
) {
|
getter = {
|
||||||
thisObj.invokeInstanceMethod(
|
this.thisObj.invokeInstanceMethod(
|
||||||
this,
|
this,
|
||||||
"getAt",
|
"getAt",
|
||||||
(thisObj.invokeInstanceMethod(this, "size").toInt() - 1).toObj()
|
(this.thisObj.invokeInstanceMethod(this, "size").toInt() - 1).toObj()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
)
|
||||||
|
|
||||||
addFnDoc(
|
addPropertyDoc(
|
||||||
name = "lastIndex",
|
name = "lastIndex",
|
||||||
doc = "Index of the last element (size - 1).",
|
doc = "Index of the last element (size - 1).",
|
||||||
returns = type("lyng.Int"),
|
type = type("lyng.Int"),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib",
|
||||||
) { (thisObj.invokeInstanceMethod(this, "size").toInt() - 1).toObj() }
|
getter = { (this.thisObj.invokeInstanceMethod(this, "size").toInt() - 1).toObj() }
|
||||||
|
)
|
||||||
|
|
||||||
addFnDoc(
|
addPropertyDoc(
|
||||||
name = "indices",
|
name = "indices",
|
||||||
doc = "Range of valid indices for this array.",
|
doc = "Range of valid indices for this array.",
|
||||||
returns = type("lyng.Range"),
|
type = type("lyng.Range"),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib",
|
||||||
) { ObjRange(0.toObj(), thisObj.invokeInstanceMethod(this, "size"), false) }
|
getter = { ObjRange(0.toObj(), this.thisObj.invokeInstanceMethod(this, "size"), false) }
|
||||||
|
)
|
||||||
|
|
||||||
addFnDoc(
|
addFnDoc(
|
||||||
name = "binarySearch",
|
name = "binarySearch",
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -19,11 +19,13 @@ package net.sergeych.lyng.obj
|
|||||||
|
|
||||||
import net.sergeych.bintools.toDump
|
import net.sergeych.bintools.toDump
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.miniast.addPropertyDoc
|
||||||
|
import net.sergeych.lyng.miniast.type
|
||||||
import net.sergeych.lynon.BitArray
|
import net.sergeych.lynon.BitArray
|
||||||
|
|
||||||
class ObjBitBuffer(val bitArray: BitArray) : Obj() {
|
class ObjBitBuffer(val bitArray: BitArray) : Obj() {
|
||||||
|
|
||||||
override val objClass = type
|
override val objClass get() = type
|
||||||
|
|
||||||
override suspend fun getAt(scope: Scope, index: Obj): Obj {
|
override suspend fun getAt(scope: Scope, index: Obj): Obj {
|
||||||
return bitArray[index.toLong()].toObj()
|
return bitArray[index.toLong()].toObj()
|
||||||
@@ -43,12 +45,20 @@ class ObjBitBuffer(val bitArray: BitArray) : Obj() {
|
|||||||
thisAs<ObjBitBuffer>().bitArray.asUByteArray().toDump()
|
thisAs<ObjBitBuffer>().bitArray.asUByteArray().toDump()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
addFn("size") {
|
addPropertyDoc(
|
||||||
thisAs<ObjBitBuffer>().bitArray.size.toObj()
|
name = "size",
|
||||||
}
|
doc = "Size of the bit buffer in bits.",
|
||||||
addFn("sizeInBytes") {
|
type = type("lyng.Int"),
|
||||||
ObjInt((thisAs<ObjBitBuffer>().bitArray.size + 7) shr 3)
|
moduleName = "lyng.stdlib",
|
||||||
}
|
getter = { thisAs<ObjBitBuffer>().bitArray.size.toObj() }
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "sizeInBytes",
|
||||||
|
doc = "Size of the bit buffer in full bytes (rounded up).",
|
||||||
|
type = type("lyng.Int"),
|
||||||
|
moduleName = "lyng.stdlib",
|
||||||
|
getter = { ObjInt((thisAs<ObjBitBuffer>().bitArray.size + 7) shr 3) }
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -37,7 +37,7 @@ data class ObjBool(val value: Boolean) : Obj() {
|
|||||||
|
|
||||||
override fun toString(): String = value.toString()
|
override fun toString(): String = value.toString()
|
||||||
|
|
||||||
override val objClass: ObjClass = type
|
override val objClass: ObjClass get() = type
|
||||||
|
|
||||||
override suspend fun logicalNot(scope: Scope): Obj = ObjBool(!value)
|
override suspend fun logicalNot(scope: Scope): Obj = ObjBool(!value)
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -23,7 +23,8 @@ import net.sergeych.bintools.decodeHex
|
|||||||
import net.sergeych.bintools.encodeToHex
|
import net.sergeych.bintools.encodeToHex
|
||||||
import net.sergeych.bintools.toDump
|
import net.sergeych.bintools.toDump
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
import net.sergeych.lyng.statement
|
import net.sergeych.lyng.miniast.addPropertyDoc
|
||||||
|
import net.sergeych.lyng.miniast.type
|
||||||
import net.sergeych.lynon.BitArray
|
import net.sergeych.lynon.BitArray
|
||||||
import net.sergeych.lynon.LynonDecoder
|
import net.sergeych.lynon.LynonDecoder
|
||||||
import net.sergeych.lynon.LynonEncoder
|
import net.sergeych.lynon.LynonEncoder
|
||||||
@@ -34,7 +35,7 @@ import kotlin.math.min
|
|||||||
|
|
||||||
open class ObjBuffer(val byteArray: UByteArray) : Obj() {
|
open class ObjBuffer(val byteArray: UByteArray) : Obj() {
|
||||||
|
|
||||||
override val objClass: ObjClass = type
|
override val objClass: ObjClass get() = type
|
||||||
|
|
||||||
val hex by lazy { byteArray.encodeToHex("")}
|
val hex by lazy { byteArray.encodeToHex("")}
|
||||||
val base64 by lazy { byteArray.toByteArray().encodeToBase64Url()}
|
val base64 by lazy { byteArray.toByteArray().encodeToBase64Url()}
|
||||||
@@ -174,20 +175,26 @@ open class ObjBuffer(val byteArray: UByteArray) : Obj() {
|
|||||||
addClassFn("decodeHex") {
|
addClassFn("decodeHex") {
|
||||||
ObjBuffer(requireOnlyArg<Obj>().toString().decodeHex().asUByteArray())
|
ObjBuffer(requireOnlyArg<Obj>().toString().decodeHex().asUByteArray())
|
||||||
}
|
}
|
||||||
createField("size",
|
addPropertyDoc(
|
||||||
statement {
|
name = "size",
|
||||||
(thisObj as ObjBuffer).byteArray.size.toObj()
|
doc = "Number of bytes in this buffer.",
|
||||||
}
|
type = type("lyng.Int"),
|
||||||
|
moduleName = "lyng.stdlib",
|
||||||
|
getter = { (this.thisObj as ObjBuffer).byteArray.size.toObj() }
|
||||||
)
|
)
|
||||||
createField("hex",
|
addPropertyDoc(
|
||||||
statement {
|
name = "hex",
|
||||||
thisAs<ObjBuffer>().hex.toObj()
|
doc = "Hexadecimal string representation of the buffer.",
|
||||||
}
|
type = type("lyng.String"),
|
||||||
|
moduleName = "lyng.stdlib",
|
||||||
|
getter = { thisAs<ObjBuffer>().hex.toObj() }
|
||||||
)
|
)
|
||||||
createField("base64",
|
addPropertyDoc(
|
||||||
statement {
|
name = "base64",
|
||||||
thisAs<ObjBuffer>().base64.toObj()
|
doc = "Base64 (URL-safe) string representation of the buffer.",
|
||||||
}
|
type = type("lyng.String"),
|
||||||
|
moduleName = "lyng.stdlib",
|
||||||
|
getter = { thisAs<ObjBuffer>().base64.toObj() }
|
||||||
)
|
)
|
||||||
addFn("decodeUtf8") {
|
addFn("decodeUtf8") {
|
||||||
ObjString(
|
ObjString(
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -18,12 +18,12 @@
|
|||||||
package net.sergeych.lyng.obj
|
package net.sergeych.lyng.obj
|
||||||
|
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
import net.sergeych.lyng.miniast.addFnDoc
|
import net.sergeych.lyng.miniast.addPropertyDoc
|
||||||
import net.sergeych.lyng.miniast.type
|
import net.sergeych.lyng.miniast.type
|
||||||
|
|
||||||
class ObjChar(val value: Char): Obj() {
|
class ObjChar(val value: Char): Obj() {
|
||||||
|
|
||||||
override val objClass: ObjClass = type
|
override val objClass: ObjClass get() = type
|
||||||
|
|
||||||
override suspend fun compareTo(scope: Scope, other: Obj): Int =
|
override suspend fun compareTo(scope: Scope, other: Obj): Int =
|
||||||
(other as? ObjChar)?.let { value.compareTo(it.value) } ?: -1
|
(other as? ObjChar)?.let { value.compareTo(it.value) } ?: -1
|
||||||
@@ -47,12 +47,13 @@ class ObjChar(val value: Char): Obj() {
|
|||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
val type = ObjClass("Char").apply {
|
val type = ObjClass("Char").apply {
|
||||||
addFnDoc(
|
addPropertyDoc(
|
||||||
name = "code",
|
name = "code",
|
||||||
doc = "Unicode code point (UTF-16 code unit) of this character.",
|
doc = "Unicode code point (UTF-16 code unit) of this character.",
|
||||||
returns = type("lyng.Int"),
|
type = type("lyng.Int"),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib",
|
||||||
) { ObjInt(thisAs<ObjChar>().value.code.toLong()) }
|
getter = { ObjInt((this.thisObj as ObjChar).value.code.toLong()) }
|
||||||
|
)
|
||||||
addFn("isDigit") {
|
addFn("isDigit") {
|
||||||
thisAs<ObjChar>().value.isDigit().toObj()
|
thisAs<ObjChar>().value.isDigit().toObj()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,10 +18,7 @@
|
|||||||
package net.sergeych.lyng.obj
|
package net.sergeych.lyng.obj
|
||||||
|
|
||||||
import net.sergeych.lyng.*
|
import net.sergeych.lyng.*
|
||||||
import net.sergeych.lyng.miniast.ParamDoc
|
import net.sergeych.lyng.miniast.*
|
||||||
import net.sergeych.lyng.miniast.TypeGenericDoc
|
|
||||||
import net.sergeych.lyng.miniast.addFnDoc
|
|
||||||
import net.sergeych.lyng.miniast.type
|
|
||||||
import net.sergeych.lynon.LynonDecoder
|
import net.sergeych.lynon.LynonDecoder
|
||||||
import net.sergeych.lynon.LynonType
|
import net.sergeych.lynon.LynonType
|
||||||
|
|
||||||
@@ -30,47 +27,56 @@ private object ClassIdGen { var c: Long = 1L; fun nextId(): Long = c++ }
|
|||||||
|
|
||||||
val ObjClassType by lazy {
|
val ObjClassType by lazy {
|
||||||
ObjClass("Class").apply {
|
ObjClass("Class").apply {
|
||||||
addProperty("className", getter = { thisAs<ObjClass>().classNameObj })
|
addPropertyDoc(
|
||||||
addFnDoc(
|
name = "className",
|
||||||
|
doc = "Full name of this class including package if available.",
|
||||||
|
type = type("lyng.String"),
|
||||||
|
moduleName = "lyng.stdlib",
|
||||||
|
getter = { (this.thisObj as ObjClass).classNameObj }
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
name = "name",
|
name = "name",
|
||||||
doc = "Simple name of this class (without package).",
|
doc = "Simple name of this class (without package).",
|
||||||
returns = type("lyng.String"),
|
type = type("lyng.String"),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib",
|
||||||
) { thisAs<ObjClass>().classNameObj }
|
getter = { (this.thisObj as ObjClass).classNameObj }
|
||||||
|
)
|
||||||
|
|
||||||
addFnDoc(
|
addPropertyDoc(
|
||||||
name = "fields",
|
name = "fields",
|
||||||
doc = "Declared instance fields of this class and its ancestors (C3 order), without duplicates.",
|
doc = "Declared instance fields of this class and its ancestors (C3 order), without duplicates.",
|
||||||
returns = TypeGenericDoc(type("lyng.List"), listOf(type("lyng.String"))),
|
type = TypeGenericDoc(type("lyng.List"), listOf(type("lyng.String"))),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib",
|
||||||
) {
|
getter = {
|
||||||
val cls = thisAs<ObjClass>()
|
val cls = this.thisObj as ObjClass
|
||||||
val seen = hashSetOf<String>()
|
val seen = hashSetOf<String>()
|
||||||
val names = mutableListOf<Obj>()
|
val names = mutableListOf<Obj>()
|
||||||
for (c in cls.mro) {
|
for (c in cls.mro) {
|
||||||
for ((n, rec) in c.members) {
|
for ((n, rec) in c.members) {
|
||||||
if (rec.value !is Statement && seen.add(n)) names += ObjString(n)
|
if (rec.value !is Statement && seen.add(n)) names += ObjString(n)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
ObjList(names.toMutableList())
|
||||||
}
|
}
|
||||||
ObjList(names.toMutableList())
|
)
|
||||||
}
|
|
||||||
|
|
||||||
addFnDoc(
|
addPropertyDoc(
|
||||||
name = "methods",
|
name = "methods",
|
||||||
doc = "Declared instance methods of this class and its ancestors (C3 order), without duplicates.",
|
doc = "Declared instance methods of this class and its ancestors (C3 order), without duplicates.",
|
||||||
returns = TypeGenericDoc(type("lyng.List"), listOf(type("lyng.String"))),
|
type = TypeGenericDoc(type("lyng.List"), listOf(type("lyng.String"))),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib",
|
||||||
) {
|
getter = {
|
||||||
val cls = thisAs<ObjClass>()
|
val cls = this.thisObj as ObjClass
|
||||||
val seen = hashSetOf<String>()
|
val seen = hashSetOf<String>()
|
||||||
val names = mutableListOf<Obj>()
|
val names = mutableListOf<Obj>()
|
||||||
for (c in cls.mro) {
|
for (c in cls.mro) {
|
||||||
for ((n, rec) in c.members) {
|
for ((n, rec) in c.members) {
|
||||||
if (rec.value is Statement && seen.add(n)) names += ObjString(n)
|
if (rec.value is Statement && seen.add(n)) names += ObjString(n)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
ObjList(names.toMutableList())
|
||||||
}
|
}
|
||||||
ObjList(names.toMutableList())
|
)
|
||||||
}
|
|
||||||
|
|
||||||
addFnDoc(
|
addFnDoc(
|
||||||
name = "get",
|
name = "get",
|
||||||
@@ -100,6 +106,34 @@ open class ObjClass(
|
|||||||
val classId: Long = ClassIdGen.nextId()
|
val classId: Long = ClassIdGen.nextId()
|
||||||
var layoutVersion: Int = 0
|
var layoutVersion: Int = 0
|
||||||
|
|
||||||
|
private val mangledNameCache = mutableMapOf<String, String>()
|
||||||
|
fun mangledName(name: String): String = mangledNameCache.getOrPut(name) { "$className::$name" }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Map of public member names to their effective storage keys in instanceScope.objects.
|
||||||
|
* This is pre-calculated to avoid MRO traversal and string concatenation during common access.
|
||||||
|
*/
|
||||||
|
val publicMemberResolution: Map<String, String> by lazy {
|
||||||
|
val res = mutableMapOf<String, String>()
|
||||||
|
// Traverse MRO in REVERSED order so that child classes override parent classes in the map.
|
||||||
|
for (cls in mro.reversed()) {
|
||||||
|
if (cls.className == "Obj") continue
|
||||||
|
for ((name, rec) in cls.members) {
|
||||||
|
if (rec.visibility == Visibility.Public) {
|
||||||
|
val key = if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
||||||
|
res[name] = key
|
||||||
|
}
|
||||||
|
}
|
||||||
|
cls.classScope?.objects?.forEach { (name, rec) ->
|
||||||
|
if (rec.visibility == Visibility.Public && (rec.value is Statement || rec.type == ObjRecord.Type.Delegated)) {
|
||||||
|
val key = if (rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
||||||
|
res[name] = key
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
res
|
||||||
|
}
|
||||||
|
|
||||||
val classNameObj by lazy { ObjString(className) }
|
val classNameObj by lazy { ObjString(className) }
|
||||||
|
|
||||||
var constructorMeta: ArgsDeclaration? = null
|
var constructorMeta: ArgsDeclaration? = null
|
||||||
@@ -124,6 +158,24 @@ open class ObjClass(
|
|||||||
/** Direct parents in declaration order (kept deterministic). */
|
/** Direct parents in declaration order (kept deterministic). */
|
||||||
val directParents: List<ObjClass> = parents.toList()
|
val directParents: List<ObjClass> = parents.toList()
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Names of additional interfaces this class implements, but they are not (yet) available
|
||||||
|
* as [ObjClass] instances. This is used for "implementing existing interfaces" feature.
|
||||||
|
*/
|
||||||
|
val implementingNames = mutableSetOf<String>()
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Combined set of [implementingNames] from this class and all its ancestors.
|
||||||
|
*/
|
||||||
|
val allImplementingNames: Set<String> by lazy {
|
||||||
|
buildSet {
|
||||||
|
addAll(implementingNames)
|
||||||
|
for (p in allParentsSet) {
|
||||||
|
addAll(p.implementingNames)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** Optional constructor argument specs for each direct parent (set by compiler for user classes). */
|
/** Optional constructor argument specs for each direct parent (set by compiler for user classes). */
|
||||||
open val directParentArgs: MutableMap<ObjClass, List<ParsedArgument>> = mutableMapOf()
|
open val directParentArgs: MutableMap<ObjClass, List<ParsedArgument>> = mutableMapOf()
|
||||||
|
|
||||||
@@ -218,6 +270,43 @@ open class ObjClass(
|
|||||||
return instance
|
return instance
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Pre-calculated template for instanceScope.objects. */
|
||||||
|
private val instanceObjectsTemplate: Map<String, ObjRecord> by lazy {
|
||||||
|
val res = mutableMapOf<String, ObjRecord>()
|
||||||
|
for (cls in mro) {
|
||||||
|
// 1) members-defined methods and fields
|
||||||
|
for ((k, v) in cls.members) {
|
||||||
|
if (!v.isAbstract && (v.value is Statement || v.type == ObjRecord.Type.Delegated || v.type == ObjRecord.Type.Field)) {
|
||||||
|
val key = if (v.visibility == Visibility.Private || v.type == ObjRecord.Type.Field || v.type == ObjRecord.Type.Delegated) cls.mangledName(k) else k
|
||||||
|
if (!res.containsKey(key)) {
|
||||||
|
res[key] = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 2) class-scope members registered during class-body execution
|
||||||
|
cls.classScope?.objects?.forEach { (k, rec) ->
|
||||||
|
// ONLY copy methods and delegated members from class scope to instance scope.
|
||||||
|
// Fields in class scope are static fields and must NOT be per-instance.
|
||||||
|
if (!rec.isAbstract && (rec.value is Statement || rec.type == ObjRecord.Type.Delegated)) {
|
||||||
|
val key = if (rec.visibility == Visibility.Private || rec.type == ObjRecord.Type.Delegated) cls.mangledName(k) else k
|
||||||
|
// if not already present, copy reference for dispatch
|
||||||
|
if (!res.containsKey(key)) {
|
||||||
|
res[key] = rec
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
res
|
||||||
|
}
|
||||||
|
|
||||||
|
private val templateMethods: Map<String, ObjRecord> by lazy {
|
||||||
|
instanceObjectsTemplate.filter { it.value.type == ObjRecord.Type.Fun }
|
||||||
|
}
|
||||||
|
|
||||||
|
private val templateOthers: List<Pair<String, ObjRecord>> by lazy {
|
||||||
|
instanceObjectsTemplate.filter { it.value.type != ObjRecord.Type.Fun }.toList()
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create an instance of this class and initialize its [ObjInstance.instanceScope] with
|
* Create an instance of this class and initialize its [ObjInstance.instanceScope] with
|
||||||
* methods. Does NOT run initializers or constructors.
|
* methods. Does NOT run initializers or constructors.
|
||||||
@@ -232,20 +321,10 @@ open class ObjClass(
|
|||||||
instance.instanceScope.currentClassCtx = null
|
instance.instanceScope.currentClassCtx = null
|
||||||
// Expose instance methods (and other callable members) directly in the instance scope for fast lookup
|
// Expose instance methods (and other callable members) directly in the instance scope for fast lookup
|
||||||
// This mirrors Obj.autoInstanceScope behavior for ad-hoc scopes and makes fb.method() resolution robust
|
// This mirrors Obj.autoInstanceScope behavior for ad-hoc scopes and makes fb.method() resolution robust
|
||||||
// 1) members-defined methods
|
|
||||||
for ((k, v) in members) {
|
instance.instanceScope.objects.putAll(templateMethods)
|
||||||
if (v.value is Statement || v.type == ObjRecord.Type.Delegated) {
|
for (p in templateOthers) {
|
||||||
instance.instanceScope.objects[k] = if (v.type == ObjRecord.Type.Delegated) v.copy() else v
|
instance.instanceScope.objects[p.first] = p.second.copy()
|
||||||
}
|
|
||||||
}
|
|
||||||
// 2) class-scope methods registered during class-body execution
|
|
||||||
classScope?.objects?.forEach { (k, rec) ->
|
|
||||||
if (rec.value is Statement || rec.type == ObjRecord.Type.Delegated) {
|
|
||||||
// if not already present, copy reference for dispatch
|
|
||||||
if (!instance.instanceScope.objects.containsKey(k)) {
|
|
||||||
instance.instanceScope.objects[k] = if (rec.type == ObjRecord.Type.Delegated) rec.copy() else rec
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return instance
|
return instance
|
||||||
}
|
}
|
||||||
@@ -282,13 +361,19 @@ open class ObjClass(
|
|||||||
c.constructorMeta?.let { meta ->
|
c.constructorMeta?.let { meta ->
|
||||||
val argsHere = argsForThis ?: Arguments.EMPTY
|
val argsHere = argsForThis ?: Arguments.EMPTY
|
||||||
// Assign constructor params into instance scope (unmangled)
|
// Assign constructor params into instance scope (unmangled)
|
||||||
meta.assignToContext(instance.instanceScope, argsHere, declaringClass = c)
|
val savedCtx = instance.instanceScope.currentClassCtx
|
||||||
|
instance.instanceScope.currentClassCtx = c
|
||||||
|
try {
|
||||||
|
meta.assignToContext(instance.instanceScope, argsHere, declaringClass = c)
|
||||||
|
} finally {
|
||||||
|
instance.instanceScope.currentClassCtx = savedCtx
|
||||||
|
}
|
||||||
// Also expose them under MI-mangled storage keys `${Class}::name` so qualified views can access them
|
// Also expose them under MI-mangled storage keys `${Class}::name` so qualified views can access them
|
||||||
// and so that base-class casts like `(obj as Base).field` work.
|
// and so that base-class casts like `(obj as Base).field` work.
|
||||||
for (p in meta.params) {
|
for (p in meta.params) {
|
||||||
val rec = instance.instanceScope.objects[p.name]
|
val rec = instance.instanceScope.objects[p.name]
|
||||||
if (rec != null) {
|
if (rec != null) {
|
||||||
val mangled = "${c.className}::${p.name}"
|
val mangled = c.mangledName(p.name)
|
||||||
// Always point the mangled name to the current record to keep writes consistent
|
// Always point the mangled name to the current record to keep writes consistent
|
||||||
// across re-bindings
|
// across re-bindings
|
||||||
instance.instanceScope.objects[mangled] = rec
|
instance.instanceScope.objects[mangled] = rec
|
||||||
@@ -311,12 +396,18 @@ open class ObjClass(
|
|||||||
// parameters even if they were shadowed/overwritten by parent class initialization.
|
// parameters even if they were shadowed/overwritten by parent class initialization.
|
||||||
c.constructorMeta?.let { meta ->
|
c.constructorMeta?.let { meta ->
|
||||||
val argsHere = argsForThis ?: Arguments.EMPTY
|
val argsHere = argsForThis ?: Arguments.EMPTY
|
||||||
meta.assignToContext(instance.instanceScope, argsHere, declaringClass = c)
|
val savedCtx = instance.instanceScope.currentClassCtx
|
||||||
|
instance.instanceScope.currentClassCtx = c
|
||||||
|
try {
|
||||||
|
meta.assignToContext(instance.instanceScope, argsHere, declaringClass = c)
|
||||||
|
} finally {
|
||||||
|
instance.instanceScope.currentClassCtx = savedCtx
|
||||||
|
}
|
||||||
// Re-sync mangled names to point to the fresh records to keep them consistent
|
// Re-sync mangled names to point to the fresh records to keep them consistent
|
||||||
for (p in meta.params) {
|
for (p in meta.params) {
|
||||||
val rec = instance.instanceScope.objects[p.name]
|
val rec = instance.instanceScope.objects[p.name]
|
||||||
if (rec != null) {
|
if (rec != null) {
|
||||||
val mangled = "${c.className}::${p.name}"
|
val mangled = c.mangledName(p.name)
|
||||||
instance.instanceScope.objects[mangled] = rec
|
instance.instanceScope.objects[mangled] = rec
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -364,7 +455,8 @@ open class ObjClass(
|
|||||||
): ObjRecord {
|
): ObjRecord {
|
||||||
// Validation of override rules: only for non-system declarations
|
// Validation of override rules: only for non-system declarations
|
||||||
if (pos != Pos.builtIn) {
|
if (pos != Pos.builtIn) {
|
||||||
val existing = getInstanceMemberOrNull(name)
|
// Only consider TRUE instance members from ancestors for overrides
|
||||||
|
val existing = getInstanceMemberOrNull(name, includeAbstract = true, includeStatic = false)
|
||||||
var actualOverride = false
|
var actualOverride = false
|
||||||
if (existing != null && existing.declaringClass != this) {
|
if (existing != null && existing.declaringClass != this) {
|
||||||
// If the existing member is private in the ancestor, it's not visible for overriding.
|
// If the existing member is private in the ancestor, it's not visible for overriding.
|
||||||
@@ -467,12 +559,13 @@ open class ObjClass(
|
|||||||
isClosed: Boolean = false,
|
isClosed: Boolean = false,
|
||||||
isOverride: Boolean = false,
|
isOverride: Boolean = false,
|
||||||
pos: Pos = Pos.builtIn,
|
pos: Pos = Pos.builtIn,
|
||||||
|
prop: ObjProperty? = null
|
||||||
) {
|
) {
|
||||||
val g = getter?.let { statement { it() } }
|
val g = getter?.let { statement { it() } }
|
||||||
val s = setter?.let { statement { it(requiredArg(0)); ObjVoid } }
|
val s = setter?.let { statement { it(requiredArg(0)); ObjVoid } }
|
||||||
val prop = if (isAbstract) ObjNull else ObjProperty(name, g, s)
|
val finalProp = prop ?: if (isAbstract) ObjNull else ObjProperty(name, g, s)
|
||||||
createField(
|
createField(
|
||||||
name, prop, false, visibility, writeVisibility, pos, declaringClass,
|
name, finalProp, false, visibility, writeVisibility, pos, declaringClass,
|
||||||
isAbstract = isAbstract, isClosed = isClosed, isOverride = isOverride,
|
isAbstract = isAbstract, isClosed = isClosed, isOverride = isOverride,
|
||||||
type = ObjRecord.Type.Property
|
type = ObjRecord.Type.Property
|
||||||
)
|
)
|
||||||
@@ -487,14 +580,21 @@ open class ObjClass(
|
|||||||
/**
|
/**
|
||||||
* Get instance member traversing the hierarchy if needed. Its meaning is different for different objects.
|
* Get instance member traversing the hierarchy if needed. Its meaning is different for different objects.
|
||||||
*/
|
*/
|
||||||
fun getInstanceMemberOrNull(name: String): ObjRecord? {
|
fun getInstanceMemberOrNull(name: String, includeAbstract: Boolean = false, includeStatic: Boolean = true): ObjRecord? {
|
||||||
// Unified traversal in strict C3 order: self, then each ancestor, checking members before classScope
|
// Unified traversal in strict C3 order: self, then each ancestor, checking members before classScope
|
||||||
for (cls in mro) {
|
for (cls in mro) {
|
||||||
cls.members[name]?.let { return it }
|
cls.members[name]?.let {
|
||||||
cls.classScope?.objects?.get(name)?.let { return it }
|
if (includeAbstract || !it.isAbstract) return it
|
||||||
|
}
|
||||||
|
if (includeStatic) {
|
||||||
|
cls.classScope?.objects?.get(name)?.let {
|
||||||
|
if (includeAbstract || !it.isAbstract) return it
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// Finally, allow root object fallback (rare; mostly built-ins like toString)
|
// Finally, allow root object fallback (rare; mostly built-ins like toString)
|
||||||
return rootObjectType.members[name]
|
val rootRec = rootObjectType.members[name]
|
||||||
|
return if (rootRec != null && (includeAbstract || !rootRec.isAbstract)) rootRec else null
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Find the declaring class where a member with [name] is defined, starting from this class along MRO. */
|
/** Find the declaring class where a member with [name] is defined, starting from this class along MRO. */
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -21,5 +21,6 @@ package net.sergeych.lyng.obj
|
|||||||
* Collection is an iterator with `size`
|
* Collection is an iterator with `size`
|
||||||
*/
|
*/
|
||||||
val ObjCollection = ObjClass("Collection", ObjIterable).apply {
|
val ObjCollection = ObjClass("Collection", ObjIterable).apply {
|
||||||
|
addProperty("size", isAbstract = true)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -25,7 +25,7 @@ import net.sergeych.lyng.miniast.type
|
|||||||
|
|
||||||
class ObjCompletableDeferred(val completableDeferred: CompletableDeferred<Obj>): ObjDeferred(completableDeferred) {
|
class ObjCompletableDeferred(val completableDeferred: CompletableDeferred<Obj>): ObjDeferred(completableDeferred) {
|
||||||
|
|
||||||
override val objClass = type
|
override val objClass get() = type
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
val type = object: ObjClass("CompletableDeferred", ObjDeferred.type){
|
val type = object: ObjClass("CompletableDeferred", ObjDeferred.type){
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -20,11 +20,12 @@ package net.sergeych.lyng.obj
|
|||||||
import kotlinx.coroutines.Deferred
|
import kotlinx.coroutines.Deferred
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
import net.sergeych.lyng.miniast.addFnDoc
|
import net.sergeych.lyng.miniast.addFnDoc
|
||||||
|
import net.sergeych.lyng.miniast.addPropertyDoc
|
||||||
import net.sergeych.lyng.miniast.type
|
import net.sergeych.lyng.miniast.type
|
||||||
|
|
||||||
open class ObjDeferred(val deferred: Deferred<Obj>): Obj() {
|
open class ObjDeferred(val deferred: Deferred<Obj>): Obj() {
|
||||||
|
|
||||||
override val objClass = type
|
override val objClass get() = type
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
val type = object: ObjClass("Deferred"){
|
val type = object: ObjClass("Deferred"){
|
||||||
@@ -38,28 +39,30 @@ open class ObjDeferred(val deferred: Deferred<Obj>): Obj() {
|
|||||||
returns = type("lyng.Any"),
|
returns = type("lyng.Any"),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib"
|
||||||
) { thisAs<ObjDeferred>().deferred.await() }
|
) { thisAs<ObjDeferred>().deferred.await() }
|
||||||
addFnDoc(
|
addPropertyDoc(
|
||||||
name = "isCompleted",
|
name = "isCompleted",
|
||||||
doc = "Whether this deferred has completed (successfully or with an error).",
|
doc = "Whether this deferred has completed (successfully or with an error).",
|
||||||
returns = type("lyng.Bool"),
|
type = type("lyng.Bool"),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib",
|
||||||
) { thisAs<ObjDeferred>().deferred.isCompleted.toObj() }
|
getter = { thisAs<ObjDeferred>().deferred.isCompleted.toObj() }
|
||||||
addFnDoc(
|
)
|
||||||
|
addPropertyDoc(
|
||||||
name = "isActive",
|
name = "isActive",
|
||||||
doc = "Whether this deferred is currently active (not completed and not cancelled).",
|
doc = "Whether this deferred is currently active (not completed and not cancelled).",
|
||||||
returns = type("lyng.Bool"),
|
type = type("lyng.Bool"),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib",
|
||||||
) {
|
getter = {
|
||||||
val d = thisAs<ObjDeferred>().deferred
|
val d = thisAs<ObjDeferred>().deferred
|
||||||
(d.isActive || (!d.isCompleted && !d.isCancelled)).toObj()
|
(d.isActive || (!d.isCompleted && !d.isCancelled)).toObj()
|
||||||
}
|
}
|
||||||
addFnDoc(
|
)
|
||||||
|
addPropertyDoc(
|
||||||
name = "isCancelled",
|
name = "isCancelled",
|
||||||
doc = "Whether this deferred was cancelled.",
|
doc = "Whether this deferred was cancelled.",
|
||||||
returns = type("lyng.Bool"),
|
type = type("lyng.Bool"),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib",
|
||||||
) { thisAs<ObjDeferred>().deferred.isCancelled.toObj() }
|
getter = { thisAs<ObjDeferred>().deferred.isCancelled.toObj() }
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
package net.sergeych.lyng.obj
|
package net.sergeych.lyng.obj
|
||||||
|
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
import net.sergeych.lyng.miniast.addFnDoc
|
import net.sergeych.lyng.miniast.addPropertyDoc
|
||||||
import net.sergeych.lyng.miniast.type
|
import net.sergeych.lyng.miniast.type
|
||||||
import kotlin.time.Duration
|
import kotlin.time.Duration
|
||||||
import kotlin.time.Duration.Companion.days
|
import kotlin.time.Duration.Companion.days
|
||||||
@@ -29,7 +29,7 @@ import kotlin.time.Duration.Companion.seconds
|
|||||||
import kotlin.time.DurationUnit
|
import kotlin.time.DurationUnit
|
||||||
|
|
||||||
class ObjDuration(val duration: Duration) : Obj() {
|
class ObjDuration(val duration: Duration) : Obj() {
|
||||||
override val objClass: ObjClass = type
|
override val objClass: ObjClass get() = type
|
||||||
|
|
||||||
override fun toString(): String {
|
override fun toString(): String {
|
||||||
return duration.toString()
|
return duration.toString()
|
||||||
@@ -74,169 +74,195 @@ class ObjDuration(val duration: Duration) : Obj() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}.apply {
|
}.apply {
|
||||||
addFnDoc(
|
addPropertyDoc(
|
||||||
name = "days",
|
name = "days",
|
||||||
doc = "Return this duration as a real number of days.",
|
doc = "Return this duration as a real number of days.",
|
||||||
returns = type("lyng.Real"),
|
type = type("lyng.Real"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { thisAs<ObjDuration>().duration.toDouble(DurationUnit.DAYS).toObj() }
|
getter = { thisAs<ObjDuration>().duration.toDouble(DurationUnit.DAYS).toObj() }
|
||||||
addFnDoc(
|
)
|
||||||
|
addPropertyDoc(
|
||||||
name = "hours",
|
name = "hours",
|
||||||
doc = "Return this duration as a real number of hours.",
|
doc = "Return this duration as a real number of hours.",
|
||||||
returns = type("lyng.Real"),
|
type = type("lyng.Real"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { thisAs<ObjDuration>().duration.toDouble(DurationUnit.HOURS).toObj() }
|
getter = { thisAs<ObjDuration>().duration.toDouble(DurationUnit.HOURS).toObj() }
|
||||||
addFnDoc(
|
)
|
||||||
|
addPropertyDoc(
|
||||||
name = "minutes",
|
name = "minutes",
|
||||||
doc = "Return this duration as a real number of minutes.",
|
doc = "Return this duration as a real number of minutes.",
|
||||||
returns = type("lyng.Real"),
|
type = type("lyng.Real"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { thisAs<ObjDuration>().duration.toDouble(DurationUnit.MINUTES).toObj() }
|
getter = { thisAs<ObjDuration>().duration.toDouble(DurationUnit.MINUTES).toObj() }
|
||||||
addFnDoc(
|
)
|
||||||
|
addPropertyDoc(
|
||||||
name = "seconds",
|
name = "seconds",
|
||||||
doc = "Return this duration as a real number of seconds.",
|
doc = "Return this duration as a real number of seconds.",
|
||||||
returns = type("lyng.Real"),
|
type = type("lyng.Real"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { thisAs<ObjDuration>().duration.toDouble(DurationUnit.SECONDS).toObj() }
|
getter = { thisAs<ObjDuration>().duration.toDouble(DurationUnit.SECONDS).toObj() }
|
||||||
addFnDoc(
|
)
|
||||||
|
addPropertyDoc(
|
||||||
name = "milliseconds",
|
name = "milliseconds",
|
||||||
doc = "Return this duration as a real number of milliseconds.",
|
doc = "Return this duration as a real number of milliseconds.",
|
||||||
returns = type("lyng.Real"),
|
type = type("lyng.Real"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { thisAs<ObjDuration>().duration.toDouble(DurationUnit.MILLISECONDS).toObj() }
|
getter = { thisAs<ObjDuration>().duration.toDouble(DurationUnit.MILLISECONDS).toObj() }
|
||||||
addFnDoc(
|
)
|
||||||
|
addPropertyDoc(
|
||||||
name = "microseconds",
|
name = "microseconds",
|
||||||
doc = "Return this duration as a real number of microseconds.",
|
doc = "Return this duration as a real number of microseconds.",
|
||||||
returns = type("lyng.Real"),
|
type = type("lyng.Real"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { thisAs<ObjDuration>().duration.toDouble(DurationUnit.MICROSECONDS).toObj() }
|
getter = { thisAs<ObjDuration>().duration.toDouble(DurationUnit.MICROSECONDS).toObj() }
|
||||||
|
)
|
||||||
// extensions
|
// extensions
|
||||||
|
|
||||||
ObjInt.type.addFnDoc(
|
ObjInt.type.addPropertyDoc(
|
||||||
name = "seconds",
|
name = "seconds",
|
||||||
doc = "Construct a `Duration` equal to this integer number of seconds.",
|
doc = "Construct a `Duration` equal to this integer number of seconds.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjInt>().value.seconds) }
|
getter = { ObjDuration(thisAs<ObjInt>().value.seconds) }
|
||||||
|
)
|
||||||
|
|
||||||
ObjInt.type.addFnDoc(
|
ObjInt.type.addPropertyDoc(
|
||||||
name = "second",
|
name = "second",
|
||||||
doc = "Construct a `Duration` equal to this integer number of seconds.",
|
doc = "Construct a `Duration` equal to this integer number of seconds.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjInt>().value.seconds) }
|
getter = { ObjDuration(thisAs<ObjInt>().value.seconds) }
|
||||||
ObjInt.type.addFnDoc(
|
)
|
||||||
|
ObjInt.type.addPropertyDoc(
|
||||||
name = "milliseconds",
|
name = "milliseconds",
|
||||||
doc = "Construct a `Duration` equal to this integer number of milliseconds.",
|
doc = "Construct a `Duration` equal to this integer number of milliseconds.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjInt>().value.milliseconds) }
|
getter = { ObjDuration(thisAs<ObjInt>().value.milliseconds) }
|
||||||
|
)
|
||||||
|
|
||||||
ObjInt.type.addFnDoc(
|
ObjInt.type.addPropertyDoc(
|
||||||
name = "millisecond",
|
name = "millisecond",
|
||||||
doc = "Construct a `Duration` equal to this integer number of milliseconds.",
|
doc = "Construct a `Duration` equal to this integer number of milliseconds.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjInt>().value.milliseconds) }
|
getter = { ObjDuration(thisAs<ObjInt>().value.milliseconds) }
|
||||||
ObjReal.type.addFnDoc(
|
)
|
||||||
|
ObjReal.type.addPropertyDoc(
|
||||||
name = "seconds",
|
name = "seconds",
|
||||||
doc = "Construct a `Duration` equal to this real number of seconds.",
|
doc = "Construct a `Duration` equal to this real number of seconds.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjReal>().value.seconds) }
|
getter = { ObjDuration(thisAs<ObjReal>().value.seconds) }
|
||||||
|
)
|
||||||
|
|
||||||
ObjReal.type.addFnDoc(
|
ObjReal.type.addPropertyDoc(
|
||||||
name = "second",
|
name = "second",
|
||||||
doc = "Construct a `Duration` equal to this real number of seconds.",
|
doc = "Construct a `Duration` equal to this real number of seconds.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjReal>().value.seconds) }
|
getter = { ObjDuration(thisAs<ObjReal>().value.seconds) }
|
||||||
|
)
|
||||||
|
|
||||||
ObjReal.type.addFnDoc(
|
ObjReal.type.addPropertyDoc(
|
||||||
name = "milliseconds",
|
name = "milliseconds",
|
||||||
doc = "Construct a `Duration` equal to this real number of milliseconds.",
|
doc = "Construct a `Duration` equal to this real number of milliseconds.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjReal>().value.milliseconds) }
|
getter = { ObjDuration(thisAs<ObjReal>().value.milliseconds) }
|
||||||
ObjReal.type.addFnDoc(
|
)
|
||||||
|
ObjReal.type.addPropertyDoc(
|
||||||
name = "millisecond",
|
name = "millisecond",
|
||||||
doc = "Construct a `Duration` equal to this real number of milliseconds.",
|
doc = "Construct a `Duration` equal to this real number of milliseconds.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjReal>().value.milliseconds) }
|
getter = { ObjDuration(thisAs<ObjReal>().value.milliseconds) }
|
||||||
|
)
|
||||||
|
|
||||||
ObjInt.type.addFnDoc(
|
ObjInt.type.addPropertyDoc(
|
||||||
name = "minutes",
|
name = "minutes",
|
||||||
doc = "Construct a `Duration` equal to this integer number of minutes.",
|
doc = "Construct a `Duration` equal to this integer number of minutes.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjInt>().value.minutes) }
|
getter = { ObjDuration(thisAs<ObjInt>().value.minutes) }
|
||||||
ObjReal.type.addFnDoc(
|
)
|
||||||
|
ObjReal.type.addPropertyDoc(
|
||||||
name = "minutes",
|
name = "minutes",
|
||||||
doc = "Construct a `Duration` equal to this real number of minutes.",
|
doc = "Construct a `Duration` equal to this real number of minutes.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjReal>().value.minutes) }
|
getter = { ObjDuration(thisAs<ObjReal>().value.minutes) }
|
||||||
ObjInt.type.addFnDoc(
|
)
|
||||||
|
ObjInt.type.addPropertyDoc(
|
||||||
name = "minute",
|
name = "minute",
|
||||||
doc = "Construct a `Duration` equal to this integer number of minutes.",
|
doc = "Construct a `Duration` equal to this integer number of minutes.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjInt>().value.minutes) }
|
getter = { ObjDuration(thisAs<ObjInt>().value.minutes) }
|
||||||
ObjReal.type.addFnDoc(
|
)
|
||||||
|
ObjReal.type.addPropertyDoc(
|
||||||
name = "minute",
|
name = "minute",
|
||||||
doc = "Construct a `Duration` equal to this real number of minutes.",
|
doc = "Construct a `Duration` equal to this real number of minutes.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjReal>().value.minutes) }
|
getter = { ObjDuration(thisAs<ObjReal>().value.minutes) }
|
||||||
ObjInt.type.addFnDoc(
|
)
|
||||||
|
ObjInt.type.addPropertyDoc(
|
||||||
name = "hours",
|
name = "hours",
|
||||||
doc = "Construct a `Duration` equal to this integer number of hours.",
|
doc = "Construct a `Duration` equal to this integer number of hours.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjInt>().value.hours) }
|
getter = { ObjDuration(thisAs<ObjInt>().value.hours) }
|
||||||
ObjReal.type.addFnDoc(
|
)
|
||||||
|
ObjReal.type.addPropertyDoc(
|
||||||
name = "hours",
|
name = "hours",
|
||||||
doc = "Construct a `Duration` equal to this real number of hours.",
|
doc = "Construct a `Duration` equal to this real number of hours.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjReal>().value.hours) }
|
getter = { ObjDuration(thisAs<ObjReal>().value.hours) }
|
||||||
ObjInt.type.addFnDoc(
|
)
|
||||||
|
ObjInt.type.addPropertyDoc(
|
||||||
name = "hour",
|
name = "hour",
|
||||||
doc = "Construct a `Duration` equal to this integer number of hours.",
|
doc = "Construct a `Duration` equal to this integer number of hours.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjInt>().value.hours) }
|
getter = { ObjDuration(thisAs<ObjInt>().value.hours) }
|
||||||
ObjReal.type.addFnDoc(
|
)
|
||||||
|
ObjReal.type.addPropertyDoc(
|
||||||
name = "hour",
|
name = "hour",
|
||||||
doc = "Construct a `Duration` equal to this real number of hours.",
|
doc = "Construct a `Duration` equal to this real number of hours.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjReal>().value.hours) }
|
getter = { ObjDuration(thisAs<ObjReal>().value.hours) }
|
||||||
ObjInt.type.addFnDoc(
|
)
|
||||||
|
ObjInt.type.addPropertyDoc(
|
||||||
name = "days",
|
name = "days",
|
||||||
doc = "Construct a `Duration` equal to this integer number of days.",
|
doc = "Construct a `Duration` equal to this integer number of days.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjInt>().value.days) }
|
getter = { ObjDuration(thisAs<ObjInt>().value.days) }
|
||||||
ObjReal.type.addFnDoc(
|
)
|
||||||
|
ObjReal.type.addPropertyDoc(
|
||||||
name = "days",
|
name = "days",
|
||||||
doc = "Construct a `Duration` equal to this real number of days.",
|
doc = "Construct a `Duration` equal to this real number of days.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjReal>().value.days) }
|
getter = { ObjDuration(thisAs<ObjReal>().value.days) }
|
||||||
ObjInt.type.addFnDoc(
|
)
|
||||||
|
ObjInt.type.addPropertyDoc(
|
||||||
name = "day",
|
name = "day",
|
||||||
doc = "Construct a `Duration` equal to this integer number of days.",
|
doc = "Construct a `Duration` equal to this integer number of days.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjInt>().value.days) }
|
getter = { ObjDuration(thisAs<ObjInt>().value.days) }
|
||||||
ObjReal.type.addFnDoc(
|
)
|
||||||
|
ObjReal.type.addPropertyDoc(
|
||||||
name = "day",
|
name = "day",
|
||||||
doc = "Construct a `Duration` equal to this real number of days.",
|
doc = "Construct a `Duration` equal to this real number of days.",
|
||||||
returns = type("lyng.Duration"),
|
type = type("lyng.Duration"),
|
||||||
moduleName = "lyng.time"
|
moduleName = "lyng.time",
|
||||||
) { ObjDuration(thisAs<ObjReal>().value.days) }
|
getter = { ObjDuration(thisAs<ObjReal>().value.days) }
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
// addFn("epochSeconds") {
|
// addFn("epochSeconds") {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ import net.sergeych.lyng.Scope
|
|||||||
import net.sergeych.lyng.Statement
|
import net.sergeych.lyng.Statement
|
||||||
|
|
||||||
class ObjDynamicContext(val delegate: ObjDynamic) : Obj() {
|
class ObjDynamicContext(val delegate: ObjDynamic) : Obj() {
|
||||||
override val objClass: ObjClass = type
|
override val objClass: ObjClass get() = type
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
val type = ObjClass("DelegateContext").apply {
|
val type = ObjClass("DelegateContext").apply {
|
||||||
@@ -54,7 +54,7 @@ class ObjDynamicContext(val delegate: ObjDynamic) : Obj() {
|
|||||||
*/
|
*/
|
||||||
open class ObjDynamic(var readCallback: Statement? = null, var writeCallback: Statement? = null) : Obj() {
|
open class ObjDynamic(var readCallback: Statement? = null, var writeCallback: Statement? = null) : Obj() {
|
||||||
|
|
||||||
override val objClass: ObjClass = type
|
override val objClass: ObjClass get() = type
|
||||||
// Capture the lexical scope used to build this dynamic so callbacks can see outer locals
|
// Capture the lexical scope used to build this dynamic so callbacks can see outer locals
|
||||||
internal var builderScope: Scope? = null
|
internal var builderScope: Scope? = null
|
||||||
|
|
||||||
|
|||||||
@@ -35,6 +35,8 @@ package net.sergeych.lyng.obj/*
|
|||||||
import kotlinx.serialization.json.JsonElement
|
import kotlinx.serialization.json.JsonElement
|
||||||
import kotlinx.serialization.json.JsonPrimitive
|
import kotlinx.serialization.json.JsonPrimitive
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.miniast.addPropertyDoc
|
||||||
|
import net.sergeych.lyng.miniast.type
|
||||||
import net.sergeych.lynon.LynonDecoder
|
import net.sergeych.lynon.LynonDecoder
|
||||||
import net.sergeych.lynon.LynonEncoder
|
import net.sergeych.lynon.LynonEncoder
|
||||||
import net.sergeych.lynon.LynonType
|
import net.sergeych.lynon.LynonType
|
||||||
@@ -76,8 +78,8 @@ class ObjEnumClass(val name: String) : ObjClass(name, EnumBase) {
|
|||||||
val name = requireOnlyArg<ObjString>()
|
val name = requireOnlyArg<ObjString>()
|
||||||
byName[name] ?: raiseSymbolNotFound("does not exists: enum ${className}.$name")
|
byName[name] ?: raiseSymbolNotFound("does not exists: enum ${className}.$name")
|
||||||
}
|
}
|
||||||
addFn("name") { thisAs<ObjEnumEntry>().name }
|
addPropertyDoc("name", doc = "Entry name as string", type = type("lyng.String"), getter = { thisAs<ObjEnumEntry>().name })
|
||||||
addFn("ordinal") { thisAs<ObjEnumEntry>().ordinal }
|
addPropertyDoc("ordinal", doc = "Entry ordinal position", type = type("lyng.Int"), getter = { thisAs<ObjEnumEntry>().ordinal })
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,11 +17,10 @@
|
|||||||
|
|
||||||
package net.sergeych.lyng.obj
|
package net.sergeych.lyng.obj
|
||||||
|
|
||||||
import net.sergeych.bintools.encodeToHex
|
|
||||||
import net.sergeych.lyng.*
|
import net.sergeych.lyng.*
|
||||||
import net.sergeych.lyng.miniast.TypeGenericDoc
|
import net.sergeych.lyng.miniast.TypeGenericDoc
|
||||||
import net.sergeych.lyng.miniast.addConstDoc
|
|
||||||
import net.sergeych.lyng.miniast.addFnDoc
|
import net.sergeych.lyng.miniast.addFnDoc
|
||||||
|
import net.sergeych.lyng.miniast.addPropertyDoc
|
||||||
import net.sergeych.lyng.miniast.type
|
import net.sergeych.lyng.miniast.type
|
||||||
import net.sergeych.lynon.LynonDecoder
|
import net.sergeych.lynon.LynonDecoder
|
||||||
import net.sergeych.lynon.LynonEncoder
|
import net.sergeych.lynon.LynonEncoder
|
||||||
@@ -41,7 +40,7 @@ open class ObjException(
|
|||||||
val exceptionClass: ExceptionClass,
|
val exceptionClass: ExceptionClass,
|
||||||
val scope: Scope,
|
val scope: Scope,
|
||||||
val message: ObjString,
|
val message: ObjString,
|
||||||
@Suppress("unused") val extraData: Obj = ObjNull,
|
val extraData: Obj = ObjNull,
|
||||||
val useStackTrace: ObjList? = null
|
val useStackTrace: ObjList? = null
|
||||||
) : Obj() {
|
) : Obj() {
|
||||||
constructor(name: String, scope: Scope, message: String) : this(
|
constructor(name: String, scope: Scope, message: String) : this(
|
||||||
@@ -54,41 +53,30 @@ open class ObjException(
|
|||||||
|
|
||||||
suspend fun getStackTrace(): ObjList {
|
suspend fun getStackTrace(): ObjList {
|
||||||
return cachedStackTrace.get {
|
return cachedStackTrace.get {
|
||||||
val result = ObjList()
|
captureStackTrace(scope)
|
||||||
val maybeCls = scope.get("StackTraceEntry")?.value as? ObjClass
|
|
||||||
var s: Scope? = scope
|
|
||||||
var lastPos: Pos? = null
|
|
||||||
while (s != null) {
|
|
||||||
val pos = s.pos
|
|
||||||
if (pos != lastPos && !pos.currentLine.isEmpty()) {
|
|
||||||
if (maybeCls != null) {
|
|
||||||
result.list += maybeCls.callWithArgs(
|
|
||||||
scope,
|
|
||||||
pos.source.objSourceName,
|
|
||||||
ObjInt(pos.line.toLong()),
|
|
||||||
ObjInt(pos.column.toLong()),
|
|
||||||
ObjString(pos.currentLine)
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
// Fallback textual entry if StackTraceEntry class is not available in this scope
|
|
||||||
result.list += ObjString("${pos.source.objSourceName}:${pos.line}:${pos.column}: ${pos.currentLine}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
s = s.parent
|
|
||||||
lastPos = pos
|
|
||||||
}
|
|
||||||
result
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
constructor(scope: Scope, message: String) : this(Root, scope, ObjString(message))
|
constructor(scope: Scope, message: String) : this(Root, scope, ObjString(message))
|
||||||
|
|
||||||
fun raise(): Nothing {
|
fun raise(): Nothing {
|
||||||
throw ExecutionError(this)
|
throw ExecutionError(this, scope.pos, message.value)
|
||||||
}
|
}
|
||||||
|
|
||||||
override val objClass: ObjClass = exceptionClass
|
override val objClass: ObjClass = exceptionClass
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tool to get kotlin string with error report including the Lyng stack trace.
|
||||||
|
*/
|
||||||
|
suspend fun toStringWithStackTrace(): String {
|
||||||
|
val l = getStackTrace().list
|
||||||
|
return buildString {
|
||||||
|
append(message.value)
|
||||||
|
for (t in l)
|
||||||
|
append("\n\tat ${t.toString(scope)}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override suspend fun defaultToString(scope: Scope): ObjString {
|
override suspend fun defaultToString(scope: Scope): ObjString {
|
||||||
val at = getStackTrace().list.firstOrNull()?.toString(scope)
|
val at = getStackTrace().list.firstOrNull()?.toString(scope)
|
||||||
?: ObjString("(unknown)")
|
?: ObjString("(unknown)")
|
||||||
@@ -105,13 +93,51 @@ open class ObjException(
|
|||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
|
||||||
|
suspend fun captureStackTrace(scope: Scope): ObjList {
|
||||||
|
val result = ObjList()
|
||||||
|
val maybeCls = scope.get("StackTraceEntry")?.value as? ObjClass
|
||||||
|
var s: Scope? = scope
|
||||||
|
var lastPos: Pos? = null
|
||||||
|
while (s != null) {
|
||||||
|
val pos = s.pos
|
||||||
|
if (pos != lastPos && !pos.currentLine.isEmpty()) {
|
||||||
|
if( (lastPos == null || (lastPos.source != pos.source || lastPos.line != pos.line)) ) {
|
||||||
|
if (maybeCls != null) {
|
||||||
|
result.list += maybeCls.callWithArgs(
|
||||||
|
scope,
|
||||||
|
pos.source.objSourceName,
|
||||||
|
ObjInt(pos.line.toLong()),
|
||||||
|
ObjInt(pos.column.toLong()),
|
||||||
|
ObjString(pos.currentLine)
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
// Fallback textual entry if StackTraceEntry class is not available in this scope
|
||||||
|
result.list += ObjString("#${pos.source.objSourceName}:${pos.line+1}:${pos.column+1}: ${pos.currentLine}")
|
||||||
|
}
|
||||||
|
lastPos = pos
|
||||||
|
}
|
||||||
|
}
|
||||||
|
s = s.parent
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
class ExceptionClass(val name: String, vararg parents: ObjClass) : ObjClass(name, *parents) {
|
class ExceptionClass(val name: String, vararg parents: ObjClass) : ObjClass(name, *parents) {
|
||||||
override suspend fun callOn(scope: Scope): Obj {
|
init {
|
||||||
val message = scope.args.getOrNull(0)?.toString(scope) ?: ObjString(name)
|
constructorMeta = ArgsDeclaration(
|
||||||
return ObjException(this, scope, message)
|
listOf(ArgsDeclaration.Item("message", defaultValue = statement { ObjString(name) })),
|
||||||
|
Token.Type.RPAREN
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun toString(): String = "ExceptionClass[$name]@${hashCode().encodeToHex()}"
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
val message = scope.args.getOrNull(0)?.toString(scope) ?: ObjString(name)
|
||||||
|
val ex = ObjException(this, scope, message)
|
||||||
|
ex.getStackTrace()
|
||||||
|
return ex
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun toString(): String = name
|
||||||
|
|
||||||
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
||||||
return try {
|
return try {
|
||||||
@@ -137,22 +163,75 @@ open class ObjException(
|
|||||||
}
|
}
|
||||||
|
|
||||||
val Root = ExceptionClass("Exception").apply {
|
val Root = ExceptionClass("Exception").apply {
|
||||||
addConstDoc(
|
instanceInitializers.add(statement {
|
||||||
|
if (thisObj is ObjInstance) {
|
||||||
|
val msg = get("message")?.value ?: ObjString("Exception")
|
||||||
|
(thisObj as ObjInstance).instanceScope.addItem("Exception::message", false, msg)
|
||||||
|
|
||||||
|
val stack = captureStackTrace(this)
|
||||||
|
(thisObj as ObjInstance).instanceScope.addItem("Exception::stackTrace", false, stack)
|
||||||
|
}
|
||||||
|
ObjVoid
|
||||||
|
})
|
||||||
|
instanceConstructor = statement { ObjVoid }
|
||||||
|
addPropertyDoc(
|
||||||
name = "message",
|
name = "message",
|
||||||
value = statement {
|
|
||||||
(thisObj as ObjException).message.toObj()
|
|
||||||
},
|
|
||||||
doc = "Human‑readable error message.",
|
doc = "Human‑readable error message.",
|
||||||
type = type("lyng.String"),
|
type = type("lyng.String"),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib",
|
||||||
|
getter = {
|
||||||
|
when (val t = this.thisObj) {
|
||||||
|
is ObjException -> t.message
|
||||||
|
is ObjInstance -> t.instanceScope.get("Exception::message")?.value ?: ObjNull
|
||||||
|
else -> ObjNull
|
||||||
|
}
|
||||||
|
}
|
||||||
)
|
)
|
||||||
addFnDoc(
|
addPropertyDoc(
|
||||||
|
name = "extraData",
|
||||||
|
doc = "Extra data associated with the exception.",
|
||||||
|
type = type("lyng.Any", nullable = true),
|
||||||
|
moduleName = "lyng.stdlib",
|
||||||
|
getter = {
|
||||||
|
when (val t = this.thisObj) {
|
||||||
|
is ObjException -> t.extraData
|
||||||
|
else -> ObjNull
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
name = "stackTrace",
|
name = "stackTrace",
|
||||||
doc = "Stack trace captured at throw site as a list of `StackTraceEntry`.",
|
doc = "Stack trace captured at throw site as a list of `StackTraceEntry`.",
|
||||||
returns = TypeGenericDoc(type("lyng.List"), listOf(type("lyng.StackTraceEntry"))),
|
type = TypeGenericDoc(type("lyng.List"), listOf(type("lyng.StackTraceEntry"))),
|
||||||
|
moduleName = "lyng.stdlib",
|
||||||
|
getter = {
|
||||||
|
when (val t = this.thisObj) {
|
||||||
|
is ObjException -> t.getStackTrace()
|
||||||
|
is ObjInstance -> t.instanceScope.get("Exception::stackTrace")?.value as? ObjList ?: ObjList()
|
||||||
|
else -> ObjList()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
addFnDoc(
|
||||||
|
name = "toString",
|
||||||
|
doc = "Human‑readable string representation of the error.",
|
||||||
|
returns = type("lyng.String"),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib"
|
||||||
) {
|
) {
|
||||||
(thisObj as ObjException).getStackTrace()
|
val msg = when (val t = thisObj) {
|
||||||
|
is ObjException -> t.message.value
|
||||||
|
is ObjInstance -> (t.instanceScope.get("Exception::message")?.value as? ObjString)?.value
|
||||||
|
?: t.objClass.className
|
||||||
|
|
||||||
|
else -> t.objClass.className
|
||||||
|
}
|
||||||
|
val stack = when (val t = thisObj) {
|
||||||
|
is ObjException -> t.getStackTrace()
|
||||||
|
is ObjInstance -> t.instanceScope.get("Exception::stackTrace")?.value as? ObjList ?: ObjList()
|
||||||
|
else -> ObjList()
|
||||||
|
}
|
||||||
|
val at = stack.list.firstOrNull()?.toString(this) ?: ObjString("(unknown)")
|
||||||
|
ObjString("${thisObj.objClass.className}: $msg at $at")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -254,3 +333,72 @@ class ObjUnsetException(scope: Scope, message: String = "property is unset (not
|
|||||||
|
|
||||||
class ObjNotImplementedException(scope: Scope, message: String = "not implemented") :
|
class ObjNotImplementedException(scope: Scope, message: String = "not implemented") :
|
||||||
ObjException("NotImplementedException", scope, message)
|
ObjException("NotImplementedException", scope, message)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the object is an instance of Lyng Exception class.
|
||||||
|
*/
|
||||||
|
fun Obj.isLyngException(): Boolean = isInstanceOf("Exception")
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the exception message.
|
||||||
|
*/
|
||||||
|
suspend fun Obj.getLyngExceptionMessage(scope: Scope? = null): String {
|
||||||
|
require(this.isLyngException())
|
||||||
|
val s = scope ?: Script.newScope()
|
||||||
|
return invokeInstanceMethod(s, "message").toString(s).value
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves a detailed exception message including the stack trace for a Lyng exception.
|
||||||
|
* This function is designed to handle objects identified as Lyng exceptions.
|
||||||
|
*
|
||||||
|
* @param scope the scope to be used for fetching the exception message and stack trace.
|
||||||
|
* If null, a new scope will be created.
|
||||||
|
* @return a string combining the exception message, the location ("at"),
|
||||||
|
* and the formatted stack trace information.
|
||||||
|
* The stack trace details each frame using indentation for clarity.
|
||||||
|
* @throws IllegalArgumentException if the object is not a Lyng exception.
|
||||||
|
*/
|
||||||
|
suspend fun Obj.getLyngExceptionMessageWithStackTrace(scope: Scope? = null,showDetails:Boolean=true): String {
|
||||||
|
require(this.isLyngException())
|
||||||
|
val s = scope ?: Script.newScope()
|
||||||
|
val msg = getLyngExceptionMessage(s)
|
||||||
|
val trace = getLyngExceptionStackTrace(s)
|
||||||
|
var at = "unknown"
|
||||||
|
// var firstLine = true
|
||||||
|
val stack = if (!trace.list.isEmpty()) {
|
||||||
|
val first = trace.list[0]
|
||||||
|
at = (first.readField(s, "at").value as ObjString).value
|
||||||
|
"\n" + trace.list.map { " at " + it.toString(s).value }.joinToString("\n")
|
||||||
|
} else ""
|
||||||
|
return "$at: $msg$stack"
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the exception stack trace.
|
||||||
|
*/
|
||||||
|
suspend fun Obj.getLyngExceptionStackTrace(scope: Scope): ObjList =
|
||||||
|
invokeInstanceMethod(scope, "stackTrace").cast(scope)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the exception extra data.
|
||||||
|
*/
|
||||||
|
suspend fun Obj.getLyngExceptionExtraData(scope: Scope): Obj =
|
||||||
|
invokeInstanceMethod(scope, "extraData")
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the exception as a formatted string with the primary throw site.
|
||||||
|
*/
|
||||||
|
suspend fun Obj.getLyngExceptionString(scope: Scope): String =
|
||||||
|
invokeInstanceMethod(scope, "toString").toString(scope).value
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rethrow this object as a Kotlin [ExecutionError] if it's an exception.
|
||||||
|
*/
|
||||||
|
suspend fun Obj.raiseAsExecutionError(scope: Scope? = null): Nothing {
|
||||||
|
if (this is ObjException) raise()
|
||||||
|
val sc = scope ?: Script.newScope()
|
||||||
|
val msg = getLyngExceptionMessage(sc)
|
||||||
|
val pos = (this as? ObjInstance)?.instanceScope?.pos ?: Pos.builtIn
|
||||||
|
throw ExecutionError(this, pos, msg)
|
||||||
|
}
|
||||||
@@ -35,7 +35,7 @@ import kotlin.coroutines.cancellation.CancellationException
|
|||||||
|
|
||||||
class ObjFlowBuilder(val output: SendChannel<Obj>) : Obj() {
|
class ObjFlowBuilder(val output: SendChannel<Obj>) : Obj() {
|
||||||
|
|
||||||
override val objClass = type
|
override val objClass get() = type
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
@OptIn(DelicateCoroutinesApi::class)
|
@OptIn(DelicateCoroutinesApi::class)
|
||||||
@@ -91,7 +91,7 @@ private fun createLyngFlowInput(scope: Scope, producer: Statement): ReceiveChann
|
|||||||
|
|
||||||
class ObjFlow(val producer: Statement, val scope: Scope) : Obj() {
|
class ObjFlow(val producer: Statement, val scope: Scope) : Obj() {
|
||||||
|
|
||||||
override val objClass = type
|
override val objClass get() = type
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
val type = object : ObjClass("Flow", ObjIterable) {
|
val type = object : ObjClass("Flow", ObjIterable) {
|
||||||
@@ -119,7 +119,7 @@ class ObjFlow(val producer: Statement, val scope: Scope) : Obj() {
|
|||||||
|
|
||||||
class ObjFlowIterator(val producer: Statement) : Obj() {
|
class ObjFlowIterator(val producer: Statement) : Obj() {
|
||||||
|
|
||||||
override val objClass: ObjClass = type
|
override val objClass: ObjClass get() = type
|
||||||
|
|
||||||
private var channel: ReceiveChannel<Obj>? = null
|
private var channel: ReceiveChannel<Obj>? = null
|
||||||
|
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ import kotlinx.serialization.json.JsonElement
|
|||||||
import kotlinx.serialization.json.JsonObject
|
import kotlinx.serialization.json.JsonObject
|
||||||
import net.sergeych.lyng.Arguments
|
import net.sergeych.lyng.Arguments
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.Visibility
|
||||||
import net.sergeych.lyng.canAccessMember
|
import net.sergeych.lyng.canAccessMember
|
||||||
import net.sergeych.lynon.LynonDecoder
|
import net.sergeych.lynon.LynonDecoder
|
||||||
import net.sergeych.lynon.LynonEncoder
|
import net.sergeych.lynon.LynonEncoder
|
||||||
@@ -31,50 +32,55 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
internal lateinit var instanceScope: Scope
|
internal lateinit var instanceScope: Scope
|
||||||
|
|
||||||
override suspend fun readField(scope: Scope, name: String): ObjRecord {
|
override suspend fun readField(scope: Scope, name: String): ObjRecord {
|
||||||
// 1. Direct (unmangled) lookup first
|
val caller = scope.currentClassCtx
|
||||||
instanceScope[name]?.let { rec ->
|
|
||||||
|
// Fast path for public members when outside any class context
|
||||||
|
if (caller == null) {
|
||||||
|
objClass.publicMemberResolution[name]?.let { key ->
|
||||||
|
instanceScope.objects[key]?.let { rec ->
|
||||||
|
// Directly return fields to bypass resolveRecord overhead
|
||||||
|
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && !rec.isAbstract)
|
||||||
|
return rec
|
||||||
|
return resolveRecord(scope, rec, name, rec.declaringClass)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 0. Private mangled of current class context
|
||||||
|
caller?.let { c ->
|
||||||
|
// Check for private methods/properties
|
||||||
|
c.members[name]?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
return resolveRecord(scope, rec, name, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Check for private fields (stored in instanceScope)
|
||||||
|
val mangled = c.mangledName(name)
|
||||||
|
instanceScope.objects[mangled]?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
return resolveRecord(scope, rec, name, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1. MRO mangled storage
|
||||||
|
for (cls in objClass.mro) {
|
||||||
|
if (cls.className == "Obj") break
|
||||||
|
val mangled = cls.mangledName(name)
|
||||||
|
instanceScope.objects[mangled]?.let { rec ->
|
||||||
|
if ((scope.thisObj === this && caller != null) || canAccessMember(rec.visibility, cls, caller)) {
|
||||||
|
return resolveRecord(scope, rec, name, cls)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Unmangled storage
|
||||||
|
instanceScope.objects[name]?.let { rec ->
|
||||||
val decl = rec.declaringClass
|
val decl = rec.declaringClass
|
||||||
// Allow unconditional access when accessing through `this` of the same instance
|
// Unmangled access is only allowed if it's public OR we are inside the same instance's method
|
||||||
// BUT only if we are in the class context (not extension)
|
if ((scope.thisObj === this && caller != null) || canAccessMember(rec.visibility, decl, caller)) {
|
||||||
if (scope.thisObj !== this || scope.currentClassCtx == null) {
|
return resolveRecord(scope, rec, name, decl)
|
||||||
val caller = scope.currentClassCtx
|
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
|
||||||
scope.raiseError(
|
|
||||||
ObjIllegalAccessException(
|
|
||||||
scope,
|
|
||||||
"can't access field $name (declared in ${decl?.className ?: "?"})"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
return resolveRecord(scope, rec, name, decl)
|
|
||||||
}
|
|
||||||
|
|
||||||
// 2. MI-mangled instance scope lookup
|
|
||||||
val cls = objClass
|
|
||||||
fun findMangledInRead(): ObjRecord? {
|
|
||||||
instanceScope.objects["${cls.className}::$name"]?.let { return it }
|
|
||||||
for (p in cls.mroParents) {
|
|
||||||
instanceScope.objects["${p.className}::$name"]?.let { return it }
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
findMangledInRead()?.let { rec ->
|
|
||||||
val declaring = when {
|
|
||||||
instanceScope.objects.containsKey("${cls.className}::$name") -> cls
|
|
||||||
else -> cls.mroParents.firstOrNull { instanceScope.objects.containsKey("${it.className}::$name") }
|
|
||||||
}
|
|
||||||
if (scope.thisObj !== this || scope.currentClassCtx == null) {
|
|
||||||
val caller = scope.currentClassCtx
|
|
||||||
if (!canAccessMember(rec.visibility, declaring, caller))
|
|
||||||
scope.raiseError(
|
|
||||||
ObjIllegalAccessException(
|
|
||||||
scope,
|
|
||||||
"can't access field $name (declared in ${declaring?.className ?: "?"})"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
return resolveRecord(scope, rec, name, declaring)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. Fall back to super (handles class members and extensions)
|
// 3. Fall back to super (handles class members and extensions)
|
||||||
@@ -82,7 +88,118 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun resolveRecord(scope: Scope, obj: ObjRecord, name: String, decl: ObjClass?): ObjRecord {
|
override suspend fun resolveRecord(scope: Scope, obj: ObjRecord, name: String, decl: ObjClass?): ObjRecord {
|
||||||
|
if (obj.type.isArgument) return super.resolveRecord(scope, obj, name, decl)
|
||||||
if (obj.type == ObjRecord.Type.Delegated) {
|
if (obj.type == ObjRecord.Type.Delegated) {
|
||||||
|
val d = decl ?: obj.declaringClass
|
||||||
|
val storageName = d?.mangledName(name) ?: name
|
||||||
|
var del = instanceScope[storageName]?.delegate ?: obj.delegate
|
||||||
|
if (del == null) {
|
||||||
|
for (c in objClass.mro) {
|
||||||
|
del = instanceScope[c.mangledName(name)]?.delegate
|
||||||
|
if (del != null) break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
del = del ?: scope.raiseError("Internal error: delegated property $name has no delegate")
|
||||||
|
val res = del.invokeInstanceMethod(scope, "getValue", Arguments(this, ObjString(name)))
|
||||||
|
obj.value = res
|
||||||
|
return obj
|
||||||
|
}
|
||||||
|
|
||||||
|
// Map member template to instance storage if applicable
|
||||||
|
var targetRec = obj
|
||||||
|
val d = decl ?: obj.declaringClass
|
||||||
|
if (d != null) {
|
||||||
|
val mangled = d.mangledName(name)
|
||||||
|
instanceScope.objects[mangled]?.let {
|
||||||
|
targetRec = it
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (targetRec === obj) {
|
||||||
|
instanceScope.objects[name]?.let { rec ->
|
||||||
|
// Check if this record in instanceScope is the one we want.
|
||||||
|
// For members, it must match the declaring class.
|
||||||
|
// Arguments are also preferred.
|
||||||
|
if (rec.type == ObjRecord.Type.Argument || rec.declaringClass == d || rec.declaringClass == null) {
|
||||||
|
targetRec = rec
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return super.resolveRecord(scope, targetRec, name, d)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun writeField(scope: Scope, name: String, newValue: Obj) {
|
||||||
|
willMutate(scope)
|
||||||
|
val caller = scope.currentClassCtx
|
||||||
|
|
||||||
|
// Fast path for public members when outside any class context
|
||||||
|
if (caller == null) {
|
||||||
|
objClass.publicMemberResolution[name]?.let { key ->
|
||||||
|
instanceScope.objects[key]?.let { rec ->
|
||||||
|
if (rec.effectiveWriteVisibility == Visibility.Public) {
|
||||||
|
// Skip property/delegated overhead if it's a plain mutable field
|
||||||
|
if (rec.type == ObjRecord.Type.Field && rec.isMutable && !rec.isAbstract) {
|
||||||
|
if (rec.value.assign(scope, newValue) == null)
|
||||||
|
rec.value = newValue
|
||||||
|
return
|
||||||
|
}
|
||||||
|
updateRecord(scope, rec, name, newValue, rec.declaringClass)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 0. Private mangled of current class context
|
||||||
|
caller?.let { c ->
|
||||||
|
// Check for private methods/properties
|
||||||
|
c.members[name]?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
updateRecord(scope, resolveRecord(scope, rec, name, c), name, newValue, c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Check for private fields (stored in instanceScope)
|
||||||
|
val mangled = c.mangledName(name)
|
||||||
|
instanceScope.objects[mangled]?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
updateRecord(scope, rec, name, newValue, c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1. MRO mangled storage
|
||||||
|
for (cls in objClass.mro) {
|
||||||
|
if (cls.className == "Obj") break
|
||||||
|
val mangled = cls.mangledName(name)
|
||||||
|
instanceScope.objects[mangled]?.let { rec ->
|
||||||
|
if ((scope.thisObj === this && caller != null) || canAccessMember(rec.effectiveWriteVisibility, cls, caller)) {
|
||||||
|
updateRecord(scope, rec, name, newValue, cls)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Unmangled storage
|
||||||
|
instanceScope.objects[name]?.let { rec ->
|
||||||
|
val decl = rec.declaringClass
|
||||||
|
if ((scope.thisObj === this && caller != null) || canAccessMember(rec.effectiveWriteVisibility, decl, caller)) {
|
||||||
|
updateRecord(scope, rec, name, newValue, decl)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
super.writeField(scope, name, newValue)
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun updateRecord(scope: Scope, rec: ObjRecord, name: String, newValue: Obj, decl: ObjClass?) {
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
val prop = rec.value as ObjProperty
|
||||||
|
prop.callSetter(scope, this, newValue, decl)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (rec.type == ObjRecord.Type.Delegated) {
|
||||||
val storageName = "${decl?.className}::$name"
|
val storageName = "${decl?.className}::$name"
|
||||||
var del = instanceScope[storageName]?.delegate
|
var del = instanceScope[storageName]?.delegate
|
||||||
if (del == null) {
|
if (del == null) {
|
||||||
@@ -91,136 +208,98 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
if (del != null) break
|
if (del != null) break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
del = del ?: obj.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate (tried $storageName)")
|
del = del ?: rec.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate (tried $storageName)")
|
||||||
val res = del.invokeInstanceMethod(scope, "getValue", Arguments(this, ObjString(name)))
|
del.invokeInstanceMethod(scope, "setValue", Arguments(this, ObjString(name), newValue))
|
||||||
obj.value = res
|
|
||||||
return obj
|
|
||||||
}
|
|
||||||
return super.resolveRecord(scope, obj, name, decl)
|
|
||||||
}
|
|
||||||
|
|
||||||
override suspend fun writeField(scope: Scope, name: String, newValue: Obj) {
|
|
||||||
// Direct (unmangled) first
|
|
||||||
instanceScope[name]?.let { f ->
|
|
||||||
val decl = f.declaringClass
|
|
||||||
if (scope.thisObj !== this || scope.currentClassCtx == null) {
|
|
||||||
val caller = scope.currentClassCtx
|
|
||||||
if (!canAccessMember(f.effectiveWriteVisibility, decl, caller))
|
|
||||||
ObjIllegalAccessException(
|
|
||||||
scope,
|
|
||||||
"can't assign to field $name (declared in ${decl?.className ?: "?"})"
|
|
||||||
).raise()
|
|
||||||
}
|
|
||||||
if (f.type == ObjRecord.Type.Property) {
|
|
||||||
val prop = f.value as ObjProperty
|
|
||||||
prop.callSetter(scope, this, newValue, decl)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (f.type == ObjRecord.Type.Delegated) {
|
|
||||||
val storageName = "${decl?.className}::$name"
|
|
||||||
var del = instanceScope[storageName]?.delegate
|
|
||||||
if (del == null) {
|
|
||||||
for (c in objClass.mro) {
|
|
||||||
del = instanceScope["${c.className}::$name"]?.delegate
|
|
||||||
if (del != null) break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
del = del ?: f.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate (tried $storageName)")
|
|
||||||
del.invokeInstanceMethod(scope, "setValue", Arguments(this, ObjString(name), newValue))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (!f.isMutable && f.value !== ObjUnset) ObjIllegalAssignmentException(scope, "can't reassign val $name").raise()
|
|
||||||
if (f.value.assign(scope, newValue) == null)
|
|
||||||
f.value = newValue
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Try MI-mangled resolution along linearization (C3 MRO)
|
if (!rec.isMutable && rec.value !== ObjUnset) ObjIllegalAssignmentException(scope, "can't reassign val $name").raise()
|
||||||
val cls = objClass
|
if (rec.value.assign(scope, newValue) == null)
|
||||||
fun findMangled(): ObjRecord? {
|
rec.value = newValue
|
||||||
instanceScope.objects["${cls.className}::$name"]?.let { return it }
|
|
||||||
for (p in cls.mroParents) {
|
|
||||||
instanceScope.objects["${p.className}::$name"]?.let { return it }
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
val rec = findMangled()
|
|
||||||
if (rec != null) {
|
|
||||||
val declaring = when {
|
|
||||||
instanceScope.objects.containsKey("${cls.className}::$name") -> cls
|
|
||||||
else -> cls.mroParents.firstOrNull { instanceScope.objects.containsKey("${it.className}::$name") }
|
|
||||||
}
|
|
||||||
if (scope.thisObj !== this || scope.currentClassCtx == null) {
|
|
||||||
val caller = scope.currentClassCtx
|
|
||||||
if (!canAccessMember(rec.effectiveWriteVisibility, declaring, caller))
|
|
||||||
ObjIllegalAccessException(
|
|
||||||
scope,
|
|
||||||
"can't assign to field $name (declared in ${declaring?.className ?: "?"})"
|
|
||||||
).raise()
|
|
||||||
}
|
|
||||||
if (rec.type == ObjRecord.Type.Property) {
|
|
||||||
val prop = rec.value as ObjProperty
|
|
||||||
prop.callSetter(scope, this, newValue, declaring)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (rec.type == ObjRecord.Type.Delegated) {
|
|
||||||
val storageName = "${declaring?.className}::$name"
|
|
||||||
var del = instanceScope[storageName]?.delegate
|
|
||||||
if (del == null) {
|
|
||||||
for (c in objClass.mro) {
|
|
||||||
del = instanceScope["${c.className}::$name"]?.delegate
|
|
||||||
if (del != null) break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
del = del ?: rec.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate (tried $storageName)")
|
|
||||||
del.invokeInstanceMethod(scope, "setValue", Arguments(this, ObjString(name), newValue))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (!rec.isMutable && rec.value !== ObjUnset) ObjIllegalAssignmentException(scope, "can't reassign val $name").raise()
|
|
||||||
if (rec.value.assign(scope, newValue) == null)
|
|
||||||
rec.value = newValue
|
|
||||||
return
|
|
||||||
}
|
|
||||||
super.writeField(scope, name, newValue)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun invokeInstanceMethod(
|
override suspend fun invokeInstanceMethod(
|
||||||
scope: Scope, name: String, args: Arguments,
|
scope: Scope, name: String, args: Arguments,
|
||||||
onNotFoundResult: (suspend () -> Obj?)?
|
onNotFoundResult: (suspend () -> Obj?)?
|
||||||
): Obj {
|
): Obj {
|
||||||
|
val caller = scope.currentClassCtx
|
||||||
|
|
||||||
|
// Fast path for public members when outside any class context
|
||||||
|
if (caller == null) {
|
||||||
|
objClass.publicMemberResolution[name]?.let { key ->
|
||||||
|
instanceScope.objects[key]?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Public && !rec.isAbstract) {
|
||||||
|
val decl = rec.declaringClass
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (args.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, this, decl)
|
||||||
|
} else if (rec.type == ObjRecord.Type.Fun) {
|
||||||
|
return rec.value.invoke(instanceScope, this, args, decl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 0. Prefer private member of current class context
|
||||||
|
caller?.let { c ->
|
||||||
|
val mangled = c.mangledName(name)
|
||||||
|
instanceScope.objects[mangled]?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private && !rec.isAbstract) {
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (args.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, this, c)
|
||||||
|
} else if (rec.type == ObjRecord.Type.Fun) {
|
||||||
|
return rec.value.invoke(instanceScope, this, args, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
c.members[name]?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private && !rec.isAbstract) {
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (args.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, this, c)
|
||||||
|
} else if (rec.type == ObjRecord.Type.Fun) {
|
||||||
|
return rec.value.invoke(instanceScope, this, args, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 1. Walk MRO to find member, handling delegation
|
// 1. Walk MRO to find member, handling delegation
|
||||||
for (cls in objClass.mro) {
|
for (cls in objClass.mro) {
|
||||||
if (cls.className == "Obj") break
|
if (cls.className == "Obj") break
|
||||||
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
||||||
if (rec != null) {
|
if (rec != null && !rec.isAbstract) {
|
||||||
if (rec.type == ObjRecord.Type.Delegated) {
|
if (rec.type == ObjRecord.Type.Delegated) {
|
||||||
val storageName = "${cls.className}::$name"
|
val storageName = cls.mangledName(name)
|
||||||
val del = instanceScope[storageName]?.delegate ?: rec.delegate
|
val del = instanceScope[storageName]?.delegate ?: rec.delegate
|
||||||
?: scope.raiseError("Internal error: delegated member $name has no delegate (tried $storageName)")
|
?: scope.raiseError("Internal error: delegated member $name has no delegate (tried $storageName)")
|
||||||
|
|
||||||
|
// For delegated member, try 'invoke' first if it's a function-like call
|
||||||
val allArgs = (listOf(this, ObjString(name)) + args.list).toTypedArray()
|
val allArgs = (listOf(this, ObjString(name)) + args.list).toTypedArray()
|
||||||
return del.invokeInstanceMethod(scope, "invoke", Arguments(*allArgs), onNotFoundResult = {
|
return del.invokeInstanceMethod(scope, "invoke", Arguments(*allArgs), onNotFoundResult = {
|
||||||
// Fallback: property delegation
|
// Fallback: property delegation (getValue then call result)
|
||||||
val propVal = del.invokeInstanceMethod(scope, "getValue", Arguments(this, ObjString(name)))
|
val propVal = del.invokeInstanceMethod(scope, "getValue", Arguments(this, ObjString(name)))
|
||||||
propVal.invoke(scope, this, args, rec.declaringClass ?: cls)
|
propVal.invoke(scope, this, args, rec.declaringClass ?: cls)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if (rec.type == ObjRecord.Type.Fun && !rec.isAbstract) {
|
val decl = rec.declaringClass ?: cls
|
||||||
val decl = rec.declaringClass ?: cls
|
val effectiveCaller = caller ?: if (scope.thisObj === this) objClass else null
|
||||||
val caller = scope.currentClassCtx ?: if (scope.thisObj === this) objClass else null
|
if (!canAccessMember(rec.visibility, decl, effectiveCaller))
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
scope.raiseError(
|
||||||
scope.raiseError(
|
ObjIllegalAccessException(
|
||||||
ObjIllegalAccessException(
|
scope,
|
||||||
scope,
|
"can't invoke method $name (declared in ${decl.className})"
|
||||||
"can't invoke method $name (declared in ${decl.className})"
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (args.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, this, decl)
|
||||||
|
} else if (rec.type == ObjRecord.Type.Fun) {
|
||||||
return rec.value.invoke(
|
return rec.value.invoke(
|
||||||
instanceScope,
|
instanceScope,
|
||||||
this,
|
this,
|
||||||
args,
|
args,
|
||||||
decl
|
decl
|
||||||
)
|
)
|
||||||
} else if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.Property) && !rec.isAbstract) {
|
} else if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField || rec.type == ObjRecord.Type.Argument) {
|
||||||
val resolved = readField(scope, name)
|
val resolved = readField(scope, name)
|
||||||
return resolved.value.invoke(scope, this, args, resolved.declaringClass)
|
return resolved.value.invoke(scope, this, args, resolved.declaringClass)
|
||||||
}
|
}
|
||||||
@@ -294,10 +373,12 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
val serializingVars: Map<String, ObjRecord> by lazy {
|
val serializingVars: Map<String, ObjRecord> by lazy {
|
||||||
|
val metaParams = objClass.constructorMeta?.params?.map { it.name }?.toSet() ?: emptySet()
|
||||||
instanceScope.objects.filter {
|
instanceScope.objects.filter {
|
||||||
it.value.type.serializable &&
|
it.value.type.serializable &&
|
||||||
it.value.type == ObjRecord.Type.Field &&
|
it.value.type == ObjRecord.Type.Field &&
|
||||||
it.value.isMutable
|
it.value.isMutable &&
|
||||||
|
!metaParams.contains(it.key)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -306,7 +387,10 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
if (localVars.isNotEmpty()) {
|
if (localVars.isNotEmpty()) {
|
||||||
val vars = decoder.decodeAnyList(scope)
|
val vars = decoder.decodeAnyList(scope)
|
||||||
if (vars.size > serializingVars.size)
|
if (vars.size > serializingVars.size)
|
||||||
scope.raiseIllegalArgument("serialized vars has bigger size than instance vars")
|
scope.raiseIllegalArgument(
|
||||||
|
"serialized vars has bigger size ${vars.size} than instance vars (${serializingVars.size}): "+
|
||||||
|
vars.joinToString(",")
|
||||||
|
)
|
||||||
for ((i, v) in vars.withIndex()) {
|
for ((i, v) in vars.withIndex()) {
|
||||||
localVars[i].value = v
|
localVars[i].value = v
|
||||||
}
|
}
|
||||||
@@ -324,7 +408,7 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
if (other.objClass != objClass) return -1
|
if (other.objClass != objClass) return -1
|
||||||
for (f in comparableVars) {
|
for (f in comparableVars) {
|
||||||
val a = f.value.value
|
val a = f.value.value
|
||||||
val b = other.instanceScope[f.key]!!.value
|
val b = other.instanceScope.objects[f.key]?.value ?: scope.raiseError("Internal error: field ${f.key} not found in other instance")
|
||||||
val d = a.compareTo(scope, b)
|
val d = a.compareTo(scope, b)
|
||||||
if (d != 0) return d
|
if (d != 0) return d
|
||||||
}
|
}
|
||||||
@@ -351,7 +435,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't access field $name (declared in ${decl.className})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't access field $name (declared in ${decl.className})"))
|
||||||
return resolveRecord(scope, rec, name, decl)
|
return instance.resolveRecord(scope, rec, name, decl)
|
||||||
}
|
}
|
||||||
// Then try instance locals (unmangled) only if startClass is the dynamic class itself
|
// Then try instance locals (unmangled) only if startClass is the dynamic class itself
|
||||||
if (startClass === instance.objClass) {
|
if (startClass === instance.objClass) {
|
||||||
@@ -365,7 +449,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
"can't access field $name (declared in ${decl?.className ?: "?"})"
|
"can't access field $name (declared in ${decl?.className ?: "?"})"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
return resolveRecord(scope, rec, name, decl)
|
return instance.resolveRecord(scope, rec, name, decl)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Finally try methods/properties starting from ancestor
|
// Finally try methods/properties starting from ancestor
|
||||||
@@ -375,7 +459,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
if (!canAccessMember(r.visibility, decl, caller))
|
if (!canAccessMember(r.visibility, decl, caller))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't access field $name (declared in ${decl.className})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't access field $name (declared in ${decl.className})"))
|
||||||
|
|
||||||
return resolveRecord(scope, r, name, decl)
|
return instance.resolveRecord(scope, r, name, decl)
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun writeField(scope: Scope, name: String, newValue: Obj) {
|
override suspend fun writeField(scope: Scope, name: String, newValue: Obj) {
|
||||||
|
|||||||
@@ -42,9 +42,6 @@ class ObjInstanceClass(val name: String, vararg parents: ObjClass) : ObjClass(na
|
|||||||
}
|
}
|
||||||
|
|
||||||
init {
|
init {
|
||||||
addFn("toString", true) {
|
|
||||||
thisObj.toString(this, true)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -20,6 +20,9 @@ package net.sergeych.lyng.obj
|
|||||||
import kotlinx.serialization.json.JsonElement
|
import kotlinx.serialization.json.JsonElement
|
||||||
import kotlinx.serialization.json.JsonPrimitive
|
import kotlinx.serialization.json.JsonPrimitive
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.miniast.addFnDoc
|
||||||
|
import net.sergeych.lyng.miniast.addPropertyDoc
|
||||||
|
import net.sergeych.lyng.miniast.type
|
||||||
import net.sergeych.lynon.LynonDecoder
|
import net.sergeych.lynon.LynonDecoder
|
||||||
import net.sergeych.lynon.LynonEncoder
|
import net.sergeych.lynon.LynonEncoder
|
||||||
import net.sergeych.lynon.LynonSettings
|
import net.sergeych.lynon.LynonSettings
|
||||||
@@ -148,34 +151,71 @@ class ObjInstant(val instant: Instant,val truncateMode: LynonSettings.InstantTru
|
|||||||
}
|
}
|
||||||
|
|
||||||
}.apply {
|
}.apply {
|
||||||
addFn("epochSeconds") {
|
addPropertyDoc(
|
||||||
val instant = thisAs<ObjInstant>().instant
|
name = "epochSeconds",
|
||||||
ObjReal(instant.epochSeconds + instant.nanosecondsOfSecond * 1e-9)
|
doc = "Return the number of seconds since the Unix epoch as a real number (including fractions).",
|
||||||
}
|
type = type("lyng.Real"),
|
||||||
addFn("isDistantFuture") {
|
moduleName = "lyng.time",
|
||||||
thisAs<ObjInstant>().instant.isDistantFuture.toObj()
|
getter = {
|
||||||
}
|
val instant = thisAs<ObjInstant>().instant
|
||||||
addFn("isDistantPast") {
|
ObjReal(instant.epochSeconds + instant.nanosecondsOfSecond * 1e-9)
|
||||||
thisAs<ObjInstant>().instant.isDistantPast.toObj()
|
}
|
||||||
}
|
)
|
||||||
addFn("epochWholeSeconds") {
|
addPropertyDoc(
|
||||||
ObjInt(thisAs<ObjInstant>().instant.epochSeconds)
|
name = "isDistantFuture",
|
||||||
}
|
doc = "Whether this instant represents the distant future.",
|
||||||
addFn("nanosecondsOfSecond") {
|
type = type("lyng.Bool"),
|
||||||
ObjInt(thisAs<ObjInstant>().instant.nanosecondsOfSecond.toLong())
|
moduleName = "lyng.time",
|
||||||
}
|
getter = { thisAs<ObjInstant>().instant.isDistantFuture.toObj() }
|
||||||
addFn("truncateToSecond") {
|
)
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "isDistantPast",
|
||||||
|
doc = "Whether this instant represents the distant past.",
|
||||||
|
type = type("lyng.Bool"),
|
||||||
|
moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjInstant>().instant.isDistantPast.toObj() }
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "epochWholeSeconds",
|
||||||
|
doc = "Return the number of full seconds since the Unix epoch.",
|
||||||
|
type = type("lyng.Int"),
|
||||||
|
moduleName = "lyng.time",
|
||||||
|
getter = { ObjInt(thisAs<ObjInstant>().instant.epochSeconds) }
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "nanosecondsOfSecond",
|
||||||
|
doc = "The number of nanoseconds within the current second.",
|
||||||
|
type = type("lyng.Int"),
|
||||||
|
moduleName = "lyng.time",
|
||||||
|
getter = { ObjInt(thisAs<ObjInstant>().instant.nanosecondsOfSecond.toLong()) }
|
||||||
|
)
|
||||||
|
addFnDoc(
|
||||||
|
name = "truncateToSecond",
|
||||||
|
doc = "Truncate this instant to the nearest second.",
|
||||||
|
returns = type("lyng.Instant"),
|
||||||
|
moduleName = "lyng.time"
|
||||||
|
) {
|
||||||
val t = thisAs<ObjInstant>().instant
|
val t = thisAs<ObjInstant>().instant
|
||||||
ObjInstant(Instant.fromEpochSeconds(t.epochSeconds), LynonSettings.InstantTruncateMode.Second)
|
ObjInstant(Instant.fromEpochSeconds(t.epochSeconds), LynonSettings.InstantTruncateMode.Second)
|
||||||
}
|
}
|
||||||
addFn("truncateToMillisecond") {
|
addFnDoc(
|
||||||
|
name = "truncateToMillisecond",
|
||||||
|
doc = "Truncate this instant to the nearest millisecond.",
|
||||||
|
returns = type("lyng.Instant"),
|
||||||
|
moduleName = "lyng.time"
|
||||||
|
) {
|
||||||
val t = thisAs<ObjInstant>().instant
|
val t = thisAs<ObjInstant>().instant
|
||||||
ObjInstant(
|
ObjInstant(
|
||||||
Instant.fromEpochSeconds(t.epochSeconds, t.nanosecondsOfSecond / 1_000_000 * 1_000_000),
|
Instant.fromEpochSeconds(t.epochSeconds, t.nanosecondsOfSecond / 1_000_000 * 1_000_000),
|
||||||
LynonSettings.InstantTruncateMode.Millisecond
|
LynonSettings.InstantTruncateMode.Millisecond
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
addFn("truncateToMicrosecond") {
|
addFnDoc(
|
||||||
|
name = "truncateToMicrosecond",
|
||||||
|
doc = "Truncate this instant to the nearest microsecond.",
|
||||||
|
returns = type("lyng.Instant"),
|
||||||
|
moduleName = "lyng.time"
|
||||||
|
) {
|
||||||
val t = thisAs<ObjInstant>().instant
|
val t = thisAs<ObjInstant>().instant
|
||||||
ObjInstant(
|
ObjInstant(
|
||||||
Instant.fromEpochSeconds(t.epochSeconds, t.nanosecondsOfSecond / 1_000 * 1_000),
|
Instant.fromEpochSeconds(t.epochSeconds, t.nanosecondsOfSecond / 1_000 * 1_000),
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ package net.sergeych.lyng.obj
|
|||||||
import kotlinx.serialization.json.JsonElement
|
import kotlinx.serialization.json.JsonElement
|
||||||
import kotlinx.serialization.json.JsonPrimitive
|
import kotlinx.serialization.json.JsonPrimitive
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.miniast.addFnDoc
|
||||||
import net.sergeych.lynon.LynonDecoder
|
import net.sergeych.lynon.LynonDecoder
|
||||||
import net.sergeych.lynon.LynonEncoder
|
import net.sergeych.lynon.LynonEncoder
|
||||||
import net.sergeych.lynon.LynonType
|
import net.sergeych.lynon.LynonType
|
||||||
@@ -178,7 +179,12 @@ class ObjInt(val value: Long, override val isConst: Boolean = false) : Obj(), Nu
|
|||||||
else -> scope.raiseIllegalState("illegal type code for Int: $lynonType")
|
else -> scope.raiseIllegalState("illegal type code for Int: $lynonType")
|
||||||
}
|
}
|
||||||
}.apply {
|
}.apply {
|
||||||
addFn("toInt") {
|
addFnDoc(
|
||||||
|
name = "toInt",
|
||||||
|
doc = "Returns this integer (identity operation).",
|
||||||
|
returns = net.sergeych.lyng.miniast.type("lyng.Int"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
thisObj
|
thisObj
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -21,6 +21,7 @@ import net.sergeych.lyng.Arguments
|
|||||||
import net.sergeych.lyng.Statement
|
import net.sergeych.lyng.Statement
|
||||||
import net.sergeych.lyng.miniast.ParamDoc
|
import net.sergeych.lyng.miniast.ParamDoc
|
||||||
import net.sergeych.lyng.miniast.addFnDoc
|
import net.sergeych.lyng.miniast.addFnDoc
|
||||||
|
import net.sergeych.lyng.miniast.addPropertyDoc
|
||||||
import net.sergeych.lyng.miniast.type
|
import net.sergeych.lyng.miniast.type
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -29,19 +30,20 @@ import net.sergeych.lyng.miniast.type
|
|||||||
val ObjIterable by lazy {
|
val ObjIterable by lazy {
|
||||||
ObjClass("Iterable").apply {
|
ObjClass("Iterable").apply {
|
||||||
|
|
||||||
addFnDoc(
|
addPropertyDoc(
|
||||||
name = "toList",
|
name = "toList",
|
||||||
doc = "Collect elements of this iterable into a new list.",
|
doc = "Collect elements of this iterable into a new list.",
|
||||||
returns = type("lyng.List"),
|
type = type("lyng.List"),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib",
|
||||||
) {
|
getter = {
|
||||||
val result = mutableListOf<Obj>()
|
val result = mutableListOf<Obj>()
|
||||||
val iterator = thisObj.invokeInstanceMethod(this, "iterator")
|
val it = this.thisObj.invokeInstanceMethod(this, "iterator")
|
||||||
|
while (it.invokeInstanceMethod(this, "hasNext").toBool()) {
|
||||||
while (iterator.invokeInstanceMethod(this, "hasNext").toBool())
|
result.add(it.invokeInstanceMethod(this, "next"))
|
||||||
result += iterator.invokeInstanceMethod(this, "next")
|
}
|
||||||
ObjList(result)
|
ObjList(result)
|
||||||
}
|
}
|
||||||
|
)
|
||||||
|
|
||||||
// it is not effective, but it is open:
|
// it is not effective, but it is open:
|
||||||
addFnDoc(
|
addFnDoc(
|
||||||
@@ -55,7 +57,7 @@ val ObjIterable by lazy {
|
|||||||
val obj = args.firstAndOnly()
|
val obj = args.firstAndOnly()
|
||||||
val it = thisObj.invokeInstanceMethod(this, "iterator")
|
val it = thisObj.invokeInstanceMethod(this, "iterator")
|
||||||
while (it.invokeInstanceMethod(this, "hasNext").toBool()) {
|
while (it.invokeInstanceMethod(this, "hasNext").toBool()) {
|
||||||
if (obj.compareTo(this, it.invokeInstanceMethod(this, "next")) == 0)
|
if (obj.equals(this, it.invokeInstanceMethod(this, "next")))
|
||||||
return@addFnDoc ObjTrue
|
return@addFnDoc ObjTrue
|
||||||
}
|
}
|
||||||
ObjFalse
|
ObjFalse
|
||||||
@@ -73,46 +75,49 @@ val ObjIterable by lazy {
|
|||||||
var index = 0
|
var index = 0
|
||||||
val it = thisObj.invokeInstanceMethod(this, "iterator")
|
val it = thisObj.invokeInstanceMethod(this, "iterator")
|
||||||
while (it.invokeInstanceMethod(this, "hasNext").toBool()) {
|
while (it.invokeInstanceMethod(this, "hasNext").toBool()) {
|
||||||
if (obj.compareTo(this, it.invokeInstanceMethod(this, "next")) == 0)
|
if (obj.equals(this, it.invokeInstanceMethod(this, "next")))
|
||||||
return@addFnDoc ObjInt(index.toLong())
|
return@addFnDoc ObjInt(index.toLong())
|
||||||
index++
|
index++
|
||||||
}
|
}
|
||||||
ObjInt(-1L)
|
ObjInt(-1L)
|
||||||
}
|
}
|
||||||
|
|
||||||
addFnDoc(
|
addPropertyDoc(
|
||||||
name = "toSet",
|
name = "toSet",
|
||||||
doc = "Collect elements of this iterable into a new set.",
|
doc = "Collect elements of this iterable into a new set.",
|
||||||
returns = type("lyng.Set"),
|
type = type("lyng.Set"),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib",
|
||||||
) {
|
getter = {
|
||||||
if( thisObj.isInstanceOf(ObjSet.type) )
|
if( this.thisObj.isInstanceOf(ObjSet.type) )
|
||||||
thisObj
|
this.thisObj
|
||||||
else {
|
else {
|
||||||
val result = mutableSetOf<Obj>()
|
val result = mutableSetOf<Obj>()
|
||||||
val it = thisObj.invokeInstanceMethod(this, "iterator")
|
val it = this.thisObj.invokeInstanceMethod(this, "iterator")
|
||||||
while (it.invokeInstanceMethod(this, "hasNext").toBool()) {
|
while (it.invokeInstanceMethod(this, "hasNext").toBool()) {
|
||||||
result += it.invokeInstanceMethod(this, "next")
|
result.add(it.invokeInstanceMethod(this, "next"))
|
||||||
|
}
|
||||||
|
ObjSet(result)
|
||||||
}
|
}
|
||||||
ObjSet(result)
|
|
||||||
}
|
}
|
||||||
}
|
)
|
||||||
|
|
||||||
addFnDoc(
|
addPropertyDoc(
|
||||||
name = "toMap",
|
name = "toMap",
|
||||||
doc = "Collect pairs into a map using [0] as key and [1] as value for each element.",
|
doc = "Collect pairs into a map using [0] as key and [1] as value for each element.",
|
||||||
returns = type("lyng.Map"),
|
type = type("lyng.Map"),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib",
|
||||||
) {
|
getter = {
|
||||||
val result = mutableMapOf<Obj, Obj>()
|
val result = mutableMapOf<Obj, Obj>()
|
||||||
thisObj.toFlow(this).collect { pair ->
|
this.thisObj.enumerate(this) { pair ->
|
||||||
when (pair) {
|
when (pair) {
|
||||||
is ObjMapEntry -> result[pair.key] = pair.value
|
is ObjMapEntry -> result[pair.key] = pair.value
|
||||||
else -> result[pair.getAt(this, 0)] = pair.getAt(this, 1)
|
else -> result[pair.getAt(this, 0)] = pair.getAt(this, 1)
|
||||||
|
}
|
||||||
|
true
|
||||||
}
|
}
|
||||||
|
ObjMap(result)
|
||||||
}
|
}
|
||||||
ObjMap(result)
|
)
|
||||||
}
|
|
||||||
|
|
||||||
addFnDoc(
|
addFnDoc(
|
||||||
name = "associateBy",
|
name = "associateBy",
|
||||||
@@ -156,7 +161,7 @@ val ObjIterable by lazy {
|
|||||||
val fn = requiredArg<Statement>(0)
|
val fn = requiredArg<Statement>(0)
|
||||||
val result = mutableListOf<Obj>()
|
val result = mutableListOf<Obj>()
|
||||||
thisObj.toFlow(this).collect {
|
thisObj.toFlow(this).collect {
|
||||||
result += fn.call(this, it)
|
result.add(fn.call(this, it))
|
||||||
}
|
}
|
||||||
ObjList(result)
|
ObjList(result)
|
||||||
}
|
}
|
||||||
@@ -173,7 +178,7 @@ val ObjIterable by lazy {
|
|||||||
val result = mutableListOf<Obj>()
|
val result = mutableListOf<Obj>()
|
||||||
thisObj.toFlow(this).collect {
|
thisObj.toFlow(this).collect {
|
||||||
val transformed = fn.call(this, it)
|
val transformed = fn.call(this, it)
|
||||||
if( transformed != ObjNull) result += transformed
|
if( transformed != ObjNull) result.add(transformed)
|
||||||
}
|
}
|
||||||
ObjList(result)
|
ObjList(result)
|
||||||
}
|
}
|
||||||
@@ -189,25 +194,26 @@ val ObjIterable by lazy {
|
|||||||
val result = mutableListOf<Obj>()
|
val result = mutableListOf<Obj>()
|
||||||
if (n > 0) {
|
if (n > 0) {
|
||||||
thisObj.enumerate(this) {
|
thisObj.enumerate(this) {
|
||||||
result += it
|
result.add(it)
|
||||||
--n > 0
|
--n > 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ObjList(result)
|
ObjList(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
addFnDoc(
|
addPropertyDoc(
|
||||||
name = "isEmpty",
|
name = "isEmpty",
|
||||||
doc = "Whether the iterable has no elements.",
|
doc = "Whether the iterable has no elements.",
|
||||||
returns = type("lyng.Bool"),
|
type = type("lyng.Bool"),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib",
|
||||||
) {
|
getter = {
|
||||||
ObjBool(
|
ObjBool(
|
||||||
thisObj.invokeInstanceMethod(this, "iterator")
|
this.thisObj.invokeInstanceMethod(this, "iterator")
|
||||||
.invokeInstanceMethod(this, "hasNext").toBool()
|
.invokeInstanceMethod(this, "hasNext").toBool()
|
||||||
.not()
|
.not()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
)
|
||||||
|
|
||||||
addFnDoc(
|
addFnDoc(
|
||||||
name = "sortedWith",
|
name = "sortedWith",
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import net.sergeych.lyng.Scope
|
|||||||
*/
|
*/
|
||||||
class ObjKotlinIterator(val iterator: Iterator<Any?>) : Obj() {
|
class ObjKotlinIterator(val iterator: Iterator<Any?>) : Obj() {
|
||||||
|
|
||||||
override val objClass = type
|
override val objClass get() = type
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
val type = ObjClass("KotlinIterator", ObjIterator).apply {
|
val type = ObjClass("KotlinIterator", ObjIterator).apply {
|
||||||
@@ -46,7 +46,7 @@ class ObjKotlinIterator(val iterator: Iterator<Any?>) : Obj() {
|
|||||||
*/
|
*/
|
||||||
class ObjKotlinObjIterator(val iterator: Iterator<Obj>) : Obj() {
|
class ObjKotlinObjIterator(val iterator: Iterator<Obj>) : Obj() {
|
||||||
|
|
||||||
override val objClass = type
|
override val objClass get() = type
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
val type = ObjClass("KotlinIterator", ObjIterator).apply {
|
val type = ObjClass("KotlinIterator", ObjIterator).apply {
|
||||||
|
|||||||
Loaded 100 of 138 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user