wasm generation bug workaround, docs and debugging tips

.gitignore

@@ -21,9 +21,3 @@ xcuserdata
 debug.log
 /build.log
 /test.md
-/build_output.txt
-/build_output_full.txt
-/check_output.txt
-/compile_jvm_output.txt
-/compile_metadata_output.txt
-test_output*.txt

.junie/guidelines.md

@@ -1,11 +0,0 @@
-# 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.

AGENTS.md

@@ -1,8 +0,0 @@
-# AI Agent Notes
-
-## Kotlin/Wasm generation guardrails
-- Avoid creating suspend lambdas for compiler runtime statements. Prefer explicit `object : Statement()` with `override suspend fun execute(...)`.
-- Do not use `statement { ... }` or other inline suspend lambdas in compiler hot paths (e.g., parsing/var declarations, initializer thunks).
-- If you need a wrapper for delegated properties, check for `getValue` explicitly and return a concrete `Statement` object when missing; avoid `onNotFoundResult` lambdas.
-- If wasmJs browser tests hang, first run `:lynglib:wasmJsNodeTest` and look for wasm compilation errors; hangs usually mean module instantiation failed.
-- Do not increase test timeouts to mask wasm generation errors; fix the invalid IR instead.

CHANGELOG.md

@@ -2,22 +2,6 @@
 
 ### Unreleased
 
-- Language: Refined `protected` visibility rules
-  - Ancestor classes can now access `protected` members of their descendants, provided the ancestor also defines or inherits a member with the same name (indicating an override of a member known to the ancestor).
-  - This allows patterns where a base class calls a `protected` method that is implemented in a subclass.
-  - Fixed a regression where self-calls to unmangled members sometimes bypassed visibility checks incorrectly; these are now handled by the refined logic.
-
-- Language: Added `return` statement
-  - `return [expression]` exits the innermost enclosing callable (function or lambda).
-  - Supports non-local returns using `@label` syntax (e.g., `return@outer 42`).
-  - Named functions automatically provide their name as a label for non-local returns.
-  - Labeled lambdas: lambdas can be explicitly labeled using `@label { ... }`.
-  - Restriction: `return` is forbidden in shorthand function definitions (e.g., `fun f(x) = return x` is a syntax error).
-  - Control Flow: `return` and `break` are now protected from being caught by user-defined `try-catch` blocks in Lyng.
-  - Documentation: New `docs/return_statement.md` and updated `tutorial.md`.
-
-- Language: stdlib improvements
-  - Added `with(self, block)` function to `root.lyng` which executes a block with `this` set to the provided object.
 - Language: Abstract Classes and Interfaces
   - Support for `abstract` modifier on classes, methods, and variables.
   - Introduced `interface` as a synonym for `abstract class`, supporting full state (constructors, fields, `init` blocks) and implementation by parts via MI.
@@ -26,12 +10,6 @@
   - 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.
   - 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
   - Support for `val` (read-only) and `var` (read-write) properties in classes.
@@ -101,7 +79,7 @@
     - Header-specified constructor arguments are passed to direct bases.
   - Visibility enforcement under MI:
     - `private` visible only inside the declaring class body.
-    - `protected` visible inside the declaring class and its transitive subclasses. Additionally, ancestor classes can access protected members of their descendants if it's an override of a member known to the ancestor. Unrelated contexts cannot access it (qualification/casts do not bypass).
+    - `protected` visible inside the declaring class and any of its transitive subclasses; unrelated contexts cannot access it (qualification/casts do not bypass).
   - Diagnostics improvements:
     - Missing member/field messages include receiver class and linearization order; hints for `this@Type` or casts when helpful.
     - Invalid `this@Type` reports that the qualifier is not an ancestor and shows the receiver lineage.

LYNG_AI_SPEC.md

@@ -1,106 +0,0 @@
-# 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).
-- **Serialization**: Use `@Transient` attribute before `val`/`var` or constructor parameters to exclude them from Lynon/JSON serialization. Transient fields are also ignored during `==` structural equality checks.
-- **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 and ancestors for overrides), `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.

README.md

@@ -1,14 +1,6 @@
-# Lyng: ideal scripting for kotlin multiplatform
-
-__Please visit the project homepage: [https://lynglang.com](https://lynglang.com) and a [telegram channel](https://t.me/lynglang).__
-
-__Main development site:__ [https://gitea.sergeych.net/SergeychWorks/lyng](https://gitea.sergeych.net/SergeychWorks/lyng)
-__github mirror__: [https://github.com/sergeych/lyng](https://github.com/sergeych/lyng)
-
-We keep github as a mirror and backup for the project, while the main development site is hosted on gitea.sergeych.net. We use gitea for issues and pull requests, and as a main point of trust, as github access now is a thing that can momentarily be revoked for no apparent reason.
-
-We encourage using the github if the main site is not accessible from your country and vice versa. We recommend to `publishToMavenLocal` and not depend on politics.
+# Lyng: modern scripting for kotlin multiplatform
 
+Please visit the project homepage: [https://lynglang.com](https://lynglang.com) and a [telegram channel](https://t.me/lynglang) for updates.
 
 - simple, compact, intuitive and elegant modern code:
 
@@ -29,9 +21,22 @@ fun swapEnds(first, args..., last, f) {
 
 - extremely simple Kotlin integration on any platform (JVM, JS, WasmJS, Lunux, MacOS, iOS, Windows)
 - 100% secure: no access to any API you didn't explicitly provide
-- 100% coroutines! Every function/script is a coroutine, it does not block the thread, no async/await/suspend keyword garbage, see [parallelism]. it is multithreaded on platforms supporting it (automatically, no code changes required, just `launch` more coroutines and they will be executed concurrently if possible). See [parallelism]
-- functional style and OOP together: multiple inheritance (so you got it all - mixins, interfaces, etc.), delegation, sigletons, anonymous classes,extensions.
-- nice literals for maps and arrays, destructuring assignment, ranges.
+- 100% coroutines! Every function/script is a coroutine, it does not block the thread, no async/await/suspend keyword garbage, see [parallelism]
+
+```
+  val deferred = launch {
+    delay(1.5) // coroutine is delayed for 1.5s, thread is not blocked!
+    "done"
+  }
+  // ...
+  // suspend current coroutine, no thread is blocked again,
+  // and wait for deferred to return something:
+  assertEquals("donw", deferred.await())
+```
+and it is multithreaded on platforms supporting it (automatically, no code changes required, just
+`launch` more coroutines and they will be executed concurrently if possible). See [parallelism]
+
+- functional style and OOP together, multiple inheritance, implementing interfaces for existing classes, writing extensions.
 - Any Unicode letters can be used as identifiers: `assert( sin(π/2) == 1 )`.
 
  ## Resources: 
@@ -39,13 +44,10 @@ fun swapEnds(first, args..., last, f) {
 - [Language home](https://lynglang.com)
 - [introduction and tutorial](docs/tutorial.md) - start here please
 - [Testing and Assertions](docs/Testing.md)
-- [Filesystem and Processes (lyngio)](docs/lyngio.md)
-- [Return Statement](docs/return_statement.md)
 - [Efficient Iterables in Kotlin Interop](docs/EfficientIterables.md)
 - [Samples directory](docs/samples)
 - [Formatter (core + CLI + IDE)](docs/formatter.md)
 - [Books directory](docs)
-- [AI agent guidance](AGENTS.md)
 
 ## Integration in Kotlin multiplatform
 
@@ -77,7 +79,7 @@ Now you can import lyng and use it:
 ### Execute script:
 
 ```kotlin
-import net.sergeych.lyng.*
+import net.sergeyh.lyng.*
 
 // we need a coroutine to start, as Lyng
 // is a coroutine based language, async topdown
@@ -93,7 +95,9 @@ Script is executed over some `Scope`. Create instance,
 add your specific vars and functions to it, and call:
 
 ```kotlin
-import net.sergeych.lyng.*
+
+import com.sun.source.tree.Scope
+import new.sergeych.lyng.*
 
 // simple function
 val scope = Script.newScope().apply {
@@ -141,12 +145,6 @@ Tips:
 - 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).
 
-## 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? 
 
 Designed to add scripting to kotlin multiplatform application in easy and efficient way. This is attempt to achieve what Lua is for C/++.
@@ -178,7 +176,6 @@ Ready features:
 - [x] ranges, lists, strings, interfaces: Iterable, Iterator, Collection, Array
 - [x] when(value), if-then-else
 - [x] exception handling: throw, try-catch-finally, exception classes.
-- [x] user-defined exception classes
 - [x] multiplatform maven publication
 - [x] documentation for the current state
 - [x] maps, sets and sequences (flows?)
@@ -194,17 +191,6 @@ Ready features:
 - [x] regular exceptions + extended `when`
 - [x] multiple inheritance for user classes
 - [x] class properties (accessors)
-- [x] `return` statement for local and non-local exit
-- [x] Unified Delegation model: val, var and fun
-- [x] `lazy val` using delegation
-- [x] singletons `object TheOnly { ... }`
-- [x] object expressions `object: List { ... }`
-- [x] late-init vals in classes
-- [x] properties with getters and setters
-- [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.  
 
 ## plan: towards v1.5 Enhancing
 

archived/README.md

@@ -1,4 +0,0 @@
-# Obsolete files
-
-
-__Do not rely on contents of the files in this directory. They are kept for historical reference only and may not be up-to-date or relevant.__

archived/proposals/delegates.lyng

@@ -1,117 +0,0 @@
-/*
-    This is a tech proposal under construction, please do not use it yet
-    for any purpose
-*/
-
-/*
-    Abstract delegate can be used to proxy read/wrtie field access
-    or method call. Default implementation reports error.
-*/
-interface Delegate {
-    fun getValue() = Unset
-    fun setValue(newValue) { throw NotImplementedException("delegate setter is not implemented") }
-    fun invoke(args...) { throw NotImplementedException("delegate setter is not implemented") }
-}
-
-/*
-    Delegate cam be used to implement a val, var or fun, so there are
-    access type enum to distinguish:
-*/
-enum DelegateAccess {
-    Val,
-    Var,
-    Callable
-}
-
-// Delegate can be associated by a val/var/fun in a declaraion site using `by` keyword
-
-val proxiedVal by proxy(1)
-var proxiedVar by proxy(2, 3)
-fun proxiedFun by proxy()
-
-// each proxy is a Lyng expression returning instance of the Proxy interface:
-
-/*
-    Proxy interface is connecting some named property of a given kind with the `Delegate`.
-    It removes the burden of dealing with property name and this ref on each get/set value
-    or invoke allowing having one delegate per instance, execution buff.
-*/
-interface Proxy {
-    fun getDelegate(propertyName: String,access: DelegateAccess,thisRef: Obj?): Delegate
-}
-
-// val, var and fun can be delegated, local or class instance:
-class TestProxy: Proxy {
-    override getDelegate(name,access,thisRef) {
-        Delegate()
-    }
-}
-
-val proxy = TestProxy()
-
-class Allowed {
-    val v1 by proxy
-    var v2 by proxy
-    fun f1 by proxy
-}
-val v3 by proxy
-var v4 by proxy
-fun f2 by proxy
-
-/*
-    It means that for example
-    Allowed().f1("foo")
-    would call a delegate.invoke("foo") on the `Delegate` instance supplied by `proxy`, etc.
-*/
-
-// The practic sample: lazy value
-
-/*
-    The delegate that caches single time evaluated value
-*/
-class LazyDelegate(creator): Delegate {
-    private var currentValue=Unset
-
-    override fun getValue() {
-        if( currentValue == Unset )
-            currentValue = creator()
-        currentValue
-    }
-}
-
-/*
-    The proxy to assign it
-*/
-class LazyProxy(creator) {
-    fun getDelegate(name,access,thisRef) {
-        if( access != DelegateAccess.Val )
-            throw IllegalArgumentException("only lazy val are allowed")
-        LazyDelegate(creator)
-    }
-}
-
-
-/*
-    A helper function to simplify creation:
-*/
-fun lazy(creator) {
-    LazyProxy(creator)
-}
-
-// Usage sample and the test:
-var callCounter = 0
-assertEquals(0, clallCounter)
-
-val lazyText by lazy { "evaluated text" }
-
-// the lazy property is not yet evaluated:
-assertEquals(0, clallCounter)
-// now evaluate it by using it:
-assertEquals("evaluated text", lazyText)
-assertEquals(1, callCounter)
-
-// lazy delegate should fail on vars or funs:
-assertThrows { var bad by lazy { "should not happen" } }
-assertThrows { fun bad by lazy { 42 } }
-
-

bin/deploy_all

@@ -1,40 +0,0 @@
-#!/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

bin/deploy_plugin

@@ -1,26 +0,0 @@
-#!/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

bin/deploy_site

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+# 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.
@@ -17,14 +17,6 @@
 #
 #
 
-upload_only=false
-for arg in "$@"; do
-  if [[ "$arg" == "-u" || "$arg" == "--upload-only" ]]; then
-    upload_only=true
-    break
-  fi
-done
-
 function checkState() {
   if [[ $? != 0 ]]; then
     echo
@@ -32,10 +24,9 @@ function checkState() {
     echo
     exit 100
   fi
+
 }
 
-
-
 # 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
 # the original file is restored right after the build.
@@ -116,8 +107,6 @@ function refreshTextmateZip() {
   (cd editors && zip -rq ../distributables/lyng-textmate.zip .)
 }
 
-
-if [[ "$upload_only" == false ]]; then
 # 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"
@@ -136,7 +125,9 @@ if [[ "$upload_only" == false ]]; then
   echo
   exit 100
 fi
-fi
+
+
+#exit 0
 
 # Prepare working dir
 ssh -p ${SSH_PORT} ${SSH_HOST} "
@@ -152,15 +143,12 @@ ssh -p ${SSH_PORT} ${SSH_HOST} "
   fi
 ";
 
-if [[ "$upload_only" == false ]]; then
 # sync files
 SRC=./site/build/dist/js/productionExecutable
 rsync -e "ssh -p ${SSH_PORT}" -avz -r -d --delete ${SRC}/* ${SSH_HOST}:${ROOT}/build/dist
 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
 checkState
 

docs/Buffer.md

@@ -23,11 +23,11 @@ There are a lo of ways to construct a buffer:
     assertEquals( 5, Buffer("hello").size )
 
     // 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.
     // integers in 0..255 range:
-    assertEquals( 129, Buffer([1,2,129]).last )
+    assertEquals( 129, Buffer([1,2,129]).last() )
 
     // Empty buffer of fixed size:
     assertEquals(100, Buffer(100).size)

docs/OOP.md

@@ -71,57 +71,14 @@ object DefaultLogger : Logger("Default") {
 }
 ```
 
-## Object Expressions
-
-Object expressions allow you to create an instance of an anonymous class. This is useful when you need to provide a one-off implementation of an interface or inherit from a class without declaring a new named subclass.
-
-```lyng
-val worker = object : Runnable {
-    override fun run() {
-        println("Working...")
-    }
-}
-```
-
-Object expressions can implement multiple interfaces and inherit from one class:
-
-```lyng
-val x = object : Base(arg1), Interface1, Interface2 {
-    val property = 42
-    override fun method() = property * 2
-}
-```
-
-### Scoping and `this@object`
-
-Object expressions capture their lexical scope, meaning they can access local variables and members of the outer class. When `this` is rebound (for example, inside an `apply` block), you can use the reserved alias `this@object` to refer to the innermost anonymous object instance.
-
-```lyng
-val handler = object {
-    fun process() {
-        this@object.apply {
-            // here 'this' is rebound to the map/context
-            // but we can still access the anonymous object via this@object
-            println("Processing in " + this@object)
-        }
-    }
-}
-```
-
-### Serialization and Identity
-
-- **Serialization**: Anonymous objects are **not serializable**. Attempting to encode an anonymous object via `Lynon` will throw a `SerializationException`. This is because their class definition is transient and cannot be safely restored in a different session or process.
-- **Type Identity**: Every object expression creates a unique anonymous class. Two identical object expressions will result in two different classes with distinct type identities.
-
 ## Properties
 
 Properties allow you to define member accessors that look like fields but execute code when read or written. Unlike regular fields, properties in Lyng do **not** have automatic backing fields; they are pure accessors.
 
 ### Basic Syntax
 
-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.
+Properties are declared using `val` (read-only) or `var` (read-write) followed by a name and `get()`/`set()` blocks:
 
-The standard syntax uses parentheses:
 ```lyng
 class Person(private var _age: Int) {
     // Read-only property
@@ -137,17 +94,21 @@ class Person(private var _age: Int) {
             if (value >= 0) _age = value
         }
 }
+
+val p = Person(15)
+assertEquals("Minor", p.ageCategory)
+p.age = 20
+assertEquals("Adult", p.ageCategory)
 ```
 
-### Laconic Syntax (Optional Parentheses)
+### Laconic Expression Shorthand
 
-For even cleaner code, you can omit the parentheses for `get` and `set`. This is especially useful for simple expression shorthand:
+For simple accessors and methods, you can use the `=` shorthand for a more elegant and laconic form:
 
 ```lyng
 class Circle(val radius: Real) {
-    // Laconic expression shorthand
-    val area get = π * radius * radius
-    val circumference get = 2 * π * radius
+    val area get() = π * radius * radius
+    val circumference get() = 2 * π * radius
     
     fun diameter() = radius * 2
 }
@@ -156,16 +117,15 @@ fun median(a, b) = (a + b) / 2
 
 class Counter {
     private var _count = 0
-    var count get = _count set(v) = _count = v
+    var count get() = _count set(v) = _count = v
 }
 ```
 
 ### Key Rules
 
-- **`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.
+- **`val` properties** must have a `get()` accessor and cannot have a `set()`.
+- **`var` properties** must have both `get()` and `set()` accessors.
 - **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.
 - **Type Inference**: You can omit the type declaration if it can be inferred or if you don't need strict typing.
 
@@ -222,19 +182,6 @@ A delegate is any object that provides the following methods (all optional depen
 - `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.
 
-### 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).
 
 ## Instance initialization: init block
@@ -425,7 +372,7 @@ Key rules and features:
 
 - Visibility
   - `private`: accessible only inside the declaring class body; not visible in subclasses and cannot be accessed via `this@Type` or casts.
-  - `protected`: accessible in the declaring class and in any of its transitive subclasses (including MI). Additionally, ancestor classes can access protected members of their descendants if it's an override of a member known to the ancestor. Protected members are not visible from unrelated contexts; qualification/casts do not bypass it.
+  - `protected`: accessible in the declaring class and in any of its transitive subclasses (including MI), but not from unrelated contexts; qualification/casts do not bypass it.
 
 ## Abstract Classes and Members
 
@@ -542,99 +489,6 @@ class Critical {
 
 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:
 
 - Existing single‑inheritance code continues to work unchanged; its resolution order reduces to the single base.
@@ -718,23 +572,6 @@ Notes and limitations (current version):
 - `name` and `ordinal` are read‑only properties of an entry.
 - `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
 
 It is possible to add non-constructor fields:
@@ -857,44 +694,23 @@ Private fields are visible only _inside the class instance_:
     void
     >>> void
 
-### Transient fields
-
-You can mark a field or a constructor parameter as transient using the `@Transient` attribute. Transient members are ignored during serialization (Lynon and JSON) and are also excluded from structural equality (`==`) checks.
-
-```lyng
-class Session(@Transient val token, val userId) {
-    @Transient var lastAccess = time.now()
-    var data = Map()
-}
-```
-
-For more details on how transient fields behave during restoration, see the [Serialization Guide](serialization.md).
-
 ### Protected members
 
-Protected members are available to the declaring class and all of its transitive subclasses (including via MI). Additionally, an ancestor class can access a `protected` member of its descendant if the ancestor also defines or inherits a member with the same name (i.e., it is an override of something the ancestor knows about). 
+Protected members are available to the declaring class and all of its transitive subclasses (including via MI), but not from unrelated contexts:
 
-Protected members are not available from unrelated contexts:
-
-```lyng
-class Base {
-    abstract protected fun foo()
-    
-    fun bar() {
-        // Ancestor can see foo() because it's an override 
-        // of a member it defines (even as abstract):
-        foo()
+```
+class A() {
+    protected fun ping() { "pong" }
 }
+class B() : A() {
+    fun call() { this@A.ping() }
 }
 
-class Derived : Base {
-    override protected fun foo() { "ok" }
-}
-
-assertEquals("ok", Derived().bar())
+val b = B()
+assertEquals("pong", b.call())
 
 // Unrelated access is forbidden, even via cast
-assertThrows { (Derived() as Base).foo() }
+assertThrows { (b as A).ping() }
 ```
 
 It is possible to provide private constructor parameters so they can be

docs/Range.md

@@ -98,11 +98,10 @@ Exclusive end char ranges are supported too:
 | isEndInclusive  | true for '..'                | Bool          |
 | isOpen          | at any end                   | Bool          |
 | isIntRange      | both start and end are Int   | Bool          |
-| start           |                              | Any?          |
-| end             |                              | Any?          |
+| start           |                              | Bool          |
+| end             |                              | Bool          |
 | size            | for finite ranges, see above | Long          |
 | []              | see above                    |               |
-
-Ranges are also used with the `clamp(value, range)` function and the `value.clamp(range)` extension method to limit values within boundaries.
+|                 |                              |               |
 
 [Iterable]: Iterable.md

docs/Real.md

@@ -19,7 +19,6 @@ you can use it's class to ensure type:
 |-----------------|-------------------------------------------------------------|------|
 | `.roundToInt()` | round to nearest int like round(x)                          | Int  |
 | `.toInt()`      | convert integer part of real to `Int` dropping decimal part | Int  |
-| `.clamp(range)` | clamp value within range boundaries                         | Real |
 |                 |                                                             |      |
 |                 |                                                             |      |
 |                 |                                                             |      |

docs/delegation.md

@@ -57,8 +57,7 @@ class lazy(val creator) : Delegate {
 
     override fun getValue(thisRef, name) {
         if (value == Unset) {
-            // calculate value using thisRef as this:
-            value = with(thisRef) creator()
+            value = creator()
         }
         value
     }
@@ -151,24 +150,6 @@ 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(name, access, thisRef)` method is called exactly once when the member is being initialized. It allows the delegate to:

docs/embedding.md

@@ -103,11 +103,6 @@ scope.addVoidFn("log") {
     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
 scope.eval("val y = inc(41); log('Answer:', y)")
 ```
@@ -127,9 +122,6 @@ myClass.createField("version", ObjString("1.0.0"), isMutable = false)
 // Add a mutable field with an initial value
 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)
 ```
 
@@ -161,16 +153,6 @@ 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)
 ```
 
@@ -304,46 +286,6 @@ val isolated = net.sergeych.lyng.Scope.new()
 - 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.
 
-### 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.

docs/exceptions_handling.md

@@ -129,11 +129,9 @@ Serializable class that conveys information about the exception. Important membe
 | name              | description                                            |
 |-------------------|--------------------------------------------------------|
 | 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()           |
 
-> **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
 
 A simple structire that stores single entry in Lyng stack, it is created automatically on exception creation:
@@ -152,103 +150,24 @@ class StackTraceEntry(
 
 # Custom error classes
 
-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)
-}
-```
+_this functionality is not yet released_
 
 # Standard exception classes
 
 | class                      | notes                                                 |
 |----------------------------|-------------------------------------------------------|
-| Exception                  | root of all throwable objects                         |
+| Exception                  | root of al throwable objects                          |
 | NullReferenceException     |                                                       |
 | AssertionFailedException   |                                                       | 
 | ClassCastException         |                                                       |
 | IndexOutOfBoundsException  |                                                       |
 | IllegalArgumentException   |                                                       | 
-| IllegalStateException      |                                                       |
-| NoSuchElementException     |                                                       |
 | IllegalAssignmentException | assigning to val, etc.                                |
 | SymbolNotDefinedException  |                                                       |
 | IterationEndException      | attempt to read iterator past end, `hasNext == false` |
 | IllegalAccessException     | attempt to access private members or like             |
-| UnknownException           | unexpected internal exception caught                  |
-| NotFoundException          |                                                       |
-| IllegalOperationException  |                                                       |
-| UnsetException             | access to uninitialized late-init val                 |
-| NotImplementedException    | used by `TODO()`                                      |
-| SyntaxError                |                                                       |
+| UnknownException           | unexpected kotlin exception caught                    |
+|                            |                                                       |
 
 
 ### Symbol resolution errors

docs/json_and_kotlin_serialization.md

@@ -20,18 +20,7 @@ Simple classes serialization is supported:
     assertEquals( "{\"foo\":1,\"bar\":2}", Point(1,2).toJsonString() )
     >>> void
 
-Note that mutable members are serialized by default. You can exclude any member (including constructor parameters) from JSON serialization using the `@Transient` attribute:
-
-    import lyng.serialization
-    
-    class Point2(@Transient val foo, val bar) {
-        @Transient var reason = 42
-        var visible = 100
-    }
-    assertEquals( "{\"bar\":2,\"visible\":100}", Point2(1,2).toJsonString() )
-    >>> void
-
-Note that if you override json serialization:
+Note that mutable members are serialized:
 
     import lyng.serialization
     

docs/lyng.io.fs.md

@@ -8,7 +8,7 @@ This module provides a uniform, suspend-first filesystem API to Lyng scripts, ba
 
 It exposes a Lyng class `Path` with methods for file and directory operations, including streaming readers for large files.
 
-It is a separate library because access to the filesystem is a security risk we compensate with a separate API that user must explicitly include to the dependency and allow. Together with `FsAccessPolicy` that is required to `createFs()` which actually adds the filesystem to the scope, the security risk is isolated.
+It is a separate library because access to teh filesystem is a security risk we compensate with a separate API that user must explicitly include to the dependency and allow. Together with `FsAceessPolicy` that is required to `createFs()` which actually adds the filesystem to the scope, the security risk is isolated.
 
 Also, it helps keep Lyng core small and focused.
 
@@ -23,7 +23,7 @@ dependencies {
     implementation("net.sergeych:lyngio:0.0.1-SNAPSHOT")
 }
 ```
-Note on maven repository. Lyngio uses the same maven as Lyng code (`lynglib`) so it is most likely already in your project. If not, add it to the proper section of your `build.gradle.kts` or settings.gradle.kts:
+Note on maven repository. Lyngio uses ths same maven as Lyng code (`lynglib`) so it is most likely already in your project. If ont, add it to the proper section of your `build.gradle.kts` or settings.gradle.kts:
 
 ```kotlin
     repositories {
@@ -43,13 +43,9 @@ This brings in:
 
 The filesystem module is not installed automatically. You must explicitly register it in the scope’s `ImportManager` using the installer. You can customize access control via `FsAccessPolicy`.
 
-Kotlin (host) bootstrap example:
+Kotlin (host) bootstrap example (imports omitted for brevity):
 
 ```kotlin
-import net.sergeych.lyng.Scope
-import net.sergeych.lyng.io.fs.createFs
-import net.sergeych.lyngio.fs.security.PermitAllAccessPolicy
-
 val scope: Scope = Scope.new()
 val installed: Boolean = createFs(PermitAllAccessPolicy, scope)
 // installed == true on first registration in this ImportManager, false on repeats

docs/lyng.io.process.md

@@ -1,136 +0,0 @@
-### lyng.io.process — Process execution and control for Lyng scripts
-
-This module provides a way to run external processes and shell commands from Lyng scripts. It is designed to be multiplatform and uses coroutines for non-blocking execution.
-
-> **Note:** `lyngio` is a separate library module. It must be explicitly added as a dependency to your host application and initialized in your Lyng scopes.
-
----
-
-#### Add the library to your project (Gradle)
-
-If you use this repository as a multi-module project, add a dependency on `:lyngio`:
-
-```kotlin
-dependencies {
-    implementation("net.sergeych:lyngio:0.0.1-SNAPSHOT")
-}
-```
-
-For external projects, ensure you have the appropriate Maven repository configured (see `lyng.io.fs` documentation).
-
----
-
-#### Install the module into a Lyng Scope
-
-The process module is not installed automatically. You must explicitly register it in the scope’s `ImportManager` using `createProcessModule`. You can customize access control via `ProcessAccessPolicy`.
-
-Kotlin (host) bootstrap example:
-
-```kotlin
-import net.sergeych.lyng.Scope
-import net.sergeych.lyng.Script
-import net.sergeych.lyng.io.process.createProcessModule
-import net.sergeych.lyngio.process.security.PermitAllProcessAccessPolicy
-
-// ... inside a suspend function or runBlocking
-val scope: Scope = Script.newScope()
-createProcessModule(PermitAllProcessAccessPolicy, scope)
-
-// In scripts (or via scope.eval), import the module:
-scope.eval("import lyng.io.process")
-```
-
----
-
-#### Using from Lyng scripts
-
-```lyng
-import lyng.io.process
-
-// Execute a process with arguments
-val p = Process.execute("ls", ["-l", "/tmp"])
-for (line in p.stdout) {
-    println("OUT: " + line)
-}
-val exitCode = p.waitFor()
-println("Process exited with: " + exitCode)
-
-// Run a shell command
-val sh = Process.shell("echo 'Hello from shell' | wc -w")
-for (line in sh.stdout) {
-    println("Word count: " + line.trim())
-}
-
-// Platform information
-val details = Platform.details()
-println("OS: " + details.name + " " + details.version + " (" + details.arch + ")")
-if (details.kernelVersion != null) {
-    println("Kernel: " + details.kernelVersion)
-}
-
-if (Platform.isSupported()) {
-    println("Processes are supported!")
-}
-```
-
----
-
-#### API Reference
-
-##### `Process` (static methods)
-- `execute(executable: String, args: List<String>): RunningProcess` — Start an external process.
-- `shell(command: String): RunningProcess` — Run a command through the system shell (e.g., `/bin/sh` or `cmd.exe`).
-
-##### `RunningProcess` (instance methods)
-- `stdout: Flow` — Standard output stream as a Lyng Flow of lines.
-- `stderr: Flow` — Standard error stream as a Lyng Flow of lines.
-- `waitFor(): Int` — Wait for the process to exit and return the exit code.
-- `signal(name: String)` — Send a signal to the process (e.g., `"SIGINT"`, `"SIGTERM"`, `"SIGKILL"`).
-- `destroy()` — Forcefully terminate the process.
-
-##### `Platform` (static methods)
-- `details(): Map` — Get platform details. Returned map keys: `name`, `version`, `arch`, `kernelVersion`.
-- `isSupported(): Bool` — True if process execution is supported on the current platform.
-
----
-
-#### Security Policy
-
-Process execution is a sensitive operation. `lyngio` uses `ProcessAccessPolicy` to control access to `execute` and `shell` operations.
-
-- `ProcessAccessPolicy` — Interface for custom policies.
-- `PermitAllProcessAccessPolicy` — Allows all operations.
-- `ProcessAccessOp` (sealed) — Operations to check:
-    - `Execute(executable, args)`
-    - `Shell(command)`
-
-Example of a restricted policy in Kotlin:
-
-```kotlin
-import net.sergeych.lyngio.fs.security.AccessDecision
-import net.sergeych.lyngio.fs.security.Decision
-import net.sergeych.lyngio.process.security.ProcessAccessOp
-import net.sergeych.lyngio.process.security.ProcessAccessPolicy
-
-val restrictedPolicy = object : ProcessAccessPolicy {
-    override suspend fun check(op: ProcessAccessOp, ctx: AccessContext): AccessDecision {
-        return when (op) {
-            is ProcessAccessOp.Execute -> {
-                if (op.executable == "ls") AccessDecision(Decision.Allow)
-                else AccessDecision(Decision.Deny, "Only 'ls' is allowed")
-            }
-            is ProcessAccessOp.Shell -> AccessDecision(Decision.Deny, "Shell is forbidden")
-        }
-    }
-}
-createProcessModule(restrictedPolicy, scope)
-```
-
----
-
-#### Platform Support
-
-- **JVM:** Full support using `ProcessBuilder`.
-- **Native (Linux/macOS):** Support via POSIX.
-- **Windows:** Support planned.
-- **Android/JS/iOS/Wasm:** Currently not supported; `isSupported()` returns `false` and attempts to run processes will throw `UnsupportedOperationException`.

docs/lyngio.md

@@ -1,87 +0,0 @@
-### lyngio — Extended I/O and System Library for Lyng
-
-`lyngio` is a separate library that extends the Lyng core (`lynglib`) with powerful, multiplatform, and secure I/O capabilities.
-
-#### Why a separate module?
-
-1. **Security:** I/O and process execution are sensitive operations. By keeping them in a separate module, we ensure that the Lyng core remains 100% safe by default. You only enable what you explicitly need.
-2. **Footprint:** Not every script needs filesystem or process access. Keeping these as a separate module helps minimize the dependency footprint for small embedded projects.
-3. **Control:** `lyngio` provides fine-grained security policies (`FsAccessPolicy`, `ProcessAccessPolicy`) that allow you to control exactly what a script can do.
-
-#### Included Modules
-
-- **[lyng.io.fs](lyng.io.fs.md):** Async filesystem access. Provides the `Path` class for file/directory operations, streaming, and globbing.
-- **[lyng.io.process](lyng.io.process.md):** External process execution and shell commands. Provides `Process`, `RunningProcess`, and `Platform` information.
-
----
-
-#### Quick Start: Embedding lyngio
-
-##### 1. Add Dependencies (Gradle)
-
-```kotlin
-repositories {
-    maven("https://gitea.sergeych.net/api/packages/SergeychWorks/maven")
-}
-
-dependencies {
-    // Both are required for full I/O support
-    implementation("net.sergeych:lynglib:0.0.1-SNAPSHOT")
-    implementation("net.sergeych:lyngio:0.0.1-SNAPSHOT")
-}
-```
-
-##### 2. Initialize in Kotlin (JVM or Native)
-
-To use `lyngio` modules in your scripts, you must install them into your Lyng scope and provide a security policy.
-
-```kotlin
-import net.sergeych.lyng.Script
-import net.sergeych.lyng.io.fs.createFs
-import net.sergeych.lyng.io.process.createProcessModule
-import net.sergeych.lyngio.fs.security.PermitAllAccessPolicy
-import net.sergeych.lyngio.process.security.PermitAllProcessAccessPolicy
-
-suspend fun runMyScript() {
-    val scope = Script.newScope()
-    
-    // Install modules with policies
-    createFs(PermitAllAccessPolicy, scope)
-    createProcessModule(PermitAllProcessAccessPolicy, scope)
-    
-    // Now scripts can import them
-    scope.eval("""
-        import lyng.io.fs
-        import lyng.io.process
-        
-        println("Working dir: " + Path(".").readUtf8())
-        println("OS: " + Platform.details().name)
-    """)
-}
-```
-
----
-
-#### Security Tools
-
-`lyngio` is built with a "Secure by Default" philosophy. Every I/O or process operation is checked against a policy.
-
-- **Filesystem Security:** Implement `FsAccessPolicy` to restrict access to specific paths or operations (e.g., read-only access to a sandbox directory).
-- **Process Security:** Implement `ProcessAccessPolicy` to restrict which executables can be run or to disable shell execution entirely.
-
-For more details, see the specific module documentation:
-- [Filesystem Security Details](lyng.io.fs.md#access-policy-security)
-- [Process Security Details](lyng.io.process.md#security-policy)
-
----
-
-#### Platform Support Overview
-
-| Platform | lyng.io.fs | lyng.io.process |
-| :--- | :---: | :---: |
-| **JVM** | ✅ | ✅ |
-| **Native (Linux/macOS)** | ✅ | ✅ |
-| **Native (Windows)** | ✅ | 🚧 (Planned) |
-| **Android** | ✅ | ❌ |
-| **NodeJS** | ✅ | ❌ |
-| **Browser / Wasm** | ✅ (In-memory) | ❌ |

docs/math.md

@@ -92,7 +92,6 @@ or transformed `Real` otherwise.
 | pow(x, y) | ${x^y}$                                              |
 | sqrt(x)   | $ \sqrt {x}$                                         |
 | abs(x)    | absolute value of x. Int if x is Int, Real otherwise |
-| clamp(x, range) | limit x to be inside range boundaries          |
 
 For example:
 
@@ -103,11 +102,6 @@ For example:
     // abs() keeps the argument type:
     assert( abs(-1) is Int)
     assert( abs(-2.21) == 2.21 )
-
-    // clamp() limits value to the range:
-    assert( clamp(15, 0..10) == 10 )
-    assert( clamp(-5, 0..10) == 0 )
-    assert( 5.clamp(0..10) == 5 )
     >>> void
 
 ## Scientific constant

docs/parallelism.md

@@ -226,11 +226,13 @@ 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:
 
-1. **Current frame locals and arguments**: Variables defined within the current closure execution.
-2. **Captured lexical ancestry**: Outer local variables captured at the site where the closure was defined (the "lexical environment").
-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 environment**: Falls back to the calling context (e.g., the caller's `this` or local variables).
-5. **Global/Module fallbacks**: Final check for module-level constants and global functions.
+1. Closure frame locals/arguments
+2. Captured receiver instance/class members
+3. Closure ancestry locals + each frame’s `this` members (cycle‑safe)
+4. Caller `this` members
+5. Caller ancestry locals + each frame’s `this` members (cycle‑safe)
+6. Module pseudo‑symbols (e.g., `__PACKAGE__`)
+7. Direct module/global fallback (nearest `ModuleScope` and its parent/root)
 
 Implications:
 - Outer locals (e.g., `counter`) stay visible across suspension points.

docs/perf_guide.md

@@ -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_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.
-- `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.
+- `SCOPE_POOL` — Scope frame pooling for calls (JVM, per‑thread ThreadLocal pool). ON by default on JVM; togglable at runtime.
 - `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).
 - `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.

docs/return_statement.md

@@ -1,86 +0,0 @@
-# The `return` statement
-
-The `return` statement is used to terminate the execution of the innermost enclosing callable (a function or a lambda) and optionally return a value to the caller.
-
-## Basic Usage
-
-By default, Lyng functions and blocks return the value of their last expression. However, `return` allows you to exit early, which is particularly useful for guard clauses.
-
-```lyng
-fun divide(a, b) {
-    if (b == 0) return null // Guard clause: early exit
-    a / b
-}
-```
-
-If no expression is provided, `return` returns `void`:
-
-```lyng
-fun logIfDebug(msg) {
-    if (!DEBUG) return
-    println("[DEBUG] " + msg)
-}
-```
-
-## Scoping Rules
-
-In Lyng, `return` always exits the **innermost enclosing callable**. Callables include:
-*   Named functions (`fun` or `fn`)
-*   Anonymous functions/lambdas (`{ ... }`)
-
-Standard control flow blocks like `if`, `while`, `do`, and `for` are **not** callables; `return` inside these blocks will return from the function or lambda that contains them.
-
-```lyng
-fun findFirstPositive(list) {
-    list.forEach { 
-        if (it > 0) return it // ERROR: This returns from the lambda, not findFirstPositive!
-    }
-    null
-}
-```
-*Note: To return from an outer scope, use [Non-local Returns](#non-local-returns).*
-
-## Non-local Returns
-
-Lyng supports returning from outer scopes using labels. This is a powerful feature for a closure-intensive language.
-
-### Named Functions as Labels
-Every named function automatically provides its name as a label.
-
-```lyng
-fun findFirstPositive(list) {
-    list.forEach { 
-        if (it > 0) return@findFirstPositive it // Returns from findFirstPositive
-    }
-    null
-}
-```
-
-### Labeled Lambdas
-You can explicitly label a lambda using the `@label` syntax to return from it specifically when nested.
-
-```lyng
-val process = @outer { x ->
-    val result = {
-        if (x < 0) return@outer "negative" // Returns from the outer lambda
-        x * 2
-    }()
-    "Result: " + result
-}
-```
-
-## Restriction on Shorthand Functions
-
-To maintain Lyng's clean, expression-oriented style, the `return` keyword is **forbidden** in shorthand function definitions (those using `=`).
-
-```lyng
-fun square(x) = x * x          // Correct
-fun square(x) = return x * x   // Syntax Error: 'return' not allowed here
-```
-
-## Summary
-*   `return [expression]` exits the innermost `fun` or `{}`.
-*   Use `return@label` for non-local returns.
-*   Named functions provide automatic labels.
-*   Cannot be used in `=` shorthand functions.
-*   Consistency: Mirrors the syntax and behavior of `break@label expression`.

docs/samples/fs_sample.lyng

@@ -1,6 +1,7 @@
 #!/bin/env lyng
 
 import lyng.io.fs
+import lyng.stdlib
 
 val files = Path("../..").list().toList()
 // most long is longest?

docs/samples/operator_overloading.lyng

@@ -1,63 +0,0 @@
-// 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)

docs/scopes_and_closures.md

@@ -8,13 +8,16 @@ Name lookup across nested scopes and closures can accidentally form recursive re
 ## Resolution order in ClosureScope
 When evaluating an identifier `name` inside a closure, `ClosureScope.get(name)` resolves in this order:
 
-1. **Current frame locals and arguments**: Variables defined within the current closure execution.
-2. **Captured lexical ancestry**: Outer local variables captured at the site where the closure was defined (the "lexical environment").
-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 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. **Global/Module fallbacks**: Final check for module-level constants and global functions.
+1. Closure frame locals and arguments
+2. Captured receiver (`closureScope.thisObj`) instance/class members
+3. Closure ancestry locals + each frame’s `thisObj` members (cycle‑safe)
+4. Caller `this` members
+5. Caller ancestry locals + each frame’s `thisObj` members (cycle‑safe)
+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 ensures that closures primarily interact with their defining environment (lexical capture) while still being able to participate in DSL-style calling contexts.
+This preserves intuitive visibility (locals → captured receiver → closure chain → caller members → caller chain → module/root) while preventing infinite recursion between scope types.
 
 ## 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`:

docs/serialization.md

@@ -20,37 +20,20 @@ It is as simple as:
     assert( text.length > encodedBits.toBuffer().size )
     >>> void
 
-Any class you create is serializable by default; lynon serializes first constructor fields, then any `var` member fields.
+Any class you create is serializable by default; lynon serializes first constructor fields, then any `var` member fields:
 
-## Transient Fields
+    import lyng.serialization
 
-Sometimes you have fields that should not be serialized, for example, temporary caches, secret data, or derived values that are recomputed in `init` blocks. You can mark such fields with the `@Transient` attribute:
+    class Point(x,y)
 
-```lyng
-class MyData(@Transient val tempSecret, val publicData) {
-    @Transient var cachedValue = 0
-    var persistentValue = 42
+    val p = Lynon.decode( Lynon.encode( Point(5,6) ) )
     
-    init {
-        // cachedValue can be recomputed here upon deserialization
-        cachedValue = computeCache(publicData)
-    }
-}
-```
+    assertEquals( 5, p.x )
+    assertEquals( 6, p.y )
+    >>> void
 
-Transient fields:
-- Are **omitted** from Lynon binary streams.
-- Are **omitted** from JSON output (via `toJson`).
-- Are **ignored** during structural equality checks (`==`).
-- If a transient constructor parameter has a **default value**, it will be restored to that default value during deserialization. Otherwise, it will be `null`.
-- Class body fields marked as `@Transient` will keep their initial values (or values assigned in `init`) after deserialization.
 
-## Serialization of Objects and Classes
-
-- **Singleton Objects**: `object` declarations are serializable by name. Their state (mutable fields) is also serialized and restored, respecting `@Transient`.
-- **Classes**: Class objects themselves can be serialized. They are serialized by their full qualified name. When converted to JSON, a class object includes its public static fields (excluding those marked `@Transient`).
-
-## Custom Serialization
+just as expected.
 
 Important is to understand that normally `Lynon.decode` wants [BitBuffer], as `Lynon.encode` produces. If you have the regular [Buffer], be sure to convert it:
 

docs/time.md

@@ -2,105 +2,166 @@
 
 Lyng date and time support requires importing `lyng.time` packages. Lyng uses simple yet modern time object models:
 
-- `Instant` class for absolute time stamps with platform-dependent resolution.
-- `DateTime` class for calendar-aware points in time within a specific time zone.
-- `Duration` to represent amount of time not depending on the calendar (e.g., milliseconds, seconds).
+- `Instant` class for time stamps with platform-dependent resolution
+- `Duration` to represent amount of time not depending on the calendar, e.g. in absolute units (milliseconds, seconds,
+  hours, days)
 
 ## Time instant: `Instant`
 
-Represent some moment of time not depending on the calendar. It is similar to `TIMESTAMP` in SQL or `Instant` in Kotlin.
+Represent some moment of time not depending on the calendar (calendar for example may b e changed, daylight saving time
+can be for example introduced or dropped). It is similar to `TIMESTAMP` in SQL or `Instant` in Kotlin. Some moment of
+time; not the calendar date.
 
-### Constructing and converting
+Instant is comparable to other Instant. Subtracting instants produce `Duration`, period in time that is not dependent on
+the calendar, e.g. absolute time period.
+
+It is possible to add or subtract `Duration` to and from `Instant`, that gives another `Instant`.
+
+Instants are converted to and from `Real` number of seconds before or after Unix Epoch, 01.01.1970. Constructor with
+single number parameter constructs from such number of seconds,
+and any instance provide `.epochSeconds` member:
 
     import lyng.time
 
     // default constructor returns time now:
     val t1 = Instant()
+    val t2 = Instant()
+    assert( t2 - t1 < 1.millisecond )
+    assert( t2.epochSeconds - t1.epochSeconds < 0.001 )
+    >>> void
 
-    // constructing from a number is treated as seconds since unix epoch:
-    val t2 = Instant(1704110400) // 2024-01-01T12:00:00Z
+## Constructing
 
-    // from RFC3339 string:
-    val t3 = Instant("2024-01-01T12:00:00.123456Z")
+    import lyng.time
 
-    // truncation:
-    val t4 = t3.truncateToMinute
-    assertEquals(t4.toRFC3339(), "2024-01-01T12:00:00Z")
+    // empty constructor gives current time instant using system clock:
+    val now = Instant()
 
-    // to localized DateTime (uses system default TZ if not specified):
-    val dt = t3.toDateTime("+02:00")
-    assertEquals(dt.hour, 14)
+    // constructor with Instant instance makes a copy:
+    assertEquals( now, Instant(now) )
 
-### Instant members
+    // constructing from a number is trated as seconds since unix epoch:
+    val copyOfNow = Instant( now.epochSeconds )
+
+    // note that instant resolution is higher that Real can hold
+    // so reconstructed from real slightly differs:
+    assert( abs( (copyOfNow - now).milliseconds ) < 0.01 )
+    >>> void
+
+The resolution of system clock could be more precise and double precision real number of `Real`, keep it in mind.
+
+## Comparing and calculating periods
+
+    import lyng.time
+    
+    val now = Instant()
+    
+    // you cam add or subtract periods, and compare
+    assert( now - 5.minutes < now )
+    val oneHourAgo = now - 1.hour
+    assertEquals( now, oneHourAgo + 1.hour)
+
+    >>> void
+
+## Getting the max precision
+
+Normally, subtracting instants gives precision to microseconds, which is well inside the jitter
+the language VM adds. Still `Instant()` or `Instant.now()` capture most precise system timer at hand and provide inner
+value of 12 bytes, up to nanoseconds (hopefully). To access it use:
+
+    import lyng.time
+
+    // capture time
+    val now = Instant.now()
+
+    // this is Int value, number of whole epoch 
+    // milliseconds to the moment, it fits 8 bytes Int well
+    val seconds = now.epochWholeSeconds
+    assert(seconds is Int)
+
+    // and this is Int value of nanoseconds _since_ the epochMillis,
+    // it effectively add 4 more mytes int:
+    val nanos = now.nanosecondsOfSecond
+    assert(nanos is Int)
+    assert( nanos in 0..999_999_999 )
+
+    // we can construct epochSeconds from these parts:
+    assertEquals( now.epochSeconds, nanos * 1e-9 + seconds )
+    >>> void
+
+## Truncating to more realistic precision
+
+Full precision Instant is way too long and impractical to store, especially when serializing,
+so it is possible to truncate it to milliseconds, microseconds or seconds:
+
+    import lyng.time
+    import lyng.serialization
+
+    // max supported size (now microseconds for serialized value):
+    // note that encoding return _bit array_ and this is a _bit size_:
+    val s0 = Lynon.encode(Instant.now()).size
+
+    // shorter: milliseconds only
+    val s1 = Lynon.encode(Instant.now().truncateToMillisecond()).size
+
+    // truncated to seconds, good for file mtime, etc:
+    val s2 = Lynon.encode(Instant.now().truncateToSecond()).size 
+    assert( s1 < s0 )
+    assert( s2 < s1 )
+    >>> void
+
+## Formatting instants
+
+You can freely use `Instant` in string formatting. It supports usual sprintf-style formats:
+
+        import lyng.time
+        val now = Instant()
+
+        // will be something like "now: 12:10:05"
+        val currentTimeOnly24 =  "now: %tT"(now)
+
+        // we can extract epoch second with formatting too,
+        // this was since early C time
+
+        // get epoch while seconds from formatting
+        val unixEpoch = "Now is %ts since unix epoch"(now)
+        
+        // and it is the same as now.epochSeconds, int part:
+        assertEquals( unixEpoch, "Now is %d since unix epoch"(now.epochSeconds.toInt()) )
+        >>> void
+
+See
+the [complete list of available formats](https://github.com/sergeych/mp_stools?tab=readme-ov-file#datetime-formatting)
+and the [formatting reference](https://github.com/sergeych/mp_stools?tab=readme-ov-file#printf--sprintf): it all works
+in Lyng as `"format"(args...)`!
+
+## Instant members
 
 | member                         | description                                             |
 |--------------------------------|---------------------------------------------------------|
 | epochSeconds: Real             | positive or negative offset in seconds since Unix epoch |
 | epochWholeSeconds: Int         | same, but in _whole seconds_. Slightly faster           |
-| nanosecondsOfSecond: Int       | offset from epochWholeSeconds in nanos                  |
+| nanosecondsOfSecond: Int       | offset from epochWholeSeconds in nanos (1)              |
 | isDistantFuture: Bool          | true if it `Instant.distantFuture`                      |
 | isDistantPast: Bool            | true if it `Instant.distantPast`                        |
-| truncateToMinute: Instant      | create new instance truncated to minute                 |
-| truncateToSecond: Instant      | create new instance truncated to second                 |  
-| truncateToMillisecond: Instant | truncate new instance to millisecond                    |
+| truncateToSecond: Intant       | create new instnce truncated to second                  |  
+| truncateToMillisecond: Instant | truncate new instance with to millisecond               |
 | truncateToMicrosecond: Instant | truncate new instance to microsecond                    |
-| toRFC3339(): String            | format as RFC3339 string (UTC)                          |
-| toDateTime(tz?): DateTime      | localize to a TimeZone (ID string or offset seconds)    |
 
-## Calendar time: `DateTime`
+(1)
+: The value of nanoseconds is to be added to `epochWholeSeconds` to get exact time point. It is in 0..999_999_999 range.
+The precise time instant value therefore needs as for now 12 bytes integer; we might use bigint later (it is planned to
+be added)
 
-`DateTime` represents a point in time in a specific timezone. It provides access to calendar components like year,
-month, and day.
-
-### Constructing
-
-    import lyng.time
-
-    // Current time in system default timezone
-    val now = DateTime.now()
-    
-    // Specific timezone
-    val offsetTime = DateTime.now("+02:00")
-    
-    // From Instant
-    val dt = Instant().toDateTime("Z")
-
-    // By components (year, month, day, hour=0, minute=0, second=0, timeZone="UTC")
-    val dt2 = DateTime(2024, 1, 1, 12, 0, 0, "Z")
-
-    // From RFC3339 string
-    val dt3 = DateTime.parseRFC3339("2024-01-01T12:00:00+02:00")
-
-### DateTime members
+## Class members
 
 | member                         | description                                  |
-|----------------------------------|-----------------------------------------------|
-| year: Int                        | year component                                |
-| month: Int                       | month component (1..12)                       |
-| day: Int                         | day of month (alias `dayOfMonth`)             |
-| hour: Int                        | hour component (0..23)                        |
-| minute: Int                      | minute component (0..59)                      |
-| second: Int                      | second component (0..59)                      |
-| dayOfWeek: Int                   | day of week (1=Monday, 7=Sunday)              |
-| timeZone: String                 | timezone ID string                            |
-| toInstant(): Instant             | convert back to absolute Instant              |
-| toUTC(): DateTime                | shortcut to convert to UTC                    |
-| toTimeZone(tz): DateTime         | convert to another timezone                   |
-| addMonths(n): DateTime           | add/subtract months (normalizes end of month) |
-| addYears(n): DateTime            | add/subtract years                            |
-| toRFC3339(): String              | format with timezone offset                   |
-| static now(tz?): DateTime        | create DateTime with current time             |
-| static parseRFC3339(s): DateTime | parse RFC3339 string                          |
+|--------------------------------|----------------------------------------------|
+| Instant.now()                  | create new instance with current system time |
+| Instant.distantPast: Instant   | most distant instant in past                 |
+| Instant.distantFuture: Instant | most distant instant in future               |
 
-### Arithmetic and normalization
-
-`DateTime` handles calendar arithmetic correctly:
-
-    val leapDay = Instant("2024-02-29T12:00:00Z").toDateTime("Z")
-    val nextYear = leapDay.addYears(1)
-    assertEquals(nextYear.day, 28) // Feb 29, 2024 -> Feb 28, 2025
-
-# `Duration` class
+# `Duraion` class
 
 Represent absolute time distance between two `Instant`.
 

docs/tutorial.md

@@ -8,7 +8,7 @@ __Other documents to read__ maybe after this one:
 
 - [Advanced topics](advanced_topics.md), [declaring arguments](declaring_arguments.md), [Scopes and Closures](scopes_and_closures.md)
 - [OOP notes](OOP.md), [exception handling](exceptions_handling.md)
-- [math in Lyng](math.md), [the `when` statement](when.md), [return statement](return_statement.md)
+- [math in Lyng](math.md), [the `when` statement](when.md)
 - [Testing and Assertions](Testing.md)
 - [time](time.md) and [parallelism](parallelism.md)
 - [parallelism] - multithreaded code, coroutines, etc.
@@ -32,15 +32,6 @@ any block also returns it's last expression:
     }
     >>> 6
 
-If you want to exit a function or lambda earlier, use the `return` statement:
-
-    fn divide(a, b) {
-        if( b == 0 ) return null
-        a / b
-    }
-
-See [return statement](return_statement.md) for more details on scoping and non-local returns.
-
 If you don't want block to return anything, use `void`:
 
     fn voidFunction() {
@@ -188,13 +179,14 @@ Note that assignment operator returns rvalue, it can't be assigned.
 ## Modifying arithmetics
 
 There is a set of assigning operations: `+=`, `-=`, `*=`, `/=` and even `%=`.
-There is also a special null-aware assignment operator `?=`: it performs the assignment only if the lvalue is `null`.
 
-    var x = null
-    x ?= 10
-    assertEquals(10, x)
-    x ?= 20
-    assertEquals(10, x)
+    var x = 5
+    assert( 25 == (x*=5) )
+    assert( 25 == x)
+    assert( 24 == (x-=1) )
+    assert( 12 == (x/=2) )
+    x
+    >>> 12
 
 Notice the parentheses here: the assignment has low priority!
 
@@ -247,13 +239,6 @@ There is also "elvis operator", null-coalesce infix operator '?:' that returns r
     null ?: "nothing"
     >>> "nothing"
 
-There is also a null-aware assignment operator `?=`, which assigns a value only if the target is `null`:
-
-    var config = null
-    config ?= { port: 8080 }
-    config ?= { port: 9000 } // no-op, config is already not null
-    assertEquals(8080, config.port)
-
 ## Utility functions
 
 The following functions simplify nullable values processing and
@@ -313,16 +298,6 @@ It works much like `also`, but is executed in the context of the source object:
     assertEquals(p, Point(2,3))
     >>> void
 
-## with
-
-Sets `this` to the first argument and executes the block. Returns the value returned by the block:
-
-    class Point(x,y)
-    val p = Point(1,2)
-    val sum = with(p) { x + y }
-    assertEquals(3, sum)
-    >>> void
-
 ## run
 
 Executes a block after it returning the value passed by the block. for example, can be used with elvis operator:
@@ -1252,7 +1227,7 @@ The same with `--`:
     sum
     >>> 5050
 
-There is a self-assigning version for operators too:
+There are self-assigning version for operators too:
 
     var count = 100
     var sum = 0
@@ -1471,22 +1446,13 @@ Part match:
     assert( "foo" == $~.value )
     >>> void
 
-Repeating the fragment:
-
-    assertEquals("hellohello", "hello"*2)
-    assertEquals("", "hello"*0)
-    >>> void
-
-A typical set of String functions includes:
+Typical set of String functions includes:
 
 | fun/prop             | description / notes                                        |
 |----------------------|------------------------------------------------------------|
 | lower(), lowercase() | change case to unicode upper                               |
 | upper(), uppercase() | change case to unicode lower                               |
 | trim()               | trim space chars from both ends                            |
-| isEmpty()            | true if string is empty                                    |
-| isNotEmpty()         | true if string is not empty                                |
-| isBlank()            | true if empty or contains only whitespace                  |
 | startsWith(prefix)   | true if starts with a prefix                               |
 | endsWith(prefix)     | true if ends with a prefix                                 |
 | last()               | get last character of a string or throw                    |
@@ -1503,7 +1469,7 @@ A typical set of String functions includes:
 | s1 += s2             | self-modifying concatenation                               |
 | toReal()             | attempts to parse string as a Real 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           |
 | matches(re)          | matches the regular expression (2)                         |
 |                      |                                                            |
@@ -1553,7 +1519,7 @@ See [math functions](math.md). Other general purpose functions are:
 | flow {}                               | create flow sequence, see [parallelism]                    |
 | delay, launch, yield                  | see [parallelism]                                          |
 | cached(builder)                       | [Lazy evaluation with `cached`](#lazy-evaluation-with-cached) |
-| let, also, apply, run, with       | see above, flow controls                                   |
+| let, also, apply, run                 | see above, flow controls                                   |
 
 (1)
 : `fn` is optional lambda returning string message to add to exception string. 
@@ -1580,7 +1546,7 @@ Lambda avoid unnecessary execution if assertion is not failed. for example:
 
 [Range]: Range.md
 
-[String]: ../archived/development/String.md
+[String]: development/String.md
 
 [string formatting]: https://github.com/sergeych/mp_stools?tab=readme-ov-file#sprintf-syntax-summary
 
@@ -1704,7 +1670,7 @@ assertEquals(null, (buzz as? Foo)?.runA())
 
 Notes:
 - Resolution order uses C3 MRO (active): deterministic, monotonic order suitable for diamonds and complex hierarchies. Example: for `class D() : B(), C()` where both `B()` and `C()` derive from `A()`, the C3 order is `D → B → C → A`. The first visible match wins.
-- `private` is visible only inside the declaring class; `protected` is visible from the declaring class and its subclasses. Additionally, ancestors can access protected members of descendants if they override a member known to the ancestor. Qualification (`this@Type`) or casts do not bypass visibility.
+- `private` is visible only inside the declaring class; `protected` is visible from the declaring class and any of its transitive subclasses. Qualialsofication (`this@Type`) or casts do not bypass visibility.
 - Safe‑call `?.` works with `as?` for optional dispatch.
 
 ## Extension members

docs/whats_new.md

@@ -24,9 +24,6 @@ class Person(private var _age: Int) {
 ### Private and Protected Setters
 You can now restrict the visibility of a property's or field's setter using `private set` or `protected set`. This allows members to be publicly readable but only writable from within the declaring class or its subclasses.
 
-### Refined Protected Visibility
-Ancestor classes can now access `protected` members of their descendants if it is an override of a member known to the ancestor. This enables base classes to call protected methods that are implemented or overridden in subclasses.
-
 ```lyng
 class Counter {
     var count = 0
@@ -108,22 +105,6 @@ object Config {
 Config.show()
 ```
 
-### Object Expressions
-You can now create anonymous objects that inherit from classes or interfaces using the `object : Base { ... }` syntax. These expressions capture their lexical scope and support multiple inheritance.
-
-```lyng
-val worker = object : Runnable {
-    override fun run() = println("Working...")
-}
-
-val x = object : Base(arg1), Interface1 {
-    val property = 42
-    override fun method() = this@object.property * 2
-}
-```
-
-Use `this@object` to refer to the innermost anonymous object instance when `this` is rebound.
-
 ### Unified Delegation Model
 A powerful new delegation system allows `val`, `var`, and `fun` members to delegate their logic to other objects using the `by` keyword.
 
@@ -142,70 +123,6 @@ 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.
 
-### 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 (`?=`)
-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.
-
-```lyng
-var x = null
-x ?= 42          // x is now 42
-x ?= 100         // x remains 42 (not null)
-
-// Works with properties and index access
-config.port ?= 8080
-settings["theme"] ?= "dark"
-```
-
-The operator returns the final value of the receiver (the original value if it was not `null`, or the new value if the assignment occurred).
-
-### Transient Attribute (`@Transient`)
-The `@Transient` attribute can now be applied to class fields, constructor parameters, and static fields to exclude them from serialization.
-
-```lyng
-class MyData(@Transient val tempSecret, val publicData) {
-    @Transient var cachedValue = 0
-    var persistentValue = 42
-}
-```
-
-Key features:
-- **Serialization**: Transient members are omitted from both Lynon binary streams and JSON output.
-- **Structural Equality**: Transient fields are automatically ignored during `==` equality checks.
-- **Deserialization**: Transient constructor parameters with default values are correctly restored to those defaults upon restoration.
-
-### Value Clamping (`clamp`)
-A new `clamp()` function has been added to the standard library to limit a value within a specified range. It is available as both a global function and an extension method on all objects.
-
-```lyng
-// Global function
-clamp(15, 0..10)    // returns 10
-clamp(-5, 0..10)   // returns 0
-
-// Extension method
-val x = 15
-x.clamp(0..10)      // returns 10
-
-// Exclusive and open-ended ranges
-15.clamp(0..<10)    // returns 9
-15.clamp(..10)      // returns 10
--5.clamp(0..)       // returns 0
-```
-
-`clamp()` correctly handles inclusive (`..`) and exclusive (`..<`) ranges. For discrete types like `Int` and `Char`, clamping to an exclusive upper bound returns the previous value.
-
 ## Tooling and Infrastructure
 
 ### CLI: Formatting Command
@@ -221,6 +138,3 @@ 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.
 
 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.

editors/lyng-textmate/syntaxes/lyng.tmLanguage.json

@@ -42,7 +42,7 @@
         { "name": "constant.numeric.decimal.lyng", "match": "(?<![A-Za-z_])(?:[0-9][0-9_]*)\\.(?:[0-9_]+)(?:[eE][+-]?[0-9_]+)?|(?<![A-Za-z_])(?:[0-9][0-9_]*)(?:[eE][+-]?[0-9_]+)?" }
       ]
     },
-    "annotations": { "patterns": [ { "name": "entity.name.label.at.lyng", "match": "@[\\p{L}_][\\p{L}\\p{N}_]*" } ] },
+    "annotations": { "patterns": [ { "name": "entity.name.label.at.lyng", "match": "@[\\p{L}_][\\p{L}\\p{N}_]*:" }, { "name": "storage.modifier.annotation.lyng", "match": "@[\\p{L}_][\\p{L}\\p{N}_]*" } ] },
     "mapLiterals": {
       "patterns": [
         {
@@ -74,11 +74,11 @@
         }
       ]
     },
-    "labels": { "patterns": [ { "name": "entity.name.label.lyng", "match": "[\\p{L}_][\\p{L}\\p{N}_]*@" } ] },
+    "labels": { "patterns": [ { "name": "entity.name.label.lyng", "match": "[\\p{L}_][\\p{L}\\p{N}_]*:" } ] },
     "directives": { "patterns": [ { "name": "meta.directive.lyng", "match": "^\\s*#[_A-Za-z][_A-Za-z0-9]*" } ] },
-    "declarations": { "patterns": [ { "name": "meta.function.declaration.lyng", "match": "\\b(fun|fn)\\s+(?:([\\p{L}_][\\p{L}\\p{N}_]*)\\.)?([\\p{L}_][\\p{L}\\p{N}_]*)", "captures": { "1": { "name": "keyword.declaration.lyng" }, "2": { "name": "entity.name.type.lyng" }, "3": { "name": "entity.name.function.lyng" } } }, { "name": "meta.type.declaration.lyng", "match": "\\b(?:class|enum|interface|object)(?:\\s+([\\p{L}_][\\p{L}\\p{N}_]*))?", "captures": { "1": { "name": "entity.name.type.lyng" } } }, { "name": "meta.variable.declaration.lyng", "match": "\\b(val|var)\\s+(?:([\\p{L}_][\\p{L}\\p{N}_]*)\\.)?([\\p{L}_][\\p{L}\\p{N}_]*)", "captures": { "1": { "name": "keyword.declaration.lyng" }, "2": { "name": "entity.name.type.lyng" }, "3": { "name": "variable.other.declaration.lyng" } } } ] },
-    "keywords": { "patterns": [ { "name": "keyword.control.lyng", "match": "\\b(?:if|else|when|while|do|for|try|catch|finally|throw|return|break|continue)\\b" }, { "name": "keyword.declaration.lyng", "match": "\\b(?:fun|fn|class|enum|interface|val|var|import|package|constructor|property|abstract|override|open|closed|extern|private|protected|static|get|set|object|init|by)\\b" }, { "name": "keyword.operator.word.lyng", "match": "\\bnot\\s+(?:in|is)\\b" }, { "name": "keyword.operator.word.lyng", "match": "\\b(?:and|or|not|in|is|as|as\\?)\\b" } ] },
-    "constants": { "patterns": [ { "name": "constant.language.lyng", "match": "(?:\\b(?:true|false|null|this(?:@[\\p{L}_][\\p{L}\\p{N}_]*)?)\\b|π)" } ] },
+    "declarations": { "patterns": [ { "name": "meta.function.declaration.lyng", "match": "\\b(fun|fn)\\s+(?:([\\p{L}_][\\p{L}\\p{N}_]*)\\.)?([\\p{L}_][\\p{L}\\p{N}_]*)", "captures": { "1": { "name": "keyword.declaration.lyng" }, "2": { "name": "entity.name.type.lyng" }, "3": { "name": "entity.name.function.lyng" } } }, { "name": "meta.type.declaration.lyng", "match": "\\b(?:class|enum|interface)\\s+([\\p{L}_][\\p{L}\\p{N}_]*)", "captures": { "1": { "name": "entity.name.type.lyng" } } }, { "name": "meta.variable.declaration.lyng", "match": "\\b(val|var)\\s+(?:([\\p{L}_][\\p{L}\\p{N}_]*)\\.)?([\\p{L}_][\\p{L}\\p{N}_]*)", "captures": { "1": { "name": "keyword.declaration.lyng" }, "2": { "name": "entity.name.type.lyng" }, "3": { "name": "variable.other.declaration.lyng" } } } ] },
+    "keywords": { "patterns": [ { "name": "keyword.control.lyng", "match": "\\b(?:if|else|when|while|do|for|try|catch|finally|throw|return|break|continue)\\b" }, { "name": "keyword.declaration.lyng", "match": "\\b(?:fun|fn|class|enum|interface|val|var|import|package|constructor|property|abstract|override|open|closed|extern|private|protected|static|get|set)\\b" }, { "name": "keyword.operator.word.lyng", "match": "\\bnot\\s+(?:in|is)\\b" }, { "name": "keyword.operator.word.lyng", "match": "\\b(?:and|or|not|in|is|as|as\\?)\\b" } ] },
+    "constants": { "patterns": [ { "name": "constant.language.lyng", "match": "(?:\\b(?:true|false|null|this)\\b|π)" } ] },
     "types": { "patterns": [ { "name": "storage.type.lyng", "match": "\\b(?:Int|Real|String|Bool|Char|Regex)\\b" }, { "name": "entity.name.type.lyng", "match": "\\b[A-Z][A-Za-z0-9_]*\\b(?!\\s*\\()" } ] },
     "operators": { "patterns": [ { "name": "keyword.operator.comparison.lyng", "match": "===|!==|==|!=|<=|>=|<|>" }, { "name": "keyword.operator.shuttle.lyng", "match": "<=>" }, { "name": "keyword.operator.arrow.lyng", "match": "=>|->|::" }, { "name": "keyword.operator.range.lyng", "match": "\\.\\.\\.|\\.\\.<|\\.\\." }, { "name": "keyword.operator.nullsafe.lyng", "match": "\\?\\.|\\?\\[|\\?\\(|\\?\\{|\\?:|\\?\\?" }, { "name": "keyword.operator.assignment.lyng", "match": "(?:\\+=|-=|\\*=|/=|%=|=)" }, { "name": "keyword.operator.logical.lyng", "match": "&&|\\|\\|" }, { "name": "keyword.operator.bitwise.lyng", "match": "<<|>>|&|\\||\\^|~" }, { "name": "keyword.operator.match.lyng", "match": "=~|!~" }, { "name": "keyword.operator.arithmetic.lyng", "match": "\\+\\+|--|[+\\-*/%]" }, { "name": "keyword.operator.other.lyng", "match": "[!?]" } ] },
     "punctuation": { "patterns": [ { "name": "punctuation.separator.comma.lyng", "match": "," }, { "name": "punctuation.terminator.statement.lyng", "match": ";" }, { "name": "punctuation.section.block.begin.lyng", "match": "[(]{1}|[{]{1}|\\[" }, { "name": "punctuation.section.block.end.lyng", "match": "[)]{1}|[}]{1}|\\]" }, { "name": "punctuation.accessor.dot.lyng", "match": "\\." }, { "name": "punctuation.separator.colon.lyng", "match": ":" } ] }

gradle/libs.versions.toml

@@ -5,7 +5,6 @@ kotlin = "2.3.0"
 android-minSdk = "24"
 android-compileSdk = "34"
 kotlinx-coroutines = "1.10.2"
-kotlinx-datetime = "0.6.1"
 mp_bintools = "0.3.2"
 firebaseCrashlyticsBuildtools = "3.0.3"
 okioVersion = "3.10.2"
@@ -17,7 +16,6 @@ clikt-markdown = { module = "com.github.ajalt.clikt:clikt-markdown", version.ref
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
-kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
 mp_bintools = { module = "net.sergeych:mp_bintools", version.ref = "mp_bintools" }
 firebase-crashlytics-buildtools = { group = "com.google.firebase", name = "firebase-crashlytics-buildtools", version.ref = "firebaseCrashlyticsBuildtools" }
 okio = { module = "com.squareup.okio:okio", version.ref = "okioVersion" }

lyng-idea/build.gradle.kts

@@ -17,7 +17,7 @@
 
 plugins {
     kotlin("jvm")
-    id("org.jetbrains.intellij") version "1.17.4"
+    id("org.jetbrains.intellij") version "1.17.3"
 }
 
 group = "net.sergeych.lyng"
@@ -45,14 +45,12 @@ dependencies {
     // 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
     testImplementation("junit:junit:4.13.2")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.10.2")
-    testImplementation("org.opentest4j:opentest4j:1.3.0")
 }
 
 intellij {
     type.set("IC")
     // Build against a modern baseline. Install range is controlled by since/until below.
-    version.set("2024.1.6")
+    version.set("2024.3.1")
     // We manage <idea-version> ourselves in plugin.xml to keep it open-ended (no upper cap)
     updateSinceUntilBuild.set(false)
     // Include only available bundled plugins for this IDE build

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/LyngFileTypeFactory.kt

@@ -1,33 +0,0 @@
-/*
- * 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"))
-    }
-}

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/actions/RunLyngScriptAction.kt

@@ -1,144 +0,0 @@
-/*
- * 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
-    }
-}

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/annotators/LyngExternalAnnotator.kt

@@ -25,6 +25,9 @@ import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.util.Key
 import com.intellij.openapi.util.TextRange
 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.binding.Binder
 import net.sergeych.lyng.binding.SymbolKind
@@ -32,7 +35,7 @@ import net.sergeych.lyng.highlight.HighlightKind
 import net.sergeych.lyng.highlight.SimpleLyngHighlighter
 import net.sergeych.lyng.highlight.offsetOf
 import net.sergeych.lyng.idea.highlight.LyngHighlighterColors
-import net.sergeych.lyng.idea.util.LyngAstManager
+import net.sergeych.lyng.idea.util.IdeLenientImportProvider
 import net.sergeych.lyng.miniast.*
 
 /**
@@ -40,46 +43,57 @@ import net.sergeych.lyng.miniast.*
  * and applies semantic highlighting comparable with the web highlighter.
  */
 class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, LyngExternalAnnotator.Result>() {
-    data class Input(val text: String, val modStamp: Long, val previousSpans: List<Span>?, val file: PsiFile)
+    data class Input(val text: String, val modStamp: Long, val previousSpans: List<Span>?)
 
     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 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? {
         val doc: Document = file.viewProvider.document ?: return null
         val cached = file.getUserData(CACHE_KEY)
-        val combinedStamp = LyngAstManager.getCombinedStamp(file)
-
-        val prev = if (cached != null && cached.modStamp == combinedStamp) cached.spans else null
-        return Input(doc.text, combinedStamp, prev, file)
+        // Fast fix (1): reuse cached spans only if they were computed for the same modification stamp
+        val prev = if (cached != null && cached.modStamp == doc.modificationStamp) cached.spans else null
+        return Input(doc.text, doc.modificationStamp, prev)
     }
 
     override fun doAnnotate(collectedInfo: Input?): Result? {
         if (collectedInfo == null) return null
         ProgressManager.checkCanceled()
         val text = collectedInfo.text
-        val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
-        
-        // Use LyngAstManager to get the (potentially merged) Mini-AST
-        val mini = LyngAstManager.getMiniAst(collectedInfo.file) 
-            ?: return Result(collectedInfo.modStamp, collectedInfo.previousSpans ?: emptyList())
-        
+        // Build Mini-AST using the same mechanism as web highlighter
+        val sink = MiniAstBuilder()
+        val source = Source("<ide>", text)
+        try {
+            // Call suspend API from blocking context
+            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()
-        val source = Source(collectedInfo.file.name, text)
+        val mini = sink.build() ?: return Result(collectedInfo.modStamp, collectedInfo.previousSpans ?: emptyList())
 
         val out = ArrayList<Span>(256)
 
-        fun isFollowedByParenOrBlock(rangeEnd: Int): Boolean {
-            var i = rangeEnd
-            while (i < text.length) {
-                val ch = text[i]
-                if (ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n') { i++; continue }
-                return ch == '(' || ch == '{'
-            }
-            return false
-        }
-
         fun putRange(start: Int, end: Int, key: com.intellij.openapi.editor.colors.TextAttributesKey) {
             if (start in 0..end && end <= text.length && start < end) out += Span(start, end, key)
         }
@@ -94,8 +108,7 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
         }
 
         // Declarations
-        mini.declarations.forEach { d ->
-            if (d.nameStart.source != source) return@forEach
+        for (d in mini.declarations) {
             when (d) {
                 is MiniFunDecl -> putName(d.nameStart, d.name, LyngHighlighterColors.FUNCTION_DECLARATION)
                 is MiniClassDecl -> putName(d.nameStart, d.name, LyngHighlighterColors.TYPE)
@@ -109,31 +122,19 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
         }
 
         // Imports: each segment as namespace/path
-        mini.imports.forEach { imp ->
-            if (imp.range.start.source != source) return@forEach
-            imp.segments.forEach { seg -> putMiniRange(seg.range, LyngHighlighterColors.NAMESPACE) }
+        for (imp in mini.imports) {
+            for (seg in imp.segments) putMiniRange(seg.range, LyngHighlighterColors.NAMESPACE)
         }
 
         // Parameters
-        fun addParams(params: List<MiniParam>) {
-            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 -> {}
-            }
+        for (fn in mini.declarations.filterIsInstance<MiniFunDecl>()) {
+            for (p in fn.params) putName(p.nameStart, p.name, LyngHighlighterColors.PARAMETER)
         }
 
         // Type name segments (including generics base & args)
         fun addTypeSegments(t: MiniTypeRef?) {
             when (t) {
                 is MiniTypeName -> t.segments.forEach { seg ->
-                    if (seg.range.start.source != source) return@forEach
                     val s = source.offsetOf(seg.range.start)
                     putRange(s, (s + seg.name.length).coerceAtMost(text.length), LyngHighlighterColors.TYPE)
                 }
@@ -147,14 +148,12 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
                     addTypeSegments(t.returnType)
                 }
                 is MiniTypeVar -> { /* name is in range; could be highlighted as TYPE as well */
-                    if (t.range.start.source == source)
                     putMiniRange(t.range, LyngHighlighterColors.TYPE)
                 }
                 null -> {}
             }
         }
-        fun addDeclTypeSegments(d: MiniDecl) {
-            if (d.nameStart.source != source) return
+        for (d in mini.declarations) {
             when (d) {
                 is MiniFunDecl -> {
                     addTypeSegments(d.returnType)
@@ -168,23 +167,10 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
                 is MiniClassDecl -> {
                     d.ctorFields.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 -> {}
             }
         }
-        mini.declarations.forEach { d -> addDeclTypeSegments(d) }
 
         ProgressManager.checkCanceled()
 
@@ -194,7 +180,7 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
 
             // Map declaration ranges to avoid duplicating them as usages
             val declKeys = HashSet<Pair<Int, Int>>(binding.symbols.size * 2)
-            binding.symbols.forEach { sym -> declKeys += (sym.declStart to sym.declEnd) }
+            for (sym in binding.symbols) declKeys += (sym.declStart to sym.declEnd)
 
             fun keyForKind(k: SymbolKind) = when (k) {
                 SymbolKind.Function -> LyngHighlighterColors.FUNCTION
@@ -207,57 +193,53 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
             // Track covered ranges to not override later heuristics
             val covered = HashSet<Pair<Int, Int>>()
 
-            binding.references.forEach { ref ->
+            for (ref in binding.references) {
                 val key = ref.start to ref.end
-                if (!declKeys.contains(key)) {
-                    val sym = binding.symbols.firstOrNull { it.id == ref.symbolId }
-                    if (sym != null) {
+                if (declKeys.contains(key)) continue
+                val sym = binding.symbols.firstOrNull { it.id == ref.symbolId } ?: continue
                 val color = keyForKind(sym.kind)
                 putRange(ref.start, ref.end, color)
                 covered += key
             }
-                }
-            }
 
             // Heuristics on top of binder: function call-sites and simple name-based roles
             ProgressManager.checkCanceled()
 
+            val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
+
+            fun isFollowedByParenOrBlock(rangeEnd: Int): Boolean {
+                var i = rangeEnd
+                while (i < text.length) {
+                    val ch = text[i]
+                    if (ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n') { i++; continue }
+                    return ch == '(' || ch == '{'
+                }
+                return false
+            }
+
             // Build simple name -> role map for top-level vals/vars and parameters
             val nameRole = HashMap<String, com.intellij.openapi.editor.colors.TextAttributesKey>(8)
-            mini.declarations.forEach { d ->
-                when (d) {
-                    is MiniValDecl -> nameRole[d.name] =
-                        if (d.mutable) LyngHighlighterColors.VARIABLE else LyngHighlighterColors.VALUE
-
+            for (d in mini.declarations) when (d) {
+                is MiniValDecl -> nameRole[d.name] = 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 -> {}
             }
-            }
 
-            tokens.forEach { s ->
-                if (s.kind == HighlightKind.Identifier) {
+            for (s in tokens) if (s.kind == HighlightKind.Identifier) {
                 val start = s.range.start
                 val end = s.range.endExclusive
                 val key = start to end
-                    if (key !in covered && key !in declKeys) {
+                if (key in covered || key in declKeys) continue
+
                 // Call-site detection first so it wins over var/param role
                 if (isFollowedByParenOrBlock(end)) {
                     putRange(start, end, LyngHighlighterColors.FUNCTION)
                     covered += key
-                        } else {
-                            // Simple role by known names
-                            val ident = try {
-                                text.substring(start, end)
-                            } catch (_: Throwable) {
-                                null
+                    continue
                 }
+
+                // Simple role by known names
+                val ident = try { text.substring(start, end) } catch (_: Throwable) { null }
                 if (ident != null) {
                     val roleKey = nameRole[ident]
                     if (roleKey != null) {
@@ -266,57 +248,30 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
                     }
                 }
             }
-                    }
-                }
-            }
         } catch (e: Throwable) {
             // Must rethrow cancellation; otherwise ignore binder failures (best-effort)
             if (e is com.intellij.openapi.progress.ProcessCanceledException) throw e
         }
 
-        // Add annotation/label coloring using token highlighter
+        // Add annotation coloring using token highlighter (treat @Label as annotation)
         run {
-            tokens.forEach { s ->
-                if (s.kind == HighlightKind.Label) {
+            val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
+            for (s in tokens) if (s.kind == HighlightKind.Label) {
                 val start = s.range.start
                 val end = s.range.endExclusive
                 if (start in 0..end && end <= text.length && start < end) {
-                        val lexeme = try {
-                            text.substring(start, end)
-                        } catch (_: Throwable) {
-                            null
-                        }
-                        if (lexeme != null) {
-                            // Heuristic: if it starts with @ and follows a control keyword, it's likely a label
-                            // Otherwise if it starts with @ it's an annotation.
-                            // If it ends with @ it's a loop label.
-                            when {
-                                lexeme.endsWith("@") -> putRange(start, end, LyngHighlighterColors.LABEL)
-                                lexeme.startsWith("@") -> {
-                                    // Try to see if it's an exit label
-                                    val prevNonWs = prevNonWs(text, start)
-                                    val prevWord = if (prevNonWs >= 0) {
-                                        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)) {
-                                        putRange(start, end, LyngHighlighterColors.LABEL)
-                                    } else {
+                    val lexeme = try { text.substring(start, end) } catch (_: Throwable) { null }
+                    if (lexeme != null && lexeme.startsWith("@")) {
                         putRange(start, end, LyngHighlighterColors.ANNOTATION)
                     }
                 }
             }
         }
-                    }
-                }
-            }
-        }
 
-        tokens.forEach { s ->
-            if (s.kind == HighlightKind.EnumConstant) {
+        // Map Enum constants from token highlighter to IDEA enum constant color
+        run {
+            val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
+            for (s in tokens) if (s.kind == HighlightKind.EnumConstant) {
                 val start = s.range.start
                 val end = s.range.endExclusive
                 if (start in 0..end && end <= text.length && start < end) {
@@ -325,19 +280,65 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
             }
         }
 
-        return Result(collectedInfo.modStamp, out, null)
+        // Build spell index payload: identifiers from symbols + references; comments/strings from simple highlighter
+        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) {
         if (annotationResult == null) return
         // Skip if cache is up-to-date
-        val combinedStamp = LyngAstManager.getCombinedStamp(file)
+        val doc = file.viewProvider.document
+        val currentStamp = doc?.modificationStamp
         val cached = file.getUserData(CACHE_KEY)
-        val result = if (cached != null && cached.modStamp == combinedStamp) cached else annotationResult
+        val result = if (cached != null && currentStamp != null && cached.modStamp == currentStamp) cached else annotationResult
         file.putUserData(CACHE_KEY, result)
 
-        val doc = file.viewProvider.document
+        // Store spell index for spell/grammar engines to consume (suspend until ready)
+        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) {
             holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
@@ -363,16 +364,6 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
         private val CACHE_KEY: Key<Result> = Key.create("LYNG_SEMANTIC_CACHE")
     }
 
-    private fun prevNonWs(text: String, idxExclusive: Int): Int {
-        var i = idxExclusive - 1
-        while (i >= 0) {
-            val ch = text[i]
-            if (ch != ' ' && ch != '\t' && ch != '\n' && ch != '\r') return i
-            i--
-        }
-        return -1
-    }
-
     /**
      * Make the error highlight a bit wider than a single character so it is easier to see and click.
      * Strategy:

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/completion/LyngCompletionContributor.kt

@@ -30,6 +30,7 @@ import com.intellij.patterns.PlatformPatterns
 import com.intellij.psi.PsiFile
 import com.intellij.util.ProcessingContext
 import kotlinx.coroutines.runBlocking
+import net.sergeych.lyng.highlight.offsetOf
 import net.sergeych.lyng.idea.LyngLanguage
 import net.sergeych.lyng.idea.highlight.LyngTokenTypes
 import net.sergeych.lyng.idea.settings.LyngFormatterSettings
@@ -102,7 +103,7 @@ class LyngCompletionContributor : CompletionContributor() {
 
             // Delegate computation to the shared engine to keep behavior in sync with tests
             val engineItems = try {
-                runBlocking { CompletionEngineLight.completeSuspend(text, caret, mini, binding) }
+                runBlocking { CompletionEngineLight.completeSuspend(text, caret) }
             } catch (t: Throwable) {
                 if (DEBUG_COMPLETION) log.warn("[LYNG_DEBUG] Engine completion failed: ${t.message}")
                 emptyList()
@@ -116,7 +117,7 @@ class LyngCompletionContributor : CompletionContributor() {
             if (memberDotPos != null && engineItems.isEmpty()) {
                 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
-                val fromText = DocLookupUtils.extractImportsFromText(text)
+                val fromText = extractImportsFromText(text)
                 val imported = LinkedHashSet<String>().apply {
                     fromText.forEach { add(it) }
                     add("lyng.stdlib")
@@ -143,6 +144,11 @@ class LyngCompletionContributor : CompletionContributor() {
                 }
             }
 
+            // In global context, add params in scope first (engine does not include them)
+            if (memberDotPos == null && mini != null) {
+                offerParamsInScope(emit, mini, text, caret)
+            }
+
             // Render engine items
             for (ci in engineItems) {
                 val builder = when (ci.kind) {
@@ -161,22 +167,18 @@ class LyngCompletionContributor : CompletionContributor() {
                     Kind.Enum -> LookupElementBuilder.create(ci.name)
                         .withIcon(AllIcons.Nodes.Enum)
                     Kind.Value -> LookupElementBuilder.create(ci.name)
-                        .withIcon(AllIcons.Nodes.Variable)
+                        .withIcon(AllIcons.Nodes.Field)
                         .let { b -> if (!ci.typeText.isNullOrBlank()) b.withTypeText(ci.typeText, true) else b }
                     Kind.Field -> LookupElementBuilder.create(ci.name)
                         .withIcon(AllIcons.Nodes.Field)
                         .let { b -> if (!ci.typeText.isNullOrBlank()) b.withTypeText(ci.typeText, true) else b }
                 }
-                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
             if (memberDotPos != null) {
                 val existing = engineItems.map { it.name }.toMutableSet()
-                val fromText = DocLookupUtils.extractImportsFromText(text)
+                val fromText = extractImportsFromText(text)
                 val imported = LinkedHashSet<String>().apply {
                     fromText.forEach { add(it) }
                     add("lyng.stdlib")
@@ -189,51 +191,33 @@ class LyngCompletionContributor : CompletionContributor() {
                         ?: DocLookupUtils.guessReturnClassAcrossKnownCallees(text, memberDotPos, imported, mini)
                         ?: DocLookupUtils.guessReceiverClass(text, memberDotPos, imported, mini)
                 if (!inferredClass.isNullOrBlank()) {
-                    val ext = DocLookupUtils.collectExtensionMemberNames(imported, inferredClass, mini)
-                    if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Post-engine extension check for $inferredClass: ${ext}")
+                    val ext = BuiltinDocRegistry.extensionMemberNamesFor(inferredClass)
+                    if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Post-engine extension check for $inferredClass: ${'$'}{ext}")
                     for (name in ext) {
                         if (existing.contains(name)) continue
                         val resolved = DocLookupUtils.resolveMemberWithInheritance(imported, inferredClass, name, mini)
                         if (resolved != null) {
-                            val m = resolved.second
-                            val builder = when (m) {
+                            when (val member = resolved.second) {
                                 is MiniMemberFunDecl -> {
-                                    val params = m.params.joinToString(", ") { it.name }
-                                    val ret = typeOf(m.returnType)
-                                    LookupElementBuilder.create(name)
+                                    val params = member.params.joinToString(", ") { it.name }
+                                    val ret = typeOf(member.returnType)
+                                    val builder = LookupElementBuilder.create(name)
                                         .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)
-                                        .withInsertHandler(ParenInsertHandler)
-                                }
-                                is MiniMemberValDecl -> {
-                                    LookupElementBuilder.create(name)
-                                        .withIcon(if (m.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field)
-                                        .withTypeText(typeOf(m.type), true)
-                                }
-                                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)
-                                }
-                            }
                                     emit(builder)
                                     existing.add(name)
+                                }
+                                is MiniMemberValDecl -> {
+                                    val builder = LookupElementBuilder.create(name)
+                                        .withIcon(if (member.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field)
+                                        .withTypeText(typeOf(member.type), true)
+                                    emit(builder)
+                                    existing.add(name)
+                                }
+                                is MiniInitDecl -> {}
+                            }
                         } else {
                             // Fallback: emit simple method name without detailed types
                             val builder = LookupElementBuilder.create(name)
@@ -249,7 +233,7 @@ class LyngCompletionContributor : CompletionContributor() {
             // If in member context and engine items are suspiciously sparse, try to enrich via local inference + offerMembers
             if (memberDotPos != null && engineItems.size < 3) {
                 if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Engine produced only ${engineItems.size} items in member context — trying enrichment")
-                val fromText = DocLookupUtils.extractImportsFromText(text)
+                val fromText = extractImportsFromText(text)
                 val imported = LinkedHashSet<String>().apply {
                     fromText.forEach { add(it) }
                     add("lyng.stdlib")
@@ -405,22 +389,17 @@ class LyngCompletionContributor : CompletionContributor() {
             }
             supplementPreferredBases(className)
 
-            fun emitGroup(map: LinkedHashMap<String, MutableList<MiniMemberDecl>>, groupPriority: Double) {
+            fun emitGroup(map: LinkedHashMap<String, MutableList<MiniMemberDecl>>) {
                 val keys = map.keys.sortedBy { it.lowercase() }
                 for (name in keys) {
                     val list = map[name] ?: continue
                     // 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
+                    // 1) Prefer a method with a known return type
+                    // 2) Else any method
+                    // 3) Else the first variant
                     val rep =
-                        list.asSequence().filterIsInstance<MiniMemberFunDecl>()
-                            .firstOrNull { it.returnType != null && it.params.isNotEmpty() }
-                            ?: list.asSequence().filterIsInstance<MiniMemberFunDecl>()
-                                .firstOrNull { it.params.isNotEmpty() }
-                            ?: list.asSequence().filterIsInstance<MiniMemberFunDecl>()
+                        list.asSequence()
+                            .filterIsInstance<MiniMemberFunDecl>()
                             .firstOrNull { it.returnType != null }
                             ?: list.firstOrNull { it is MiniMemberFunDecl }
                             ?: list.first()
@@ -437,12 +416,8 @@ class LyngCompletionContributor : CompletionContributor() {
                                 .withTailText(tail, true)
                                 .withTypeText(ret, true)
                                 .withInsertHandler(ParenInsertHandler)
-                            if (groupPriority != 0.0) {
-                                emit(PrioritizedLookupElement.withPriority(builder, groupPriority))
-                            } else {
                             emit(builder)
                         }
-                        }
                         is MiniMemberValDecl -> {
                             val icon = if (rep.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field
                             // Prefer a field variant with known type if available
@@ -452,20 +427,16 @@ class LyngCompletionContributor : CompletionContributor() {
                             val builder = LookupElementBuilder.create(name)
                                 .withIcon(icon)
                                 .withTypeText(typeOf(chosen.type), true)
-                            if (groupPriority != 0.0) {
-                                emit(PrioritizedLookupElement.withPriority(builder, groupPriority))
-                            } else {
                             emit(builder)
                         }
-                        }
                         is MiniInitDecl -> {}
                     }
                 }
             }
 
             // Emit what we have first
-            emitGroup(directMap, 100.0)
-            emitGroup(inheritedMap, 0.0)
+            emitGroup(directMap)
+            emitGroup(inheritedMap)
 
             // If suggestions are suspiciously sparse for known container classes,
             // try to conservatively supplement using a curated list resolved via docs registry.
@@ -487,47 +458,30 @@ class LyngCompletionContributor : CompletionContributor() {
                 for (name in common) {
                     if (name in already) continue
                     // Try resolve across classes first to get types/params; if it fails, emit a synthetic safe suggestion.
-                    val resolved = DocLookupUtils.findMemberAcrossClasses(imported, name, mini)
+                    val resolved = DocLookupUtils.findMemberAcrossClasses(imported, name)
                     if (resolved != null) {
                         val member = resolved.second
-                        val builder = when (member) {
+                        when (member) {
                             is MiniMemberFunDecl -> {
                                 val params = member.params.joinToString(", ") { it.name }
                                 val ret = typeOf(member.returnType)
-                                LookupElementBuilder.create(name)
+                                val builder = LookupElementBuilder.create(name)
                                     .withIcon(AllIcons.Nodes.Method)
-                                    .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)
+                                    .withTailText("(${params})", true)
                                     .withTypeText(ret, true)
                                     .withInsertHandler(ParenInsertHandler)
+                                emit(builder)
+                                already.add(name)
                             }
                             is MiniMemberValDecl -> {
-                                LookupElementBuilder.create(name)
-                                    .withIcon(if (member.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field)
+                                val builder = LookupElementBuilder.create(name)
+                                    .withIcon(AllIcons.Nodes.Field)
                                     .withTypeText(typeOf(member.type), true)
-                            }
-                            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))
+                                emit(builder)
                                 already.add(name)
+                            }
+                            is MiniInitDecl -> {}
+                        }
                     } else {
                         // Synthetic fallback: method without detailed params/types to improve UX in absence of docs
                         val isProperty = name in setOf("size", "length")
@@ -540,7 +494,7 @@ class LyngCompletionContributor : CompletionContributor() {
                                 .withTailText("()", true)
                                 .withInsertHandler(ParenInsertHandler)
                         }
-                        emit(PrioritizedLookupElement.withPriority(builder, 50.0))
+                        emit(builder)
                         already.add(name)
                     }
                 }
@@ -554,64 +508,90 @@ class LyngCompletionContributor : CompletionContributor() {
                 for (name in ext) {
                     if (already.contains(name)) continue
                     // Try to resolve full signature via registry first to get params and return type
-                    val resolved = DocLookupUtils.resolveMemberWithInheritance(imported, className, name, mini)
+                    val resolved = DocLookupUtils.resolveMemberWithInheritance(imported, className, name)
                     if (resolved != null) {
-                        val m = resolved.second
-                        val builder = when (m) {
+                        when (val member = resolved.second) {
                             is MiniMemberFunDecl -> {
-                                val params = m.params.joinToString(", ") { it.name }
-                                val ret = typeOf(m.returnType)
-                                LookupElementBuilder.create(name)
+                                val params = member.params.joinToString(", ") { it.name }
+                                val ret = typeOf(member.returnType)
+                                val builder = LookupElementBuilder.create(name)
                                     .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)
-                                    .withInsertHandler(ParenInsertHandler)
-                            }
-                            is MiniMemberValDecl -> {
-                                LookupElementBuilder.create(name)
-                                    .withIcon(if (m.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field)
-                                    .withTypeText(typeOf(m.type), true)
-                            }
-                            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)
-                            }
-                        }
-                        emit(PrioritizedLookupElement.withPriority(builder, 50.0))
+                                emit(builder)
                                 already.add(name)
                                 continue
                             }
+                            is MiniMemberValDecl -> {
+                                val builder = LookupElementBuilder.create(name)
+                                    .withIcon(if (member.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field)
+                                    .withTypeText(typeOf(member.type), true)
+                                emit(builder)
+                                already.add(name)
+                                continue
+                            }
+                            is MiniInitDecl -> {}
+                        }
+                    }
                     // Fallback: emit without detailed types if we couldn't resolve
                     val builder = LookupElementBuilder.create(name)
                         .withIcon(AllIcons.Nodes.Method)
                         .withTailText("()", true)
                         .withInsertHandler(ParenInsertHandler)
-                    emit(PrioritizedLookupElement.withPriority(builder, 50.0))
+                    emit(builder)
                     already.add(name)
                 }
             }
         }
 
+        // --- MiniAst-based inference helpers ---
+
+        private fun offerParamsInScope(emit: (com.intellij.codeInsight.lookup.LookupElement) -> Unit, mini: MiniScript, text: String, caret: Int) {
+            val src = mini.range.start.source
+            // Find function whose body contains caret or whose whole range contains caret
+            val fns = mini.declarations.filterIsInstance<MiniFunDecl>()
+            for (fn in fns) {
+                val start = src.offsetOf(fn.range.start)
+                val end = src.offsetOf(fn.range.end).coerceAtMost(text.length)
+                if (caret in start..end) {
+                    for (p in fn.params) {
+                        val builder = LookupElementBuilder.create(p.name)
+                            .withIcon(AllIcons.Nodes.Variable)
+                            .withTypeText(typeOf(p.type), true)
+                        emit(builder)
+                    }
+                    return
+                }
+            }
+        }
+
+        // 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 {
-            val s = DocLookupUtils.typeOf(t)
-            return if (s.isEmpty()) "" else ": $s"
+            return when (t) {
+                null -> ""
+                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}"
+            }
         }
     }
 }

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/docs/LyngDocumentationProvider.kt

@@ -24,9 +24,13 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 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.idea.LyngLanguage
-import net.sergeych.lyng.idea.util.LyngAstManager
+import net.sergeych.lyng.idea.util.IdeLenientImportProvider
 import net.sergeych.lyng.idea.util.TextCtx
 import net.sergeych.lyng.miniast.*
 
@@ -65,66 +69,61 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
         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}")
 
-        // 1. Get merged mini-AST from Manager (handles local + .lyng.d merged declarations)
-        val mini = LyngAstManager.getMiniAst(file) ?: return null
-        val miniSource = mini.range.start.source
-        val imported = DocLookupUtils.canonicalImportedModules(mini, text)
+        // Build MiniAst for this file (fast and resilient). Best-effort; on failure continue with partial AST.
+        val sink = MiniAstBuilder()
+        val provider = IdeLenientImportProvider.create()
+        val src = Source("<ide>", 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
         // 1) Use unified declaration detection
         DocLookupUtils.findDeclarationAt(mini, offset, ident)?.let { (name, kind) ->
             if (DEBUG_LOG) log.info("[LYNG_DEBUG] QuickDoc: matched declaration '$name' kind=$kind")
             // Find the actual declaration object to render
-            mini.declarations.forEach { d ->
-                if (d.name == name) {
-                    val s: Int = miniSource.offsetOf(d.nameStart)
-                    if (s <= offset && s + d.name.length > offset) {
-                        return renderDeclDoc(d, text, mini, imported)
-                    }
+            for (d in mini.declarations) {
+                if (d.name == name && source.offsetOf(d.nameStart) <= offset && source.offsetOf(d.nameStart) + d.name.length > offset) {
+                    return renderDeclDoc(d)
                 }
                 // Handle members if it was a member
                 if (d is MiniClassDecl) {
-                    d.members.forEach { m ->
-                        if (m.name == name) {
-                            val s: Int = miniSource.offsetOf(m.nameStart)
-                            if (s <= offset && s + m.name.length > offset) {
+                    for (m in d.members) {
+                        if (m.name == name && source.offsetOf(m.nameStart) <= offset && source.offsetOf(m.nameStart) + m.name.length > offset) {
                             return when (m) {
                                 is MiniMemberFunDecl -> renderMemberFunDoc(d.name, m)
                                 is MiniMemberValDecl -> renderMemberValDoc(d.name, m)
-                                    else -> null
+                                is MiniInitDecl -> null
                             }
                         }
                     }
-                    }
-                    d.ctorFields.forEach { cf ->
-                        if (cf.name == name) {
-                            val s: Int = miniSource.offsetOf(cf.nameStart)
-                            if (s <= offset && s + cf.name.length > offset) {
+                    for (cf in d.ctorFields) {
+                        if (cf.name == name && source.offsetOf(cf.nameStart) <= offset && source.offsetOf(cf.nameStart) + cf.name.length > offset) {
                             // Render as a member val
                             val mv = MiniMemberValDecl(
                                 range = MiniRange(cf.nameStart, cf.nameStart), // dummy
                                 name = cf.name,
                                 mutable = cf.mutable,
                                 type = cf.type,
-                                    initRange = null,
                                 doc = null,
                                 nameStart = cf.nameStart
                             )
                             return renderMemberValDoc(d.name, mv)
                         }
                     }
-                    }
-                    d.classFields.forEach { cf ->
-                        if (cf.name == name) {
-                            val s: Int = miniSource.offsetOf(cf.nameStart)
-                            if (s <= offset && s + cf.name.length > offset) {
+                    for (cf in d.classFields) {
+                        if (cf.name == name && source.offsetOf(cf.nameStart) <= offset && source.offsetOf(cf.nameStart) + cf.name.length > offset) {
                             // Render as a member val
                             val mv = MiniMemberValDecl(
                                 range = MiniRange(cf.nameStart, cf.nameStart), // dummy
                                 name = cf.name,
                                 mutable = cf.mutable,
                                 type = cf.type,
-                                    initRange = null,
                                 doc = null,
                                 nameStart = cf.nameStart
                             )
@@ -132,30 +131,22 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
                         }
                     }
                 }
-                }
                 if (d is MiniEnumDecl) {
-                    if (d.entries.contains(name)) {
-                        val s: Int = miniSource.offsetOf(d.range.start)
-                        val e: Int = miniSource.offsetOf(d.range.end)
-                        if (offset >= s && offset <= e) {
+                    if (d.entries.contains(name) && offset >= source.offsetOf(d.range.start) && offset <= source.offsetOf(d.range.end)) {
                         // For enum constant, we don't have detailed docs in MiniAst yet, but we can render a title
-                            return renderTitle("enum constant ${d.name}.${name}")
-                        }
+                        return "<div class='doc-title'>enum constant ${d.name}.${name}</div>"
                     }
                 }
             }
             // Check parameters
-            mini.declarations.filterIsInstance<MiniFunDecl>().forEach { fn ->
-                fn.params.forEach { p ->
-                    if (p.name == name) {
-                        val s: Int = miniSource.offsetOf(p.nameStart)
-                        if (s <= offset && s + p.name.length > offset) {
+            for (fn in mini.declarations.filterIsInstance<MiniFunDecl>()) {
+                for (p in fn.params) {
+                    if (p.name == name && source.offsetOf(p.nameStart) <= offset && source.offsetOf(p.nameStart) + p.name.length > offset) {
                         return renderParamDoc(fn, p)
                     }
                 }
             }
         }
-        }
 
         // 3) usages in current file via Binder (resolves local variables, parameters, and classes)
         try {
@@ -165,72 +156,58 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
                 val sym = binding.symbols.firstOrNull { it.id == ref.symbolId }
                 if (sym != null) {
                     // Find local declaration that matches this symbol
-                    var dsFound: MiniDecl? = null
-                    mini.declarations.forEach { decl ->
-                        if (decl.name == sym.name) {
-                            val sOffset: Int = miniSource.offsetOf(decl.nameStart)
-                            if (sOffset == sym.declStart) {
-                                dsFound = decl
+                    val ds = mini.declarations.firstOrNull { decl ->
+                        val s = source.offsetOf(decl.nameStart)
+                        decl.name == sym.name && s == sym.declStart
                     }
-                        }
-                    }
-                    if (dsFound != null) return renderDeclDoc(dsFound, text, mini, imported)
+                    if (ds != null) return renderDeclDoc(ds)
 
                     // Check parameters
-                    mini.declarations.filterIsInstance<MiniFunDecl>().forEach { fn ->
-                        fn.params.forEach { p ->
-                            if (p.name == sym.name) {
-                                val sOffset: Int = miniSource.offsetOf(p.nameStart)
-                                if (sOffset == sym.declStart) {
+                    for (fn in mini.declarations.filterIsInstance<MiniFunDecl>()) {
+                        for (p in fn.params) {
+                            val s = source.offsetOf(p.nameStart)
+                            if (p.name == sym.name && s == sym.declStart) {
                                 return renderParamDoc(fn, p)
                             }
                         }
                     }
-                    }
 
                     // Check class members (fields/functions)
-                    mini.declarations.filterIsInstance<MiniClassDecl>().forEach { cls ->
-                        cls.members.forEach { m ->
-                            if (m.name == sym.name) {
-                                val sOffset: Int = miniSource.offsetOf(m.nameStart)
-                                if (sOffset == sym.declStart) {
+                    for (cls in mini.declarations.filterIsInstance<MiniClassDecl>()) {
+                        for (m in cls.members) {
+                            val s = source.offsetOf(m.nameStart)
+                            if (m.name == sym.name && s == sym.declStart) {
                                 return when (m) {
                                     is MiniMemberFunDecl -> renderMemberFunDoc(cls.name, m)
                                     is MiniMemberValDecl -> renderMemberValDoc(cls.name, m)
-                                        else -> null
+                                    is MiniInitDecl -> null
                                 }
                             }
                         }
-                        }
-                        cls.ctorFields.forEach { cf ->
-                            if (cf.name == sym.name) {
-                                val sOffset: Int = miniSource.offsetOf(cf.nameStart)
-                                if (sOffset == sym.declStart) {
+                        for (cf in cls.ctorFields) {
+                            val s = source.offsetOf(cf.nameStart)
+                            if (cf.name == sym.name && s == sym.declStart) {
                                 // Render as a member val
                                 val mv = MiniMemberValDecl(
                                     range = MiniRange(cf.nameStart, cf.nameStart), // dummy
                                     name = cf.name,
                                     mutable = cf.mutable,
                                     type = cf.type,
-                                        initRange = null,
                                     doc = null,
                                     nameStart = cf.nameStart
                                 )
                                 return renderMemberValDoc(cls.name, mv)
                             }
                         }
-                        }
-                        cls.classFields.forEach { cf ->
-                            if (cf.name == sym.name) {
-                                val sOffset: Int = miniSource.offsetOf(cf.nameStart)
-                                if (sOffset == sym.declStart) {
+                        for (cf in cls.classFields) {
+                            val s = source.offsetOf(cf.nameStart)
+                            if (cf.name == sym.name && s == sym.declStart) {
                                 // Render as a member val
                                 val mv = MiniMemberValDecl(
                                     range = MiniRange(cf.nameStart, cf.nameStart), // dummy
                                     name = cf.name,
                                     mutable = cf.mutable,
                                     type = cf.type,
-                                        initRange = null,
                                     doc = null,
                                     nameStart = cf.nameStart
                                 )
@@ -240,7 +217,6 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
                     }
                 }
             }
-            }
         } catch (e: Throwable) {
             if (DEBUG_LOG) log.warn("[LYNG_DEBUG] QuickDoc: local binder resolution failed: ${e.message}")
         }
@@ -284,9 +260,9 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
                         } else null
                     }
                     else -> {
-                        DocLookupUtils.guessReceiverClassViaMini(mini, text, dotPos, importedModules)
-                            ?: DocLookupUtils.guessClassFromCallBefore(text, dotPos, importedModules, mini)
-                            ?: run {
+                        val guessed = DocLookupUtils.guessClassFromCallBefore(text, dotPos, importedModules)
+                        if (guessed != null) guessed
+                        else {
                             // handle this@Type or as Type
                             val i2 = TextCtx.prevNonWs(text, dotPos - 1)
                             if (i2 >= 0) {
@@ -307,16 +283,12 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
                 }
                 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) {
-                    DocLookupUtils.resolveMemberWithInheritance(importedModules, className, ident, mini)?.let { (owner, member) ->
+                    DocLookupUtils.resolveMemberWithInheritance(importedModules, className, ident)?.let { (owner, member) ->
                         if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] QuickDoc: literal/call '$ident' resolved to $owner.${member.name}")
                         return when (member) {
                             is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
                             is MiniMemberValDecl -> renderMemberValDoc(owner, member)
                             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}")
@@ -327,7 +299,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
         // 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 {
             log.info("[LYNG_DEBUG] QuickDoc: fallback by name '${it.name}' kind=${it::class.simpleName}")
-            return renderDeclDoc(it, text, mini, imported)
+            return renderDeclDoc(it)
         }
 
         // 4) Consult BuiltinDocRegistry for imported modules (top-level and class members)
@@ -347,13 +319,13 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
                 if (arity != null && chosen.params.size != arity && matches.size > 1) {
                     return renderOverloads(ident, matches)
                 }
-                return renderDeclDoc(chosen, text, mini, imported)
+                return renderDeclDoc(chosen)
             }
             // Also allow values/consts
-            docs.filterIsInstance<MiniValDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it, text, mini, imported) }
+            docs.filterIsInstance<MiniValDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it) }
             // And classes/enums
-            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, text, mini, imported) }
+            docs.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it) }
+            docs.filterIsInstance<MiniEnumDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it) }
         }
         // Defensive fallback: if nothing found and it's a well-known stdlib function, render minimal inline docs
         if (ident == "println" || ident == "print") {
@@ -361,22 +333,18 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
                 "Print values to the standard output and append a newline. Accepts any number of arguments." else
                 "Print values to the standard output without a trailing newline. Accepts any number of arguments."
             val title = "function $ident(values)"
-            return renderTitle(title) + styledMarkdown(htmlEscape(fallback))
+            return "<div class='doc-title'>${htmlEscape(title)}</div>" + styledMarkdown(htmlEscape(fallback))
         }
         // 4b) try class members like ClassName.member with inheritance fallback
         val lhs = previousWordBefore(text, idRange.startOffset)
         if (lhs != null && hasDotBetween(text, lhs.endOffset, idRange.startOffset)) {
             val className = text.substring(lhs.startOffset, lhs.endOffset)
-            DocLookupUtils.resolveMemberWithInheritance(importedModules, className, ident, mini)?.let { (owner, member) ->
+            DocLookupUtils.resolveMemberWithInheritance(importedModules, className, ident)?.let { (owner, member) ->
                 if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Inheritance resolved $className.$ident to $owner.${member.name}")
                 return when (member) {
                     is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
                     is MiniMemberValDecl -> renderMemberValDoc(owner, member)
                     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 {
@@ -387,19 +355,15 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
             if (dotPos != null) {
                 val guessed = when {
                     looksLikeListLiteralBefore(text, dotPos) -> "List"
-                    else -> DocLookupUtils.guessClassFromCallBefore(text, dotPos, importedModules, mini)
+                    else -> DocLookupUtils.guessClassFromCallBefore(text, dotPos, importedModules)
                 }
                 if (guessed != null) {
-                    DocLookupUtils.resolveMemberWithInheritance(importedModules, guessed, ident, mini)?.let { (owner, member) ->
+                    DocLookupUtils.resolveMemberWithInheritance(importedModules, guessed, ident)?.let { (owner, member) ->
                         if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Heuristic '$guessed.$ident' resolved via inheritance to $owner.${member.name}")
                         return when (member) {
                             is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
                             is MiniMemberValDecl -> renderMemberValDoc(owner, member)
                             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 {
@@ -407,23 +371,19 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
                     run {
                         val candidates = listOf("String", "Iterable", "Iterator", "List", "Collection", "Array", "Dict", "Regex")
                         for (c in candidates) {
-                            DocLookupUtils.resolveMemberWithInheritance(importedModules, c, ident, mini)?.let { (owner, member) ->
+                            DocLookupUtils.resolveMemberWithInheritance(importedModules, c, ident)?.let { (owner, member) ->
                                 if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Candidate '$c.$ident' resolved via inheritance to $owner.${member.name}")
                                 return when (member) {
                                     is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
                                     is MiniMemberValDecl -> renderMemberValDoc(owner, member)
                                     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)
                     run {
-                        val classes = DocLookupUtils.aggregateClasses(importedModules, mini)
+                        val classes = DocLookupUtils.aggregateClasses(importedModules)
                         val stringCls = classes["String"]
                         val m = stringCls?.members?.firstOrNull { it.name == ident }
                         if (m != null) {
@@ -436,16 +396,12 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
                         }
                     }
                     // Search across classes; prefer Iterable, then Iterator, then List for common ops
-                    DocLookupUtils.findMemberAcrossClasses(importedModules, ident, mini)?.let { (owner, member) ->
+                    DocLookupUtils.findMemberAcrossClasses(importedModules, ident)?.let { (owner, member) ->
                         if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Cross-class '$ident' resolved to $owner.${member.name}")
                         return when (member) {
                             is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
                             is MiniMemberValDecl -> renderMemberValDoc(owner, member)
                             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)
                         }
                     }
                 }
@@ -461,39 +417,25 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
     private fun ensureExternalDocsRegistered() { @Suppress("UNUSED_EXPRESSION") externalDocsLoaded }
 
     private fun tryLoadExternalDocs(): Boolean {
-        var anyLoaded = false
-        try {
+        return try {
             // Try known registrars; ignore failures if module is absent
             val cls = Class.forName("net.sergeych.lyngio.docs.FsBuiltinDocs")
             val m = cls.getMethod("ensure")
             m.invoke(null)
             log.info("[LYNG_DEBUG] QuickDoc: external docs loaded: net.sergeych.lyngio.docs.FsBuiltinDocs.ensure() OK")
-            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] QuickDoc: external docs loaded: net.sergeych.lyngio.docs.ProcessBuiltinDocs.ensure() OK")
-            anyLoaded = true
-        } catch (_: Throwable) {}
-
-        if (!anyLoaded) {
+            true
+        } catch (_: Throwable) {
             // Seed a minimal plugin-local fallback so Path docs still work without lyngio
             val seeded = try {
                 FsDocsFallback.ensureOnce()
-                ProcessDocsFallback.ensureOnce()
-                true
             } catch (_: Throwable) { false }
             if (seeded) {
-                log.info("[LYNG_DEBUG] QuickDoc: external docs NOT found; seeded plugin fallbacks")
+                log.info("[LYNG_DEBUG] QuickDoc: external docs NOT found; seeded plugin fallback for lyng.io.fs")
             } else {
                 log.info("[LYNG_DEBUG] QuickDoc: external docs NOT found (lyngio absent on classpath)")
             }
-            return seeded
+            seeded
         }
-        return true
     }
 
     override fun getCustomDocumentationElement(
@@ -507,37 +449,25 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
         return contextElement ?: file.findElementAt(targetOffset)
     }
 
-    private fun renderDeclDoc(d: MiniDecl, text: String, mini: MiniScript, imported: List<String>): String {
+    private fun renderDeclDoc(d: MiniDecl): String {
         val title = when (d) {
             is MiniFunDecl -> "function ${d.name}${signatureOf(d)}"
             is MiniClassDecl -> "class ${d.name}"
             is MiniEnumDecl -> "enum ${d.name} { ${d.entries.joinToString(", ")} }"
-            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}"
-            }
+            is MiniValDecl -> if (d.mutable) "var ${d.name}${typeOf(d.type)}" else "val ${d.name}${typeOf(d.type)}"
         }
+        // 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()
-        sb.append(renderTitle(title))
-        sb.append(renderDocBody(d.doc))
+        sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
+        if (!doc.isNullOrBlank()) sb.append(styledMarkdown(doc))
         return sb.toString()
     }
 
     private fun renderParamDoc(fn: MiniFunDecl, p: MiniParam): String {
         val title = "parameter ${p.name}${typeOf(p.type)} in ${fn.name}${signatureOf(fn)}"
-        val sb = StringBuilder()
-        sb.append(renderTitle(title))
-
-        // 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()
+        return "<div class='doc-title'>${htmlEscape(title)}</div>"
     }
 
     private fun renderMemberFunDoc(className: String, m: MiniMemberFunDecl): String {
@@ -548,26 +478,37 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
         val ret = typeOf(m.returnType)
         val staticStr = if (m.isStatic) "static " else ""
         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()
-        sb.append(renderTitle(title))
-        sb.append(renderDocBody(m.doc))
+        sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
+        if (!doc.isNullOrBlank()) sb.append(styledMarkdown(doc))
         return sb.toString()
     }
 
     private fun renderMemberValDoc(className: String, m: MiniMemberValDecl): String {
-        val ts = if (m.type == null) ": Object?" else typeOf(m.type)
+        val ts = typeOf(m.type)
         val kind = if (m.mutable) "var" else "val"
         val staticStr = if (m.isStatic) "static " else ""
         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()
-        sb.append(renderTitle(title))
-        sb.append(renderDocBody(m.doc))
+        sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
+        if (!doc.isNullOrBlank()) sb.append(styledMarkdown(doc))
         return sb.toString()
     }
 
-    private fun typeOf(t: MiniTypeRef?): String {
-        val s = DocLookupUtils.typeOf(t)
-        return if (s.isEmpty()) (if (t == null) ": Object?" else "") else ": $s"
+    private fun typeOf(t: MiniTypeRef?): String = when (t) {
+        is MiniTypeName -> ": ${t.segments.joinToString(".") { it.name }}${if (t.nullable) "?" else ""}"
+        is MiniGenericType -> {
+            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 {
@@ -579,10 +520,6 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
         return "(${params})${ret}"
     }
 
-    private fun renderTitle(title: String): String {
-        return "<div class='doc-title' style='margin-bottom: 0.8em;'>${htmlEscape(title)}</div>"
-    }
-
     private fun htmlEscape(s: String): String = buildString(s.length) {
         for (ch in s) append(
             when (ch) {
@@ -649,7 +586,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
 
     private fun renderOverloads(name: String, overloads: List<MiniFunDecl>): String {
         val sb = StringBuilder()
-        sb.append(renderTitle("Overloads for $name"))
+        sb.append("<div class='doc-title'>Overloads for ").append(htmlEscape(name)).append("</div>")
         sb.append("<ul>")
         overloads.forEach { fn ->
             sb.append("<li><code>")
@@ -671,64 +608,11 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
         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? {
-        // skip spaces and the dot to the left, but stop after hitting a non-identifier boundary
+        // skip spaces and dots to the left, but stop after hitting a non-identifier or dot boundary
         var i = (offset - 1).coerceAtLeast(0)
-        // skip trailing spaces
-        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--
+        // first, move left past spaces
+        while (i > 0 && text[i].isWhitespace()) i--
         // remember position to check for dot between words
         val end = i + 1
         // now find the start of the identifier

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/docs/ProcessDocsFallback.kt

@@ -1,69 +0,0 @@
-/*
- * 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
-        }
-    }
-}

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/grazie/AddToLyngDictionaryFix.kt

@@ -0,0 +1,43 @@
+/*
+ * 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)
+    }
+}

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/grazie/EnglishDictionary.kt

@@ -0,0 +1,83 @@
+/*
+ * 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
+    }
+}

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/grazie/LyngGrazieAnnotator.kt

@@ -0,0 +1,609 @@
+/*
+ * 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]
+    }
+}

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/grazie/LyngGrazieStrategy.kt

@@ -0,0 +1,139 @@
+/*
+ * 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)
+    }
+}

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/grazie/LyngTextExtractor.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * 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.
@@ -19,29 +19,86 @@ package net.sergeych.lyng.idea.grazie
 import com.intellij.grazie.text.TextContent
 import com.intellij.grazie.text.TextContent.TextDomain
 import com.intellij.grazie.text.TextExtractor
+import com.intellij.openapi.diagnostic.Logger
 import com.intellij.psi.PsiElement
 import net.sergeych.lyng.idea.highlight.LyngTokenTypes
-import net.sergeych.lyng.idea.psi.LyngElementTypes
+import net.sergeych.lyng.idea.settings.LyngFormatterSettings
+import net.sergeych.lyng.idea.spell.LyngSpellIndex
 
 /**
- * Simplified TextExtractor for Lyng.
- * Designates areas for Natural Languages (Grazie) to check.
+ * Provides Grazie with extractable text for Lyng PSI elements.
+ * We return text for identifiers, comments, and (optionally) string literals.
+ * printf-like specifiers are filtered by the Grammar strategy via stealth ranges.
  */
 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? {
         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
 
-        val domain = when (type) {
+        fun overlaps(list: List<com.intellij.openapi.util.TextRange>): Boolean = r != null && list.any { it.intersects(r) }
+
+        // Decide target domain by intersection with our MiniAst-driven index; prefer comments > strings > identifiers
+        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
-            LyngTokenTypes.STRING -> TextDomain.LITERALS
-            LyngElementTypes.NAME_IDENTIFIER,
-            LyngElementTypes.PARAMETER_NAME,
-            LyngElementTypes.ENUM_CONSTANT_NAME -> TextDomain.COMMENTS
-            else -> return null
+                else -> null
             }
+        }
+        if (domain == null) return null
 
-        if (!allowedDomains.contains(domain)) return null
-        
-        return TextContent.psiFragment(domain, element)
+        // If literals aren't requested but fallback is enabled, route strings as COMMENTS
+        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
+        }
     }
 }

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/grazie/ReplaceWordFix.kt

@@ -0,0 +1,86 @@
+/*
+ * 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
+        }
+    }
+}

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/grazie/TechDictionary.kt

@@ -0,0 +1,77 @@
+/*
+ * 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
+    }
+}

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/highlight/LyngColorSettingsPage.kt

@@ -43,15 +43,10 @@ class LyngColorSettingsPage : ColorSettingsPage {
         }
         
         var counter = 0
-        outer@ while (counter < 10) {
-          if (counter == 5) return@outer
         counter = counter + 1
-        }
     """.trimIndent()
 
-    override fun getAdditionalHighlightingTagToDescriptorMap(): MutableMap<String, TextAttributesKey> = mutableMapOf(
-        "label" to LyngHighlighterColors.LABEL
-    )
+    override fun getAdditionalHighlightingTagToDescriptorMap(): MutableMap<String, TextAttributesKey>? = null
 
     override fun getAttributeDescriptors(): Array<AttributesDescriptor> = arrayOf(
         AttributesDescriptor("Keyword", LyngHighlighterColors.KEYWORD),
@@ -63,7 +58,6 @@ class LyngColorSettingsPage : ColorSettingsPage {
         AttributesDescriptor("Punctuation", LyngHighlighterColors.PUNCT),
         // Semantic
         AttributesDescriptor("Annotation (semantic)", LyngHighlighterColors.ANNOTATION),
-        AttributesDescriptor("Label (semantic)", LyngHighlighterColors.LABEL),
         AttributesDescriptor("Variable (semantic)", LyngHighlighterColors.VARIABLE),
         AttributesDescriptor("Value (semantic)", LyngHighlighterColors.VALUE),
         AttributesDescriptor("Function (semantic)", LyngHighlighterColors.FUNCTION),

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/highlight/LyngHighlighterColors.kt

@@ -82,9 +82,4 @@ object LyngHighlighterColors {
     val ENUM_CONSTANT: TextAttributesKey = TextAttributesKey.createTextAttributesKey(
         "LYNG_ENUM_CONSTANT", DefaultLanguageHighlighterColors.STATIC_FIELD
     )
-
-    // Labels (label@ or @label used as exit target)
-    val LABEL: TextAttributesKey = TextAttributesKey.createTextAttributesKey(
-        "LYNG_LABEL", DefaultLanguageHighlighterColors.LABEL
-    )
 }

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/highlight/LyngLexer.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * 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.
@@ -33,10 +33,10 @@ class LyngLexer : LexerBase() {
 
     private val keywords = setOf(
         "fun", "val", "var", "class", "interface", "type", "import", "as",
-        "abstract", "closed", "override", "static", "extern", "open", "private", "protected",
+        "abstract", "closed", "override",
         "if", "else", "for", "while", "return", "true", "false", "null",
         "when", "in", "is", "break", "continue", "try", "catch", "finally",
-        "get", "set", "object", "enum", "init", "by", "property", "constructor"
+        "get", "set"
     )
 
     override fun start(buffer: CharSequence, startOffset: Int, endOffset: Int, initialState: Int) {
@@ -101,9 +101,8 @@ class LyngLexer : LexerBase() {
             return
         }
 
-        // String "..." or '...' with simple escape handling
-        if (ch == '"' || ch == '\'') {
-            val quote = ch
+        // String "..." with simple escape handling
+        if (ch == '"') {
             i++
             while (i < endOffset) {
                 val c = buffer[i]
@@ -111,7 +110,7 @@ class LyngLexer : LexerBase() {
                     i += 2
                     continue
                 }
-                if (c == quote) { i++; break }
+                if (c == '"') { i++; break }
                 i++
             }
             myTokenEnd = i
@@ -121,39 +120,12 @@ class LyngLexer : LexerBase() {
 
         // Number
         if (ch.isDigit()) {
-            // Check for hex: 0x...
-            if (ch == '0' && i + 1 < endOffset && buffer[i + 1] == 'x') {
-                i += 2
-                while (i < endOffset && (buffer[i].isDigit() || buffer[i] in 'a'..'f' || buffer[i] in 'A'..'F')) i++
-                myTokenEnd = i
-                myTokenType = LyngTokenTypes.NUMBER
-                return
-            }
-
-            // Decimal or integer
             i++
             var hasDot = false
-            var hasE = false
             while (i < endOffset) {
                 val c = buffer[i]
-                if (c.isDigit() || c == '_') {
-                    i++
-                    continue
-                }
-                if (c == '.' && !hasDot && !hasE) {
-                    // Check if it's a fractional part (must be followed by a digit)
-                    if (i + 1 < endOffset && buffer[i + 1].isDigit()) {
-                        hasDot = true
-                        i++
-                        continue
-                    }
-                }
-                if ((c == 'e' || c == 'E') && !hasE) {
-                    hasE = true
-                    i++
-                    if (i < endOffset && (buffer[i] == '+' || buffer[i] == '-')) i++
-                    continue
-                }
+                if (c.isDigit()) { i++; continue }
+                if (c == '.' && !hasDot) { hasDot = true; i++; continue }
                 break
             }
             myTokenEnd = i
@@ -161,24 +133,10 @@ class LyngLexer : LexerBase() {
             return
         }
 
-        // Labels / Annotations: @label or label@
-        if (ch == '@') {
-            i++
-            while (i < endOffset && (buffer[i].isIdentifierPart())) i++
-            myTokenEnd = i
-            myTokenType = LyngTokenTypes.LABEL
-            return
-        }
-
+        // Identifier / keyword
         if (ch.isIdentifierStart()) {
             i++
             while (i < endOffset && buffer[i].isIdentifierPart()) i++
-            if (i < endOffset && buffer[i] == '@') {
-                i++
-                myTokenEnd = i
-                myTokenType = LyngTokenTypes.LABEL
-                return
-            }
             myTokenEnd = i
             val text = buffer.subSequence(myTokenStart, myTokenEnd).toString()
             myTokenType = if (text in keywords) LyngTokenTypes.KEYWORD else LyngTokenTypes.IDENTIFIER
@@ -188,35 +146,6 @@ class LyngLexer : LexerBase() {
         // Punctuation
         if (isPunct(ch)) {
             i++
-            // Handle common multi-char operators for better highlighting
-            when (ch) {
-                '.' -> {
-                    if (i < endOffset && buffer[i] == '.') {
-                        i++
-                        if (i < endOffset && (buffer[i] == '.' || buffer[i] == '<')) i++
-                    }
-                }
-                '=' -> {
-                    if (i < endOffset && (buffer[i] == '=' || buffer[i] == '>' || buffer[i] == '~')) {
-                        i++
-                        if (buffer[i - 1] == '=' && i < endOffset && buffer[i] == '=') i++
-                    }
-                }
-                '+', '-', '*', '/', '%', '!', '<', '>', '&', '|', '?', ':', '^' -> {
-                    if (i < endOffset) {
-                        val next = buffer[i]
-                        if (next == '=' || next == ch) {
-                            i++
-                            if (ch == '<' && next == '=' && i < endOffset && buffer[i] == '>') i++
-                            if (ch == '!' && next == '=' && i < endOffset && buffer[i] == '=') i++
-                        } else if (ch == '?' && (next == '.' || next == '[' || next == '(' || next == '{' || next == ':' || next == '?')) {
-                            i++
-                        } else if (ch == '-' && next == '>') {
-                            i++
-                        }
-                    }
-                }
-            }
             myTokenEnd = i
             myTokenType = LyngTokenTypes.PUNCT
             return
@@ -231,5 +160,5 @@ class LyngLexer : LexerBase() {
     private fun Char.isDigit(): Boolean = this in '0'..'9'
     private fun Char.isIdentifierStart(): Boolean = this == '_' || this.isLetter()
     private fun Char.isIdentifierPart(): Boolean = this.isIdentifierStart() || this.isDigit()
-    private fun isPunct(c: Char): Boolean = c in setOf('(', ')', '{', '}', '[', ']', '.', ',', ';', ':', '+', '-', '*', '/', '%', '=', '<', '>', '!', '?', '&', '|', '^', '~', '@')
+    private fun isPunct(c: Char): Boolean = c in setOf('(', ')', '{', '}', '[', ']', '.', ',', ';', ':', '+', '-', '*', '/', '%', '=', '<', '>', '!', '?', '&', '|', '^', '~')
 }

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/highlight/LyngSyntaxHighlighter.kt

@@ -33,7 +33,6 @@ class LyngSyntaxHighlighter : SyntaxHighlighter {
         LyngTokenTypes.BLOCK_COMMENT -> pack(LyngHighlighterColors.BLOCK_COMMENT)
         LyngTokenTypes.PUNCT -> pack(LyngHighlighterColors.PUNCT)
         LyngTokenTypes.IDENTIFIER -> pack(LyngHighlighterColors.IDENTIFIER)
-        LyngTokenTypes.LABEL -> pack(LyngHighlighterColors.LABEL)
         else -> emptyArray()
     }
 

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/highlight/LyngTokenTypes.kt

@@ -29,7 +29,6 @@ object LyngTokenTypes {
     val NUMBER = LyngTokenType("NUMBER")
     val KEYWORD = LyngTokenType("KEYWORD")
     val IDENTIFIER = LyngTokenType("IDENTIFIER")
-    val LABEL = LyngTokenType("LABEL")
     val PUNCT = LyngTokenType("PUNCT")
     val BAD_CHAR = LyngTokenType("BAD_CHAR")
 }

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/navigation/LyngGotoDeclarationHandler.kt

@@ -20,14 +20,13 @@ package net.sergeych.lyng.idea.navigation
 import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler
 import com.intellij.openapi.editor.Editor
 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.
  */
 class LyngGotoDeclarationHandler : GotoDeclarationHandler {
     override fun getGotoDeclarationTargets(sourceElement: PsiElement?, offset: Int, editor: Editor?): Array<PsiElement>? {
-        if (sourceElement == null || sourceElement.language != LyngLanguage) return null
+        if (sourceElement == null) return null
         
         val allTargets = mutableListOf<PsiElement>()
 

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/navigation/LyngPsiReference.kt

@@ -38,18 +38,16 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
 
         val mini = LyngAstManager.getMiniAst(file) ?: return emptyArray()
         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)
         val dotPos = TextCtx.findDotLeft(text, offset)
         if (dotPos != null) {
-            val receiverClass = DocLookupUtils.guessReceiverClassViaMini(mini, text, dotPos, imported.toList(), binding)
-                ?: DocLookupUtils.guessReceiverClass(text, dotPos, imported.toList(), mini)
+            val imported = DocLookupUtils.canonicalImportedModules(mini, text)
+            val receiverClass = DocLookupUtils.guessReceiverClassViaMini(mini, text, dotPos, imported, binding)
+                ?: DocLookupUtils.guessReceiverClass(text, dotPos, imported, mini)
             
             if (receiverClass != null) {
-                val resolved = DocLookupUtils.resolveMemberWithInheritance(imported.toList(), receiverClass, name, mini)
+                val resolved = DocLookupUtils.resolveMemberWithInheritance(imported, receiverClass, name, mini)
                 if (resolved != null) {
                     val owner = resolved.first
                     val member = resolved.second
@@ -65,10 +63,6 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
                                 is MiniMemberFunDecl -> "Function"
                                 is MiniMemberValDecl -> if (member.mutable) "Variable" else "Value"
                                 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)))
                         }
@@ -77,7 +71,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 (results.isEmpty()) {
-                results.addAll(resolveGlobally(file.project, name, membersOnly = true, allowedPackages = allowedPackages))
+                results.addAll(resolveGlobally(file.project, name, membersOnly = true))
             }
         } else {
             // 2. Local resolution via Binder
@@ -96,7 +90,7 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
             // 3. Global project scan
             // Only search globally if we haven't found a strong local match
             if (results.isEmpty()) {
-                results.addAll(resolveGlobally(file.project, name, allowedPackages = allowedPackages))
+                results.addAll(resolveGlobally(file.project, name))
             }
         }
 
@@ -143,16 +137,6 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
         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? {
         val results = multiResolve(false)
         if (results.isEmpty()) return null
@@ -166,20 +150,13 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
         return target
     }
 
-    private fun resolveGlobally(project: Project, name: String, membersOnly: Boolean = false, allowedPackages: Set<String>? = null): List<ResolveResult> {
+    private fun resolveGlobally(project: Project, name: String, membersOnly: Boolean = false): List<ResolveResult> {
         val results = mutableListOf<ResolveResult>()
         val files = FilenameIndex.getAllFilesByExt(project, "lyng", GlobalSearchScope.projectScope(project))
         val psiManager = PsiManager.getInstance(project)
 
         for (vFile in files) {
             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 src = mini.range.start.source
 

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/psi/LyngElementTypes.kt

@@ -1,27 +0,0 @@
-/*
- * 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)
-}

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/psi/LyngParserDefinition.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * 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.
@@ -45,68 +45,7 @@ class LyngParserDefinition : ParserDefinition {
 
     override fun createParser(project: Project?): PsiParser = PsiParser { root, builder ->
         val mark: PsiBuilder.Marker = builder.mark()
-        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()
-        }
+        while (!builder.eof()) builder.advanceLexer()
         mark.done(root)
         builder.treeBuilt
     }

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/settings/LyngFormatterSettings.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * 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.
@@ -32,6 +32,24 @@ class LyngFormatterSettings(private val project: Project) : PersistentStateCompo
         var reindentClosedBlockOnEnter: Boolean = true,
         var reindentPastedBlocks: Boolean = true,
         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)
         var enableLyngCompletionExperimental: Boolean = true,
     )
@@ -64,6 +82,42 @@ class LyngFormatterSettings(private val project: Project) : PersistentStateCompo
         get() = myState.normalizeBlockCommentIndent
         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
         get() = myState.enableLyngCompletionExperimental
         set(value) { myState.enableLyngCompletionExperimental = value }

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/settings/LyngFormatterSettingsConfigurable.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * 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.
@@ -30,6 +30,14 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
     private var reindentClosedBlockCb: JCheckBox? = null
     private var reindentPasteCb: 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
 
     override fun getDisplayName(): String = "Lyng Formatter"
@@ -42,6 +50,14 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
         reindentClosedBlockCb = JCheckBox("Reindent enclosed block on Enter after '}'")
         reindentPasteCb = JCheckBox("Reindent pasted blocks (align pasted code to current indent)")
         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)")
 
         // Tooltips / short help
@@ -50,12 +66,27 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
         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."
         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)."
         p.add(spacingCb)
         p.add(wrappingCb)
         p.add(reindentClosedBlockCb)
         p.add(reindentPasteCb)
         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)
         panel = p
         reset()
@@ -69,6 +100,14 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
                 reindentClosedBlockCb?.isSelected != s.reindentClosedBlockOnEnter ||
                 reindentPasteCb?.isSelected != s.reindentPastedBlocks ||
                 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
     }
 
@@ -79,6 +118,14 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
         s.reindentClosedBlockOnEnter = reindentClosedBlockCb?.isSelected == true
         s.reindentPastedBlocks = reindentPasteCb?.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
     }
 
@@ -89,6 +136,14 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
         reindentClosedBlockCb?.isSelected = s.reindentClosedBlockOnEnter
         reindentPasteCb?.isSelected = s.reindentPastedBlocks
         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
     }
 }

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/spell/LyngSpellIndex.kt

@@ -0,0 +1,50 @@
+/*
+ * 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}")
+    }
+}

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/spell/LyngSpellcheckingStrategy.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * 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.
@@ -16,26 +16,140 @@
  */
 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.spellchecker.inspections.PlainTextSplitter
 import com.intellij.spellchecker.tokenizer.SpellcheckingStrategy
+import com.intellij.spellchecker.tokenizer.TokenConsumer
 import com.intellij.spellchecker.tokenizer.Tokenizer
-import net.sergeych.lyng.idea.highlight.LyngTokenTypes
-import net.sergeych.lyng.idea.psi.LyngElementTypes
+import net.sergeych.lyng.idea.settings.LyngFormatterSettings
 
 /**
- * Standard IntelliJ spellchecking strategy for Lyng.
- * Uses the simplified PSI structure to identify declarations.
+ * Spellchecking strategy for Lyng:
+ * - Identifiers: checked as identifiers
+ * - 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() {
-    override fun getTokenizer(element: PsiElement?): Tokenizer<*> {
-        val type = element?.node?.elementType
-        return when (type) {
-            LyngTokenTypes.LINE_COMMENT, LyngTokenTypes.BLOCK_COMMENT -> TEXT_TOKENIZER
-            LyngTokenTypes.STRING -> TEXT_TOKENIZER
-            LyngElementTypes.NAME_IDENTIFIER,
-            LyngElementTypes.PARAMETER_NAME,
-            LyngElementTypes.ENUM_CONSTANT_NAME -> TEXT_TOKENIZER
-            else -> super.getTokenizer(element)
+
+    private val log = Logger.getInstance(LyngSpellcheckingStrategy::class.java)
+    @Volatile private var loggedOnce = false
+
+    private fun grazieInstalled(): Boolean {
+        // Support both historical and bundled IDs
+        return PluginManagerCore.isPluginInstalled(PluginId.getId("com.intellij.grazie")) ||
+                PluginManagerCore.isPluginInstalled(PluginId.getId("tanvd.grazi"))
+    }
+
+    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)
+            }
         }
     }
 }

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/util/DocsBootstrap.kt

@@ -1,20 +1,3 @@
-/*
- * 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
  * so completion/quickdoc can resolve things like lyng.io.fs.Path.
@@ -23,7 +6,6 @@ package net.sergeych.lyng.idea.util
 
 import com.intellij.openapi.diagnostic.Logger
 import net.sergeych.lyng.idea.docs.FsDocsFallback
-import net.sergeych.lyng.idea.docs.ProcessDocsFallback
 
 object DocsBootstrap {
     private val log = Logger.getInstance(DocsBootstrap::class.java)
@@ -38,32 +20,20 @@ object DocsBootstrap {
         }
     }
 
-    private fun tryLoadExternal(): Boolean {
-        var anyLoaded = false
-        try {
+    private fun tryLoadExternal(): Boolean = try {
         val cls = Class.forName("net.sergeych.lyngio.docs.FsBuiltinDocs")
         val m = cls.getMethod("ensure")
         m.invoke(null)
         log.info("[LYNG_DEBUG] DocsBootstrap: external docs loaded: net.sergeych.lyngio.docs.FsBuiltinDocs.ensure() OK")
-            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
+        true
+    } catch (_: Throwable) {
+        false
     }
 
     private fun trySeedFallback(): Boolean = try {
-        val seededFs = FsDocsFallback.ensureOnce()
-        val seededProcess = ProcessDocsFallback.ensureOnce()
-        val seeded = seededFs || seededProcess
+        val seeded = FsDocsFallback.ensureOnce()
         if (seeded) {
-            log.info("[LYNG_DEBUG] DocsBootstrap: external docs not found; seeded plugin fallback for lyng.io.fs/process")
+            log.info("[LYNG_DEBUG] DocsBootstrap: external docs not found; seeded plugin fallback for lyng.io.fs")
         } else {
             log.info("[LYNG_DEBUG] DocsBootstrap: external docs not found; no fallback seeded")
         }

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/util/LyngAstManager.kt

@@ -17,10 +17,8 @@
 
 package net.sergeych.lyng.idea.util
 
-import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.util.Key
 import com.intellij.psi.PsiFile
-import com.intellij.psi.PsiManager
 import kotlinx.coroutines.runBlocking
 import net.sergeych.lyng.Compiler
 import net.sergeych.lyng.Source
@@ -34,89 +32,43 @@ object LyngAstManager {
     private val BINDING_KEY = Key.create<BindingSnapshot>("lyng.binding.cache")
     private val STAMP_KEY = Key.create<Long>("lyng.mini.cache.stamp")
 
-    fun getMiniAst(file: PsiFile): MiniScript? = runReadAction {
-        val vFile = file.virtualFile ?: return@runReadAction null
-        val combinedStamp = getCombinedStamp(file)
-
+    fun getMiniAst(file: PsiFile): MiniScript? {
+        val doc = file.viewProvider.document ?: return null
+        val stamp = doc.modificationStamp
         val prevStamp = file.getUserData(STAMP_KEY)
         val cached = file.getUserData(MINI_KEY)
-        if (cached != null && prevStamp != null && prevStamp == combinedStamp) return@runReadAction cached
+        if (cached != null && prevStamp != null && prevStamp == stamp) return cached
 
-        val text = file.viewProvider.contents.toString()
+        val text = doc.text
         val sink = MiniAstBuilder()
         val built = try {
             val provider = IdeLenientImportProvider.create()
             val src = Source(file.name, text)
             runBlocking { Compiler.compileWithMini(src, provider, sink) }
-            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
+            sink.build()
         } catch (_: Throwable) {
             sink.build()
         }
 
         if (built != null) {
             file.putUserData(MINI_KEY, built)
-            file.putUserData(STAMP_KEY, combinedStamp)
+            file.putUserData(STAMP_KEY, stamp)
             // Invalidate binding too
             file.putUserData(BINDING_KEY, null)
         }
-        built
-    }
-
-    fun getCombinedStamp(file: PsiFile): Long = runReadAction {
-        var combinedStamp = file.viewProvider.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
+        return built
     }
 
+    fun getBinding(file: PsiFile): BindingSnapshot? {
+        val doc = file.viewProvider.document ?: return null
+        val stamp = doc.modificationStamp
         val prevStamp = file.getUserData(STAMP_KEY)
         val cached = file.getUserData(BINDING_KEY)
         
-        if (cached != null && prevStamp != null && prevStamp == combinedStamp) return@runReadAction cached
+        if (cached != null && prevStamp != null && prevStamp == stamp) return cached
         
-        val mini = getMiniAst(file) ?: return@runReadAction null
-        val text = file.viewProvider.contents.toString()
+        val mini = getMiniAst(file) ?: return null
+        val text = doc.text
         val binding = try {
             Binder.bind(text, mini)
         } catch (_: Throwable) {
@@ -125,9 +77,8 @@ object LyngAstManager {
         
         if (binding != null) {
             file.putUserData(BINDING_KEY, binding)
-            // stamp is already set by getMiniAst or we set it here if getMiniAst was cached
-            file.putUserData(STAMP_KEY, combinedStamp)
+            // stamp is already set by getMiniAst
         }
-        binding
+        return binding
     }
 }

lyng-idea/src/main/resources/META-INF/grazie-bundled.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+  ~ 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.
@@ -20,6 +20,8 @@
 -->
 <idea-plugin>
     <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 -->
         <grazie.textExtractor language="Lyng"
                               implementationClass="net.sergeych.lyng.idea.grazie.LyngTextExtractor"/>

lyng-idea/src/main/resources/META-INF/grazie-lite.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+  ~ 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.
@@ -21,6 +21,8 @@
 -->
 <idea-plugin>
     <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 -->
         <grazie.textExtractor language="Lyng"
                               implementationClass="net.sergeych.lyng.idea.grazie.LyngTextExtractor"/>

lyng-idea/src/main/resources/META-INF/plugin.xml

@@ -16,10 +16,10 @@
   -->
 
 <idea-plugin>
-    <!-- Open-ended compatibility: 2024.1+ (build 241 and newer) -->
-    <idea-version since-build="241"/>
+    <!-- Open-ended compatibility: 2024.3+ (build 243 and newer) -->
+    <idea-version since-build="243"/>
     <id>net.sergeych.lyng.idea</id>
-    <name>Lyng</name>
+    <name>Lyng Language Support</name>
     <vendor email="real.sergeych@gmail.com">Sergey Chernov</vendor>
 
     <description>
@@ -43,7 +43,6 @@
     <extensions defaultExtensionNs="com.intellij">
         <!-- Language and file type -->
         <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 -->
         <lang.parserDefinition language="Lyng" implementationClass="net.sergeych.lyng.idea.psi.LyngParserDefinition"/>
@@ -57,6 +56,9 @@
         <!-- External annotator for semantic highlighting -->
         <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 -->
         <lang.documentationProvider language="Lyng" implementationClass="net.sergeych.lyng.idea.docs.LyngDocumentationProvider"/>
 
@@ -102,15 +104,5 @@
 
     </extensions>
 
-    <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>
+    <actions/>
 </idea-plugin>

lyng-idea/src/main/resources/META-INF/spellchecker.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+  ~ 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.
@@ -22,6 +22,7 @@
 -->
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
+        <!-- Spellchecker strategy: identifiers + comments; literals configurable, skipping printf-like specs -->
         <spellchecker.support language="Lyng"
                               implementationClass="net.sergeych.lyng.idea.spell.LyngSpellcheckingStrategy"/>
     </extensions>

lyng-idea/src/main/resources/dictionaries/en-basic.txt

@@ -0,0 +1,466 @@
+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

lyng-idea/src/main/resources/dictionaries/tech-lyng.txt

@@ -0,0 +1,282 @@
+# 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

lyng-idea/src/test/kotlin/net/sergeych/lyng/idea/completion/LyngCompletionMemberTest.kt

@@ -1,20 +1,3 @@
-/*
- * 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
 
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
@@ -135,41 +118,4 @@ class LyngCompletionMemberTest : BasePlatformTestCase() {
         // 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)
     }
-
-    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())
-    }
 }

lyngio/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * 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.
@@ -20,6 +20,7 @@
  */
 
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
@@ -32,7 +33,6 @@ group = "net.sergeych"
 version = "0.0.1-SNAPSHOT"
 
 kotlin {
-    jvmToolchain(17)
     jvm()
     androidTarget {
         publishLibraryVariants("release")
@@ -53,11 +53,11 @@ kotlin {
         browser()
         nodejs()
     }
-//    @OptIn(ExperimentalWasmDsl::class)
-//    wasmJs() {
-//        browser()
-//        nodejs()
-//    }
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs() {
+        browser()
+        nodejs()
+    }
 
     // Keep expect/actual warning suppressed consistently with other modules
     targets.configureEach {
@@ -94,13 +94,13 @@ kotlin {
                 implementation("com.squareup.okio:okio-nodefilesystem:${libs.versions.okioVersion.get()}")
             }
         }
-//        // For Wasm we use in-memory VFS for now
-//        val wasmJsMain by getting {
-//            dependencies {
-//                api(libs.okio)
-//                implementation(libs.okio.fakefilesystem)
-//            }
-//        }
+        // For Wasm we use in-memory VFS for now
+        val wasmJsMain by getting {
+            dependencies {
+                api(libs.okio)
+                implementation(libs.okio.fakefilesystem)
+            }
+        }
     }
 }
 

lyngio/src/androidMain/kotlin/net/sergeych/lyngio/process/PlatformAndroid.kt

@@ -1,33 +0,0 @@
-/*
- * 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.process
-
-actual fun getPlatformDetails(): PlatformDetails {
-    return PlatformDetails(
-        name = "Android",
-        version = android.os.Build.VERSION.RELEASE,
-        arch = android.os.Build.SUPPORTED_ABIS.firstOrNull() ?: "unknown",
-        kernelVersion = System.getProperty("os.version")
-    )
-}
-
-actual fun isProcessSupported(): Boolean = false
-
-actual fun getSystemProcessRunner(): LyngProcessRunner {
-    throw UnsupportedOperationException("Processes are not supported on Android yet")
-}

lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/process/LyngProcessModule.kt

@@ -1,234 +0,0 @@
-/*
- * 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.io.process
-
-import kotlinx.coroutines.flow.Flow
-import net.sergeych.lyng.ModuleScope
-import net.sergeych.lyng.Scope
-import net.sergeych.lyng.miniast.*
-import net.sergeych.lyng.obj.*
-import net.sergeych.lyng.pacman.ImportManager
-import net.sergeych.lyng.statement
-import net.sergeych.lyngio.process.*
-import net.sergeych.lyngio.process.security.ProcessAccessDeniedException
-import net.sergeych.lyngio.process.security.ProcessAccessPolicy
-
-/**
- * Install Lyng module `lyng.io.process` into the given scope's ImportManager.
- */
-fun createProcessModule(policy: ProcessAccessPolicy, scope: Scope): Boolean =
-    createProcessModule(policy, scope.importManager)
-
-/** Same as [createProcessModule] but with explicit [ImportManager]. */
-fun createProcessModule(policy: ProcessAccessPolicy, manager: ImportManager): Boolean {
-    val name = "lyng.io.process"
-    if (manager.packageNames.contains(name)) return false
-
-    manager.addPackage(name) { module ->
-        buildProcessModule(module, policy)
-    }
-    return true
-}
-
-private suspend fun buildProcessModule(module: ModuleScope, policy: ProcessAccessPolicy) {
-    val runner = try {
-        SecuredLyngProcessRunner(getSystemProcessRunner(), policy)
-    } catch (e: Exception) {
-        null
-    }
-
-    val runningProcessType = object : ObjClass("RunningProcess") {}
-    
-    runningProcessType.apply {
-        addFnDoc(
-            name = "stdout",
-            doc = "Get standard output stream as a Flow of lines.",
-            returns = type("lyng.Flow"),
-            moduleName = module.packageName
-        ) {
-            val self = thisAs<ObjRunningProcess>()
-            self.process.stdout.toLyngFlow(this)
-        }
-        addFnDoc(
-            name = "stderr",
-            doc = "Get standard error stream as a Flow of lines.",
-            returns = type("lyng.Flow"),
-            moduleName = module.packageName
-        ) {
-            val self = thisAs<ObjRunningProcess>()
-            self.process.stderr.toLyngFlow(this)
-        }
-        addFnDoc(
-            name = "signal",
-            doc = "Send a signal to the process (e.g. 'SIGINT', 'SIGTERM', 'SIGKILL').",
-            params = listOf(ParamDoc("signal", type("lyng.String"))),
-            moduleName = module.packageName
-        ) {
-            processGuard {
-                val sigStr = requireOnlyArg<ObjString>().value.uppercase()
-                val sig = try {
-                    ProcessSignal.valueOf(sigStr)
-                } catch (e: Exception) {
-                    try {
-                        ProcessSignal.valueOf("SIG$sigStr")
-                    } catch (e2: Exception) {
-                        raiseIllegalArgument("Unknown signal: $sigStr")
-                    }
-                }
-                thisAs<ObjRunningProcess>().process.sendSignal(sig)
-                ObjVoid
-            }
-        }
-        addFnDoc(
-            name = "waitFor",
-            doc = "Wait for the process to exit and return its exit code.",
-            returns = type("lyng.Int"),
-            moduleName = module.packageName
-        ) {
-            processGuard {
-                thisAs<ObjRunningProcess>().process.waitFor().toObj()
-            }
-        }
-        addFnDoc(
-            name = "destroy",
-            doc = "Forcefully terminate the process.",
-            moduleName = module.packageName
-        ) {
-            thisAs<ObjRunningProcess>().process.destroy()
-            ObjVoid
-        }
-    }
-
-    val processType = object : ObjClass("Process") {}
-    
-    processType.apply {
-        addClassFnDoc(
-            name = "execute",
-            doc = "Execute a process with arguments.",
-            params = listOf(ParamDoc("executable", type("lyng.String")), ParamDoc("args", type("lyng.List"))),
-            returns = type("RunningProcess"),
-            moduleName = module.packageName
-        ) {
-            if (runner == null) raiseError("Processes are not supported on this platform")
-            processGuard {
-                val executable = requiredArg<ObjString>(0).value
-                val args = requiredArg<ObjList>(1).list.map { it.toString() }
-                val lp = runner.execute(executable, args)
-                ObjRunningProcess(runningProcessType, lp)
-            }
-        }
-        addClassFnDoc(
-            name = "shell",
-            doc = "Execute a command via system shell.",
-            params = listOf(ParamDoc("command", type("lyng.String"))),
-            returns = type("RunningProcess"),
-            moduleName = module.packageName
-        ) {
-            if (runner == null) raiseError("Processes are not supported on this platform")
-            processGuard {
-                val command = requireOnlyArg<ObjString>().value
-                val lp = runner.shell(command)
-                ObjRunningProcess(runningProcessType, lp)
-            }
-        }
-    }
-
-    val platformType = object : ObjClass("Platform") {}
-    
-    platformType.apply {
-        addClassFnDoc(
-            name = "details",
-            doc = "Get platform core details.",
-            returns = type("lyng.Map"),
-            moduleName = module.packageName
-        ) {
-            val d = getPlatformDetails()
-            ObjMap(mutableMapOf(
-                ObjString("name") to ObjString(d.name),
-                ObjString("version") to ObjString(d.version),
-                ObjString("arch") to ObjString(d.arch),
-                ObjString("kernelVersion") to (d.kernelVersion?.toObj() ?: ObjNull)
-            ))
-        }
-        addClassFnDoc(
-            name = "isSupported",
-            doc = "Check if processes are supported on this platform.",
-            returns = type("lyng.Bool"),
-            moduleName = module.packageName
-        ) {
-            isProcessSupported().toObj()
-        }
-    }
-
-    module.addConstDoc(
-        name = "Process",
-        value = processType,
-        doc = "Process execution and control.",
-        type = type("Process"),
-        moduleName = module.packageName
-    )
-    module.addConstDoc(
-        name = "Platform",
-        value = platformType,
-        doc = "Platform information.",
-        type = type("Platform"),
-        moduleName = module.packageName
-    )
-    module.addConstDoc(
-        name = "RunningProcess",
-        value = runningProcessType,
-        doc = "Handle to a running process.",
-        type = type("RunningProcess"),
-        moduleName = module.packageName
-    )
-}
-
-class ObjRunningProcess(
-    override val objClass: ObjClass,
-    val process: LyngProcess
-) : Obj() {
-    override fun toString(): String = "RunningProcess($process)"
-}
-
-private suspend inline fun Scope.processGuard(crossinline block: suspend () -> Obj): Obj {
-    return try {
-        block()
-    } catch (e: ProcessAccessDeniedException) {
-        raiseError(ObjIllegalOperationException(this, e.reasonDetail ?: "process access denied"))
-    } catch (e: Exception) {
-        raiseError(ObjIllegalOperationException(this, e.message ?: "process error"))
-    }
-}
-
-private fun Flow<String>.toLyngFlow(flowScope: Scope): ObjFlow {
-    val producer = statement {
-        val builder = (this as? net.sergeych.lyng.ClosureScope)?.callScope?.thisObj as? ObjFlowBuilder
-            ?: this.thisObj as? ObjFlowBuilder
-
-        this@toLyngFlow.collect {
-            try {
-                builder?.output?.send(ObjString(it))
-            } catch (e: Exception) {
-                // Channel closed or other error, stop collecting
-                return@collect
-            }
-        }
-        ObjVoid
-    }
-    return ObjFlow(producer, flowScope)
-}

lyngio/src/commonMain/kotlin/net/sergeych/lyngio/docs/FsBuiltinDocs.kt

@@ -1,20 +1,3 @@
-/*
- * 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.
- *
- */
-
 /*
  * Filesystem module builtin docs registration, located in lyngio so core library
  * does not depend on external packages. The IDEA plugin (and any other tooling)
@@ -39,176 +22,45 @@ object FsBuiltinDocs {
                 name = "Path",
                 doc = "Filesystem path class. Construct with a string: `Path(\"/tmp\")`."
             ) {
-                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")))
-                )
+                // Common instance methods (subset sufficient for Quick Docs)
                 method(
                     name = "exists",
-                    doc = "Check whether this path exists on the filesystem.",
+                    doc = "Whether the path exists on the filesystem.",
                     returns = type("lyng.Bool")
                 )
                 method(
                     name = "isFile",
-                    doc = "True if this path is a regular file (based on cached metadata).",
+                    doc = "Whether the path exists and is a file.",
                     returns = type("lyng.Bool")
                 )
                 method(
-                    name = "isDirectory",
-                    doc = "True if this path is a directory (based on cached metadata).",
+                    name = "isDir",
+                    doc = "Whether the path exists and is a directory.",
                     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(
                     name = "readUtf8",
-                    doc = "Read the entire file as a UTF-8 string.",
+                    doc = "Read the entire file as UTF-8 string.",
                     returns = type("lyng.String")
                 )
                 method(
                     name = "writeUtf8",
-                    doc = "Write a UTF-8 string to the file, replacing content.",
+                    doc = "Write UTF-8 string to the file (overwrite).",
                     params = listOf(ParamDoc("text", type("lyng.String")))
                 )
                 method(
-                    name = "appendUtf8",
-                    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`.",
+                    name = "bytes",
+                    doc = "Iterate file content as `Buffer` chunks.",
                     params = listOf(ParamDoc("size", type("lyng.Int"))),
                     returns = TypeGenericDoc(type("lyng.Iterator"), listOf(type("lyng.Buffer")))
                 )
-                method(
-                    name = "readUtf8Chunks",
-                    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")))
-                )
                 method(
                     name = "lines",
-                    doc = "Iterate lines of the file as `String` values.",
+                    doc = "Iterate file as lines of text.",
                     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
             valDoc(
                 name = "Path",

lyngio/src/commonMain/kotlin/net/sergeych/lyngio/docs/ProcessBuiltinDocs.kt

@@ -1,117 +0,0 @@
-/*
- * 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
-    }
-}

lyngio/src/commonMain/kotlin/net/sergeych/lyngio/process/LyngProcess.kt

@@ -1,93 +0,0 @@
-/*
- * 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.process
-
-import kotlinx.coroutines.flow.Flow
-import net.sergeych.lyngio.process.security.ProcessAccessOp
-import net.sergeych.lyngio.process.security.ProcessAccessPolicy
-
-/**
- * Common signals for process control.
- */
-enum class ProcessSignal {
-    SIGINT, SIGTERM, SIGKILL
-}
-
-/**
- * Multiplatform process representation.
- */
-interface LyngProcess {
-    /**
-     * Standard output stream as a flow of strings (lines).
-     */
-    val stdout: Flow<String>
-
-    /**
-     * Standard error stream as a flow of strings (lines).
-     */
-    val stderr: Flow<String>
-
-    /**
-     * Send a signal to the process.
-     * Throws exception if signals are not supported on the platform or for this process.
-     */
-    suspend fun sendSignal(signal: ProcessSignal)
-
-    /**
-     * Wait for the process to exit and return the exit code.
-     */
-    suspend fun waitFor(): Int
-
-    /**
-     * Forcefully terminate the process.
-     */
-    fun destroy()
-}
-
-/**
- * Interface for running processes.
- */
-interface LyngProcessRunner {
-    /**
-     * Execute a process with the given executable and arguments.
-     */
-    suspend fun execute(executable: String, args: List<String>): LyngProcess
-
-    /**
-     * Execute a command via the platform's default shell.
-     */
-    suspend fun shell(command: String): LyngProcess
-}
-
-/**
- * Secured implementation of [LyngProcessRunner] that checks against a [ProcessAccessPolicy].
- */
-class SecuredLyngProcessRunner(
-    private val runner: LyngProcessRunner,
-    private val policy: ProcessAccessPolicy
-) : LyngProcessRunner {
-    override suspend fun execute(executable: String, args: List<String>): LyngProcess {
-        policy.require(ProcessAccessOp.Execute(executable, args))
-        return runner.execute(executable, args)
-    }
-
-    override suspend fun shell(command: String): LyngProcess {
-        policy.require(ProcessAccessOp.Shell(command))
-        return runner.shell(command)
-    }
-}

lyngio/src/commonMain/kotlin/net/sergeych/lyngio/process/Platform.kt

@@ -1,44 +0,0 @@
-/*
- * 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.process
-
-/**
- * Platform core details.
- */
-data class PlatformDetails(
-    val name: String,
-    val version: String,
-    val arch: String,
-    val kernelVersion: String? = null
-)
-
-/**
- * Get the current platform core details.
- */
-expect fun getPlatformDetails(): PlatformDetails
-
-/**
- * Check whether the current platform supports processes and shell execution.
- */
-expect fun isProcessSupported(): Boolean
-
-/**
- * Get the system default [LyngProcessRunner].
- * Throws [UnsupportedOperationException] if processes are not supported on this platform.
- */
-expect fun getSystemProcessRunner(): LyngProcessRunner

lyngio/src/commonMain/kotlin/net/sergeych/lyngio/process/security/ProcessAccessPolicy.kt

@@ -1,59 +0,0 @@
-/*
- * 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.process.security
-
-import net.sergeych.lyngio.fs.security.AccessContext
-import net.sergeych.lyngio.fs.security.AccessDecision
-import net.sergeych.lyngio.fs.security.Decision
-
-/**
- * Primitive process operations for access control decisions.
- */
-sealed interface ProcessAccessOp {
-    data class Execute(val executable: String, val args: List<String>) : ProcessAccessOp
-    data class Shell(val command: String) : ProcessAccessOp
-}
-
-class ProcessAccessDeniedException(
-    val op: ProcessAccessOp,
-    val reasonDetail: String? = null,
-) : IllegalStateException("Process access denied for $op" + (reasonDetail?.let { ": $it" } ?: ""))
-
-/**
- * Policy interface that decides whether a specific process operation is allowed.
- */
-interface ProcessAccessPolicy {
-    suspend fun check(op: ProcessAccessOp, ctx: AccessContext = AccessContext()): AccessDecision
-
-    // Convenience helpers
-    suspend fun require(op: ProcessAccessOp, ctx: AccessContext = AccessContext()) {
-        val res = check(op, ctx)
-        if (!res.isAllowed()) throw ProcessAccessDeniedException(op, res.reason)
-    }
-
-    suspend fun canExecute(executable: String, args: List<String>, ctx: AccessContext = AccessContext()) =
-        check(ProcessAccessOp.Execute(executable, args), ctx).isAllowed()
-
-    suspend fun canShell(command: String, ctx: AccessContext = AccessContext()) =
-        check(ProcessAccessOp.Shell(command), ctx).isAllowed()
-}
-
-object PermitAllProcessAccessPolicy : ProcessAccessPolicy {
-    override suspend fun check(op: ProcessAccessOp, ctx: AccessContext): AccessDecision =
-        AccessDecision(Decision.Allow)
-}

lyngio/src/iosMain/kotlin/net/sergeych/lyngio/process/PlatformIos.kt

@@ -1,26 +0,0 @@
-/*
- * 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.process
-
-internal actual fun getNativeKernelVersion(): String? = null
-
-internal actual fun isNativeProcessSupported(): Boolean = false
-
-internal actual fun getNativeProcessRunner(): LyngProcessRunner {
-    throw UnsupportedOperationException("Processes are not supported on iOS")
-}

lyngio/src/jsMain/kotlin/net/sergeych/lyngio/process/PlatformJs.kt

@@ -1,32 +0,0 @@
-/*
- * 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.process
-
-actual fun getPlatformDetails(): PlatformDetails {
-    return PlatformDetails(
-        name = "JavaScript",
-        version = "unknown",
-        arch = "unknown"
-    )
-}
-
-actual fun isProcessSupported(): Boolean = false
-
-actual fun getSystemProcessRunner(): LyngProcessRunner {
-    throw UnsupportedOperationException("Processes are not supported on JS")
-}

lyngio/src/jvmMain/kotlin/net/sergeych/lyngio/process/PlatformJvm.kt

@@ -1,107 +0,0 @@
-/*
- * 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.process
-
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.withContext
-
-actual fun getPlatformDetails(): PlatformDetails {
-    val osName = System.getProperty("os.name")
-    return PlatformDetails(
-        name = osName,
-        version = System.getProperty("os.version"),
-        arch = System.getProperty("os.arch"),
-        kernelVersion = if (osName.lowercase().contains("linux")) {
-            System.getProperty("os.version")
-        } else null
-    )
-}
-
-actual fun isProcessSupported(): Boolean = true
-
-actual fun getSystemProcessRunner(): LyngProcessRunner = JvmProcessRunner
-
-object JvmProcessRunner : LyngProcessRunner {
-    override suspend fun execute(executable: String, args: List<String>): LyngProcess {
-        val process = ProcessBuilder(listOf(executable) + args)
-            .start()
-        return JvmLyngProcess(process)
-    }
-
-    override suspend fun shell(command: String): LyngProcess {
-        val os = System.getProperty("os.name").lowercase()
-        val shellCmd = if (os.contains("win")) {
-            listOf("cmd.exe", "/c", command)
-        } else {
-            listOf("sh", "-c", command)
-        }
-        val process = ProcessBuilder(shellCmd)
-            .start()
-        return JvmLyngProcess(process)
-    }
-}
-
-class JvmLyngProcess(private val process: Process) : LyngProcess {
-    override val stdout: Flow<String> = flow {
-        val reader = process.inputStream.bufferedReader()
-        while (true) {
-            val line = reader.readLine() ?: break
-            emit(line)
-        }
-    }
-
-    override val stderr: Flow<String> = flow {
-        val reader = process.errorStream.bufferedReader()
-        while (true) {
-            val line = reader.readLine() ?: break
-            emit(line)
-        }
-    }
-
-    override suspend fun sendSignal(signal: ProcessSignal) {
-        when (signal) {
-            ProcessSignal.SIGINT -> {
-                // SIGINT is hard on JVM without native calls or external 'kill'
-                val os = System.getProperty("os.name").lowercase()
-                if (os.contains("win")) {
-                    throw UnsupportedOperationException("SIGINT not supported on Windows JVM")
-                } else {
-                    // Try to use kill -2 <pid>
-                    try {
-                        val pid = process.pid()
-                        Runtime.getRuntime().exec(arrayOf("kill", "-2", pid.toString())).waitFor()
-                    } catch (e: Exception) {
-                        throw UnsupportedOperationException("Failed to send SIGINT: ${e.message}")
-                    }
-                }
-            }
-            ProcessSignal.SIGTERM -> process.destroy()
-            ProcessSignal.SIGKILL -> process.destroyForcibly()
-        }
-    }
-
-    override suspend fun waitFor(): Int = withContext(Dispatchers.IO) {
-        process.waitFor()
-    }
-
-    override fun destroy() {
-        process.destroy()
-    }
-}

lyngio/src/jvmTest/kotlin/net/sergeych/lyng/io/process/LyngProcessModuleTest.kt

@@ -1,87 +0,0 @@
-/*
- * 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.io.process
-
-import kotlinx.coroutines.runBlocking
-import net.sergeych.lyng.Compiler
-import net.sergeych.lyng.Script
-import net.sergeych.lyngio.process.security.PermitAllProcessAccessPolicy
-import kotlin.test.Test
-import kotlin.test.assertTrue
-
-class LyngProcessModuleTest {
-
-    @Test
-    fun testLyngProcess() = runBlocking {
-        val scope = Script.newScope()
-        createProcessModule(PermitAllProcessAccessPolicy, scope)
-        
-        val code = """
-            import lyng.io.process
-            
-            var p = Process.execute("echo", ["hello", "lyng"])
-            var output = []
-            for (line in p.stdout()) {
-                output.add(line)
-            }
-            p.waitFor()
-            output
-        """.trimIndent()
-        
-        val script = Compiler.compile(code)
-        val result = script.execute(scope)
-        assertTrue(result.inspect(scope).contains("hello lyng"))
-    }
-
-    @Test
-    fun testLyngShell() = runBlocking {
-        val scope = Script.newScope()
-        createProcessModule(PermitAllProcessAccessPolicy, scope)
-        
-        val code = """
-            import lyng.io.process
-            
-            var p = Process.shell("echo 'shell lyng'")
-            var output = ""
-            for (line in p.stdout()) {
-                output = output + line
-            }
-            p.waitFor()
-            output
-        """.trimIndent()
-        
-        val script = Compiler.compile(code)
-        val result = script.execute(scope)
-        assertTrue(result.inspect(scope).contains("shell lyng"))
-    }
-
-    @Test
-    fun testPlatformDetails() = runBlocking {
-        val scope = Script.newScope()
-        createProcessModule(PermitAllProcessAccessPolicy, scope)
-        
-        val code = """
-            import lyng.io.process
-            Platform.details()
-        """.trimIndent()
-        
-        val script = Compiler.compile(code)
-        val result = script.execute(scope)
-        assertTrue(result.inspect(scope).contains("name"), "Result should contain 'name', but was: ${result.inspect(scope)}")
-    }
-}

lyngio/src/jvmTest/kotlin/net/sergeych/lyngio/process/JvmProcessTest.kt

@@ -1,57 +0,0 @@
-/*
- * 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.process
-
-import kotlinx.coroutines.flow.toList
-import kotlinx.coroutines.runBlocking
-import net.sergeych.lyngio.process.security.PermitAllProcessAccessPolicy
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-
-class JvmProcessTest {
-
-    @Test
-    fun testExecute() = runBlocking {
-        val runner = getSystemProcessRunner()
-        val secured = SecuredLyngProcessRunner(runner, PermitAllProcessAccessPolicy)
-        
-        val process = secured.execute("echo", listOf("hello", "world"))
-        val output = process.stdout.toList()
-        assertEquals(listOf("hello world"), output)
-        assertEquals(0, process.waitFor())
-    }
-
-    @Test
-    fun testShell() = runBlocking {
-        val runner = getSystemProcessRunner()
-        val secured = SecuredLyngProcessRunner(runner, PermitAllProcessAccessPolicy)
-        
-        val process = secured.shell("echo 'hello shell'")
-        val output = process.stdout.toList()
-        assertEquals(listOf("hello shell"), output)
-        assertEquals(0, process.waitFor())
-    }
-
-    @Test
-    fun testPlatformDetails() {
-        val details = getPlatformDetails()
-        assertTrue(details.name.isNotEmpty())
-        assertTrue(isProcessSupported())
-    }
-}

lyngio/src/linuxMain/kotlin/net/sergeych/lyngio/process/PlatformLinux.kt

@@ -1,35 +0,0 @@
-/*
- * 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.process
-
-import kotlinx.cinterop.*
-import platform.posix.*
-
-@OptIn(ExperimentalForeignApi::class)
-internal actual fun getNativeKernelVersion(): String? {
-    return memScoped {
-        val u = alloc<utsname>()
-        if (uname(u.ptr) == 0) {
-            u.release.toKString()
-        } else null
-    }
-}
-
-internal actual fun isNativeProcessSupported(): Boolean = true
-
-internal actual fun getNativeProcessRunner(): LyngProcessRunner = PosixProcessRunner

lyngio/src/linuxMain/kotlin/net/sergeych/lyngio/process/PosixProcessRunner.kt

@@ -1,152 +0,0 @@
-/*
- * 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.process
-
-import kotlinx.cinterop.*
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOn
-import platform.posix.*
-
-@OptIn(ExperimentalForeignApi::class)
-internal class NativeLyngProcess(
-    private val pid: pid_t,
-    private val stdoutFd: Int,
-    private val stderrFd: Int
-) : LyngProcess {
-    override val stdout: Flow<String> = createPipeFlow(stdoutFd)
-    override val stderr: Flow<String> = createPipeFlow(stderrFd)
-
-    override suspend fun sendSignal(signal: ProcessSignal) {
-        val sig = when (signal) {
-            ProcessSignal.SIGINT -> SIGINT
-            ProcessSignal.SIGTERM -> SIGTERM
-            ProcessSignal.SIGKILL -> SIGKILL
-        }
-        if (kill(pid, sig) != 0) {
-            throw RuntimeException("Failed to send signal $signal to process $pid: ${strerror(errno)?.toKString()}")
-        }
-    }
-
-    override suspend fun waitFor(): Int = withContext(Dispatchers.Default) {
-        memScoped {
-            val status = alloc<IntVar>()
-            if (waitpid(pid, status.ptr, 0) == -1) {
-                throw RuntimeException("Failed to wait for process $pid: ${strerror(errno)?.toKString()}")
-            }
-            val s = status.value
-            if ((s and 0x7f) == 0) (s shr 8) and 0xff else -1
-        }
-    }
-
-    override fun destroy() {
-        kill(pid, SIGKILL)
-    }
-}
-
-@OptIn(ExperimentalForeignApi::class)
-private fun createPipeFlow(fd: Int): Flow<String> = flow {
-    val buffer = ByteArray(4096)
-    val lineBuffer = StringBuilder()
-    
-    try {
-        while (true) {
-            val bytesRead = buffer.usePinned { pinned ->
-                read(fd, pinned.addressOf(0), buffer.size.toULong())
-            }
-            
-            if (bytesRead <= 0L) break
-            
-            val text = buffer.decodeToString(endIndex = bytesRead.toInt())
-            lineBuffer.append(text)
-            
-            var newlineIdx = lineBuffer.indexOf('\n')
-            while (newlineIdx != -1) {
-                val line = lineBuffer.substring(0, newlineIdx)
-                emit(line)
-                lineBuffer.deleteRange(0, newlineIdx + 1)
-                newlineIdx = lineBuffer.indexOf('\n')
-            }
-        }
-        if (lineBuffer.isNotEmpty()) {
-            emit(lineBuffer.toString())
-        }
-    } finally {
-        close(fd)
-    }
-}.flowOn(Dispatchers.Default)
-
-@OptIn(ExperimentalForeignApi::class)
-object PosixProcessRunner : LyngProcessRunner {
-    override suspend fun execute(executable: String, args: List<String>): LyngProcess = withContext(Dispatchers.Default) {
-        memScoped {
-            val pipeStdout = allocArray<IntVar>(2)
-            val pipeStderr = allocArray<IntVar>(2)
-            
-            if (pipe(pipeStdout) != 0) throw RuntimeException("Failed to create stdout pipe")
-            if (pipe(pipeStderr) != 0) {
-                close(pipeStdout[0])
-                close(pipeStdout[1])
-                throw RuntimeException("Failed to create stderr pipe")
-            }
-            
-            val pid = fork()
-            if (pid == -1) {
-                close(pipeStdout[0])
-                close(pipeStdout[1])
-                close(pipeStderr[0])
-                close(pipeStderr[1])
-                throw RuntimeException("Failed to fork: ${strerror(errno)?.toKString()}")
-            }
-            
-            if (pid == 0) {
-                // Child process
-                dup2(pipeStdout[1], 1)
-                dup2(pipeStderr[1], 2)
-                
-                close(pipeStdout[0])
-                close(pipeStdout[1])
-                close(pipeStderr[0])
-                close(pipeStderr[1])
-                
-                val argv = allocArray<CPointerVar<ByteVar>>(args.size + 2)
-                argv[0] = executable.cstr.ptr
-                for (i in args.indices) {
-                    argv[i + 1] = args[i].cstr.ptr
-                }
-                argv[args.size + 1] = null
-                
-                execvp(executable, argv)
-                
-                // If we are here, exec failed
-                _exit(1)
-            }
-            
-            // Parent process
-            close(pipeStdout[1])
-            close(pipeStderr[1])
-            
-            NativeLyngProcess(pid, pipeStdout[0], pipeStderr[0])
-        }
-    }
-
-    override suspend fun shell(command: String): LyngProcess {
-        return execute("/bin/sh", listOf("-c", command))
-    }
-}

lyngio/src/linuxTest/kotlin/net/sergeych/lyngio/process/LinuxProcessTest.kt

@@ -1,95 +0,0 @@
-/*
- * 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.process
-
-import kotlinx.coroutines.flow.toList
-import kotlinx.coroutines.runBlocking
-import net.sergeych.lyng.Compiler
-import net.sergeych.lyng.Script
-import net.sergeych.lyng.io.process.createProcessModule
-import net.sergeych.lyngio.process.security.PermitAllProcessAccessPolicy
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-
-class LinuxProcessTest {
-
-    @Test
-    fun testExecuteEcho() = runBlocking {
-        val process = PosixProcessRunner.execute("echo", listOf("hello", "native"))
-        val stdout = process.stdout.toList()
-        val exitCode = process.waitFor()
-        
-        assertEquals(0, exitCode)
-        assertEquals(listOf("hello native"), stdout)
-    }
-
-    @Test
-    fun testShellCommand() = runBlocking {
-        val process = PosixProcessRunner.shell("echo 'shell native' && printf 'line2'")
-        val stdout = process.stdout.toList()
-        val exitCode = process.waitFor()
-        
-        assertEquals(0, exitCode)
-        assertEquals(listOf("shell native", "line2"), stdout)
-    }
-
-    @Test
-    fun testStderrCapture() = runBlocking {
-        val process = PosixProcessRunner.shell("echo 'to stdout'; echo 'to stderr' >&2")
-        val stdout = process.stdout.toList()
-        val stderr = process.stderr.toList()
-        process.waitFor()
-        
-        assertEquals(listOf("to stdout"), stdout)
-        assertEquals(listOf("to stderr"), stderr)
-    }
-
-    @Test
-    fun testPlatformDetails() {
-        val details = getPlatformDetails()
-        assertEquals("LINUX", details.name)
-        assertTrue(details.kernelVersion != null)
-        assertTrue(details.kernelVersion!!.isNotEmpty())
-        println("Linux Native Details: $details")
-    }
-
-    @Test
-    fun testLyngModuleNative() = runBlocking {
-        val scope = Script.newScope()
-        createProcessModule(PermitAllProcessAccessPolicy, scope)
-
-        val code = """
-            import lyng.io.process
-            
-            var p = Process.execute("echo", ["hello", "lyng", "native"])
-            var output = []
-            for (line in p.stdout()) {
-                output.add(line)
-            }
-            p.waitFor()
-            println(output)
-            assertEquals("hello lyng native", output.joinToString(" "))
-            output
-        """.trimIndent()
-
-        val script = Compiler.compile(code)
-        val result = script.execute(scope)
-        assertTrue(result.inspect(scope).contains("hello lyng native"))
-    }
-}

lyngio/src/macosMain/kotlin/net/sergeych/lyngio/process/PlatformMacos.kt

@@ -1,35 +0,0 @@
-/*
- * 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.process
-
-import kotlinx.cinterop.*
-import platform.posix.*
-
-@OptIn(ExperimentalForeignApi::class)
-internal actual fun getNativeKernelVersion(): String? {
-    return memScoped {
-        val u = alloc<utsname>()
-        if (uname(u.ptr) == 0) {
-            u.release.toKString()
-        } else null
-    }
-}
-
-internal actual fun isNativeProcessSupported(): Boolean = true
-
-internal actual fun getNativeProcessRunner(): LyngProcessRunner = PosixProcessRunner

lyngio/src/macosMain/kotlin/net/sergeych/lyngio/process/PosixProcessRunner.kt

@@ -1,152 +0,0 @@
-/*
- * 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.process
-
-import kotlinx.cinterop.*
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOn
-import platform.posix.*
-
-@OptIn(ExperimentalForeignApi::class)
-internal class NativeLyngProcess(
-    private val pid: pid_t,
-    private val stdoutFd: Int,
-    private val stderrFd: Int
-) : LyngProcess {
-    override val stdout: Flow<String> = createPipeFlow(stdoutFd)
-    override val stderr: Flow<String> = createPipeFlow(stderrFd)
-
-    override suspend fun sendSignal(signal: ProcessSignal) {
-        val sig = when (signal) {
-            ProcessSignal.SIGINT -> SIGINT
-            ProcessSignal.SIGTERM -> SIGTERM
-            ProcessSignal.SIGKILL -> SIGKILL
-        }
-        if (kill(pid, sig) != 0) {
-            throw RuntimeException("Failed to send signal $signal to process $pid: ${strerror(errno)?.toKString()}")
-        }
-    }
-
-    override suspend fun waitFor(): Int = withContext(Dispatchers.Default) {
-        memScoped {
-            val status = alloc<IntVar>()
-            if (waitpid(pid, status.ptr, 0) == -1) {
-                throw RuntimeException("Failed to wait for process $pid: ${strerror(errno)?.toKString()}")
-            }
-            val s = status.value
-            if ((s and 0x7f) == 0) (s shr 8) and 0xff else -1
-        }
-    }
-
-    override fun destroy() {
-        kill(pid, SIGKILL)
-    }
-}
-
-@OptIn(ExperimentalForeignApi::class)
-private fun createPipeFlow(fd: Int): Flow<String> = flow {
-    val buffer = ByteArray(4096)
-    val lineBuffer = StringBuilder()
-    
-    try {
-        while (true) {
-            val bytesRead = buffer.usePinned { pinned ->
-                read(fd, pinned.addressOf(0), buffer.size.toULong())
-            }
-            
-            if (bytesRead <= 0L) break
-            
-            val text = buffer.decodeToString(endIndex = bytesRead.toInt())
-            lineBuffer.append(text)
-            
-            var newlineIdx = lineBuffer.indexOf('\n')
-            while (newlineIdx != -1) {
-                val line = lineBuffer.substring(0, newlineIdx)
-                emit(line)
-                lineBuffer.deleteRange(0, newlineIdx + 1)
-                newlineIdx = lineBuffer.indexOf('\n')
-            }
-        }
-        if (lineBuffer.isNotEmpty()) {
-            emit(lineBuffer.toString())
-        }
-    } finally {
-        close(fd)
-    }
-}.flowOn(Dispatchers.Default)
-
-@OptIn(ExperimentalForeignApi::class)
-object PosixProcessRunner : LyngProcessRunner {
-    override suspend fun execute(executable: String, args: List<String>): LyngProcess = withContext(Dispatchers.Default) {
-        memScoped {
-            val pipeStdout = allocArray<IntVar>(2)
-            val pipeStderr = allocArray<IntVar>(2)
-            
-            if (pipe(pipeStdout) != 0) throw RuntimeException("Failed to create stdout pipe")
-            if (pipe(pipeStderr) != 0) {
-                close(pipeStdout[0])
-                close(pipeStdout[1])
-                throw RuntimeException("Failed to create stderr pipe")
-            }
-            
-            val pid = fork()
-            if (pid == -1) {
-                close(pipeStdout[0])
-                close(pipeStdout[1])
-                close(pipeStderr[0])
-                close(pipeStderr[1])
-                throw RuntimeException("Failed to fork: ${strerror(errno)?.toKString()}")
-            }
-            
-            if (pid == 0) {
-                // Child process
-                dup2(pipeStdout[1], 1)
-                dup2(pipeStderr[1], 2)
-                
-                close(pipeStdout[0])
-                close(pipeStdout[1])
-                close(pipeStderr[0])
-                close(pipeStderr[1])
-                
-                val argv = allocArray<CPointerVar<ByteVar>>(args.size + 2)
-                argv[0] = executable.cstr.ptr
-                for (i in args.indices) {
-                    argv[i + 1] = args[i].cstr.ptr
-                }
-                argv[args.size + 1] = null
-                
-                execvp(executable, argv)
-                
-                // If we are here, exec failed
-                _exit(1)
-            }
-            
-            // Parent process
-            close(pipeStdout[1])
-            close(pipeStderr[1])
-            
-            NativeLyngProcess(pid, pipeStdout[0], pipeStderr[0])
-        }
-    }
-
-    override suspend fun shell(command: String): LyngProcess {
-        return execute("/bin/sh", listOf("-c", command))
-    }
-}

lyngio/src/mingwMain/kotlin/net/sergeych/lyngio/process/PlatformMingw.kt

@@ -1,34 +0,0 @@
-/*
- * 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.process
-
-internal actual fun getNativeKernelVersion(): String? = null
-
-internal actual fun isNativeProcessSupported(): Boolean = true
-
-internal actual fun getNativeProcessRunner(): LyngProcessRunner = WindowsProcessRunner
-
-object WindowsProcessRunner : LyngProcessRunner {
-    override suspend fun execute(executable: String, args: List<String>): LyngProcess {
-        throw UnsupportedOperationException("Windows native process execution not implemented yet")
-    }
-
-    override suspend fun shell(command: String): LyngProcess {
-        return execute("cmd.exe", listOf("/c", command))
-    }
-}

lyngio/src/nativeMain/kotlin/net/sergeych/lyngio/process/PlatformNative.kt

@@ -1,40 +0,0 @@
-/*
- * 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.process
-
-import kotlin.experimental.ExperimentalNativeApi
-
-@OptIn(ExperimentalNativeApi::class)
-actual fun getPlatformDetails(): PlatformDetails {
-    return PlatformDetails(
-        name = Platform.osFamily.name,
-        version = "unknown", 
-        arch = Platform.cpuArchitecture.name,
-        kernelVersion = getNativeKernelVersion()
-    )
-}
-
-internal expect fun getNativeKernelVersion(): String?
-
-actual fun isProcessSupported(): Boolean = isNativeProcessSupported()
-
-internal expect fun isNativeProcessSupported(): Boolean
-
-actual fun getSystemProcessRunner(): LyngProcessRunner = getNativeProcessRunner()
-
-internal expect fun getNativeProcessRunner(): LyngProcessRunner

lynglib/build.gradle.kts

@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 group = "net.sergeych"
-version = "1.2.1"
+version = "1.1.0-SNAPSHOT"
 
 // Removed legacy buildscript classpath declarations; plugins are applied via the plugins DSL below
 
@@ -46,7 +46,6 @@ buildkonfig {
 }
 
 kotlin {
-    jvmToolchain(17)
     jvm()
     androidTarget {
         publishLibraryVariants("release")
@@ -97,7 +96,6 @@ kotlin {
             kotlin.srcDir("$buildDir/generated/buildConfig/commonMain/kotlin")
             dependencies {
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
-                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
                 //put your multiplatform dependencies here
                 api(libs.kotlinx.coroutines.core)
                 api(libs.mp.bintools)

lynglib/src/androidMain/kotlin/net/sergeych/lyng/ArgBuilderAndroid.kt

@@ -23,7 +23,7 @@ actual object ArgBuilderProvider {
     private val tl = object : ThreadLocal<AndroidArgsBuilder>() {
         override fun initialValue(): AndroidArgsBuilder = AndroidArgsBuilder()
     }
-    actual fun acquire(): ArgsBuilder = tl.get()!!
+    actual fun acquire(): ArgsBuilder = tl.get()
 }
 
 private class AndroidArgsBuilder : ArgsBuilder {

lynglib/src/androidMain/kotlin/net/sergeych/lyng/BenchmarksAndroid.kt

@@ -1,28 +0,0 @@
-/*
- * 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
-
-actual object Benchmarks {
-    actual val enabled: Boolean = run {
-        val p = System.getProperty("LYNG_BENCHMARKS")?.lowercase()
-        val e = System.getenv("BENCHMARKS")?.lowercase()
-        fun parse(v: String?): Boolean =
-            v == "true" || v == "1" || v == "yes"
-        parse(p) || parse(e)
-    }
-}

lynglib/src/androidMain/kotlin/net/sergeych/lyng/PerfDefaults.android.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * 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.
@@ -23,7 +23,7 @@ actual object PerfDefaults {
 
     actual val ARG_BUILDER: Boolean = true
     actual val SKIP_ARGS_ON_NULL_RECEIVER: Boolean = true
-    actual val SCOPE_POOL: Boolean = true
+    actual val SCOPE_POOL: Boolean = false
 
     actual val FIELD_PIC: Boolean = true
     actual val METHOD_PIC: Boolean = true