Compare commits
8
Commits
474293cfe3
..
1.2.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
75723adbbc | ||
|
|
b7fe04d65f | ||
|
|
ec28b219f3 | ||
|
|
6fa57c8197 | ||
|
|
2d2a74656c | ||
|
|
80933c287d | ||
|
|
017111827d | ||
|
|
d2632cb99e |
No files matched your search
@@ -0,0 +1,11 @@
|
|||||||
|
# Lyng Project Guidelines
|
||||||
|
|
||||||
|
This project uses the Lyng scripting language for multiplatform scripting.
|
||||||
|
|
||||||
|
## Coding in Lyng
|
||||||
|
When writing, refactoring, or analyzing Lyng code:
|
||||||
|
- **Reference**: Always use `LYNG_AI_SPEC.md` in the project root as the primary source of truth for syntax and idioms.
|
||||||
|
- **File Extensions**: Use `.lyng` for all script files.
|
||||||
|
- **Implicit Coroutines**: Remember that all Lyng functions are implicitly coroutines; do not look for `async/await`.
|
||||||
|
- **Everything is an Expression**: Leverage the fact that blocks, if-statements, and loops return values.
|
||||||
|
- **Maps vs Blocks**: Be careful: `{}` is a block/lambda, use `Map()` for an empty map.
|
||||||
@@ -21,6 +21,12 @@
|
|||||||
- MI Satisfaction: Abstract requirements are automatically satisfied by matching concrete members found later in the C3 MRO chain without requiring explicit proxy methods.
|
- MI Satisfaction: Abstract requirements are automatically satisfied by matching concrete members found later in the C3 MRO chain without requiring explicit proxy methods.
|
||||||
- Integration: Updated highlighters (lynglib, lyngweb, IDEA plugin), IDEA completion, and Grazie grammar checking.
|
- Integration: Updated highlighters (lynglib, lyngweb, IDEA plugin), IDEA completion, and Grazie grammar checking.
|
||||||
- Documentation: Updated `docs/OOP.md` with sections on "Abstract Classes and Members", "Interfaces", and "Overriding and Virtual Dispatch".
|
- Documentation: Updated `docs/OOP.md` with sections on "Abstract Classes and Members", "Interfaces", and "Overriding and Virtual Dispatch".
|
||||||
|
- IDEA plugin: Improved natural language support and spellchecking
|
||||||
|
- Disabled the limited built-in English and Technical dictionaries.
|
||||||
|
- Enforced usage of the platform's standard Natural Languages (Grazie) and Spellchecker components.
|
||||||
|
- Integrated `SpellCheckerManager` for word suggestions and validation, respecting users' personal and project dictionaries.
|
||||||
|
- Added project-specific "learned words" support via `Lyng Formatter` settings and quick-fixes.
|
||||||
|
- Enhanced fallback spellchecker for technical terms and Lyng-specific vocabulary.
|
||||||
|
|
||||||
- Language: Class properties with accessors
|
- Language: Class properties with accessors
|
||||||
- Support for `val` (read-only) and `var` (read-write) properties in classes.
|
- Support for `val` (read-only) and `var` (read-write) properties in classes.
|
||||||
|
|||||||
+105
@@ -0,0 +1,105 @@
|
|||||||
|
# Lyng Language AI Specification (V1.3)
|
||||||
|
|
||||||
|
High-density specification for LLMs. Reference this for all Lyng code generation.
|
||||||
|
|
||||||
|
## 1. Core Philosophy & Syntax
|
||||||
|
- **Everything is an Expression**: Blocks, `if`, `when`, `for`, `while`, `do-while` return their last expression (or `void`).
|
||||||
|
- **Loops with `else`**: `for`, `while`, and `do-while` support an optional `else` block.
|
||||||
|
- `else` executes **only if** the loop finishes normally (without a `break`).
|
||||||
|
- `break <value>` exits the loop and sets its return value.
|
||||||
|
- Loop Return Value:
|
||||||
|
1. Value from `break <value>`.
|
||||||
|
2. Result of `else` block (if loop finished normally and `else` exists).
|
||||||
|
3. Result of the last iteration (if loop finished normally and no `else`).
|
||||||
|
4. `void` (if loop body never executed and no `else`).
|
||||||
|
- **Implicit Coroutines**: All functions are coroutines. No `async/await`. Use `launch { ... }` (returns `Deferred`) or `flow { ... }`.
|
||||||
|
- **Variables**: `val` (read-only), `var` (mutable). Supports late-init `val` in classes (must be assigned in `init` or body).
|
||||||
|
- **Null Safety**: `?` (nullable type), `?.` (safe access), `?( )` (safe invoke), `?{ }` (safe block invoke), `?[ ]` (safe index), `?:` or `??` (elvis), `?=` (assign-if-null).
|
||||||
|
- **Equality**: `==` (equals), `!=` (not equals), `===` (ref identity), `!==` (ref not identity).
|
||||||
|
- **Comparison**: `<`, `>`, `<=`, `>=`, `<=>` (shuttle/spaceship, returns -1, 0, 1).
|
||||||
|
- **Destructuring**: `val [a, b, rest...] = list`. Supports nested `[a, [b, c]]` and splats.
|
||||||
|
|
||||||
|
## 2. Object-Oriented Programming (OOP)
|
||||||
|
- **Multiple Inheritance**: Supported with **C3 MRO** (Python-style). Diamond-safe.
|
||||||
|
- **Header Arguments**: `class Foo(a, b) : Base(a)` defines fields `a`, `b` and passes `a` to `Base`.
|
||||||
|
- **Members**: `fun name(args) { ... }`, `val`, `var`, `static val`, `static fun`.
|
||||||
|
- **Properties (Get/Set)**: Pure accessors, no auto-backing fields.
|
||||||
|
```lyng
|
||||||
|
var age
|
||||||
|
get() = _age
|
||||||
|
private set(v) { if(v >= 0) _age = v }
|
||||||
|
// Laconic syntax:
|
||||||
|
val area get = π * r * r
|
||||||
|
```
|
||||||
|
- **Mandatory `override`**: Required for all members existing in the ancestor chain.
|
||||||
|
- **Visibility**: `public` (default), `protected` (subclasses), `private` (this class instance only). `private set` / `protected set` allowed on properties.
|
||||||
|
- **Disambiguation**: `this@Base.member()` or `(obj as Base).member()`. `as` returns a qualified view.
|
||||||
|
- **Abstract/Interface**: `interface` is a synonym for `abstract class`. Both support state and constructors.
|
||||||
|
- **Extensions**: `fun Class.ext()` or `val Class.ext get = ...`. Scope-isolated.
|
||||||
|
|
||||||
|
## 3. Delegation (`by`)
|
||||||
|
Unified model for `val`, `var`, and `fun`.
|
||||||
|
```lyng
|
||||||
|
val x by MyDelegate()
|
||||||
|
var y by Map() // Uses "y" as key in map
|
||||||
|
fn f(a, b) by RemoteProxy() // Calls Proxy.invoke(thisRef, "f", a, b)
|
||||||
|
```
|
||||||
|
Delegate Methods:
|
||||||
|
- `getValue(thisRef, name)`: for `val`/`var`.
|
||||||
|
- `setValue(thisRef, name, val)`: for `var`.
|
||||||
|
- `invoke(thisRef, name, args...)`: for `fn` (called if `getValue` is absent).
|
||||||
|
- `bind(name, access, thisRef)`: optional hook called at declaration/binding time. `access` is `DelegateAccess.Val`, `Var`, or `Callable`.
|
||||||
|
|
||||||
|
## 4. Standard Library & Functional Built-ins
|
||||||
|
- **Scope Functions**:
|
||||||
|
- `obj.let { it... }`: result of block. `it` is `obj`.
|
||||||
|
- `obj.apply { this... }`: returns `obj`. `this` is `obj`.
|
||||||
|
- `obj.also { it... }`: returns `obj`. `it` is `obj`.
|
||||||
|
- `obj.run { this... }`: result of block. `this` is `obj`.
|
||||||
|
- `with(obj, { ... })`: result of block. `this` is `obj`.
|
||||||
|
- **Functional**: `forEach`, `map`, `filter`, `any`, `all`, `sum`, `count`, `sortedBy`, `flatten`, `flatMap`, `associateBy`.
|
||||||
|
- **Lazy**: `val x = cached { expensive() }` (call as `x()`) or `val x by lazy { ... }`.
|
||||||
|
- **Collections**: `List` ( `[a, b]` ), `Map` ( `Map(k => v)` ), `Set` ( `Set(a, b)` ). `MapEntry` ( `k => v` ).
|
||||||
|
|
||||||
|
## 5. Patterns & Shorthands
|
||||||
|
- **Map Literals**: `{ key: value, identifier: }` (identifier shorthand `x:` is `x: x`). Empty map is `Map()`.
|
||||||
|
- **Named Arguments**: `fun(y: 10, x: 5)`. Shorthand: `Point(x:, y:)`.
|
||||||
|
- **Varargs & Splats**: `fun f(args...)`, `f(...otherList)`.
|
||||||
|
- **Labels**: `loop@ for(x in list) { if(x == 0) break@loop }`.
|
||||||
|
- **Dynamic**: `val d = dynamic { get { name -> ... } }` allows `d.anyName`.
|
||||||
|
|
||||||
|
## 6. Operators & Methods to Overload
|
||||||
|
| Op | Method | Op | Method |
|
||||||
|
| :--- | :--- | :--- | :--- |
|
||||||
|
| `+` | `plus` | `==` | `equals` |
|
||||||
|
| `-` | `minus` | `<=>` | `compareTo` |
|
||||||
|
| `*` | `mul` | `[]` | `getAt` / `putAt` |
|
||||||
|
| `/` | `div` | `!` | `logicalNot` |
|
||||||
|
| `%` | `mod` | `-` | `negate` (unary) |
|
||||||
|
| `=~` | `operatorMatch` | `+=` | `plusAssign` |
|
||||||
|
|
||||||
|
## 7. Common Snippets
|
||||||
|
```lyng
|
||||||
|
// Multiple Inheritance and Properties
|
||||||
|
class Warrior(id, hp) : Character(id), HealthPool(hp) {
|
||||||
|
override fun toString() = "Warrior #%s (%s HP)"(id, hp)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Map entry and merging
|
||||||
|
val m = Map("a" => 1) + ("b" => 2)
|
||||||
|
m += "c" => 3
|
||||||
|
|
||||||
|
// Destructuring with splat
|
||||||
|
val [first, middle..., last] = [1, 2, 3, 4, 5]
|
||||||
|
|
||||||
|
// Safe Navigation and Elvis
|
||||||
|
val companyName = person?.job?.company?.name ?? "Freelancer"
|
||||||
|
```
|
||||||
|
|
||||||
|
## 8. Standard Library Discovery
|
||||||
|
To collect data on the standard library and available APIs, AI should inspect:
|
||||||
|
- **Global Symbols**: `lynglib/src/commonMain/kotlin/net/sergeych/lyng/Script.kt` (root functions like `println`, `sqrt`, `assert`).
|
||||||
|
- **Core Type Members**: `lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/*.kt` (e.g., `ObjList.kt`, `ObjString.kt`, `ObjMap.kt`) for methods on built-in types.
|
||||||
|
- **Lyng-side Extensions**: `lynglib/stdlib/lyng/root.lyng` for high-level functional APIs (e.g., `map`, `filter`, `any`, `lazy`).
|
||||||
|
- **I/O & Processes**: `lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/` for `fs` and `process` modules.
|
||||||
|
- **Documentation**: `docs/*.md` (e.g., `tutorial.md`, `lyngio.md`) for high-level usage and module overviews.
|
||||||
@@ -140,6 +140,12 @@ Tips:
|
|||||||
- After a dot, globals are intentionally suppressed (e.g., `lines().Path` is not valid), only the receiver’s members are suggested.
|
- After a dot, globals are intentionally suppressed (e.g., `lines().Path` is not valid), only the receiver’s members are suggested.
|
||||||
- If completion seems sparse, make sure related modules are imported (e.g., `import lyng.io.fs` so that `Path` and its methods are known).
|
- If completion seems sparse, make sure related modules are imported (e.g., `import lyng.io.fs` so that `Path` and its methods are known).
|
||||||
|
|
||||||
|
## AI Assistant Support
|
||||||
|
|
||||||
|
To help AI assistants (like Cursor, Windsurf, or GitHub Copilot) understand Lyng with minimal effort, we provide a high-density language specification:
|
||||||
|
|
||||||
|
- **[LYNG_AI_SPEC.md](LYNG_AI_SPEC.md)**: A concise guide for AI models to learn Lyng syntax, idioms, and core philosophy. We recommend pointing your AI tool to this file or including it in your project's custom instructions.
|
||||||
|
|
||||||
## Why?
|
## Why?
|
||||||
|
|
||||||
Designed to add scripting to kotlin multiplatform application in easy and efficient way. This is attempt to achieve what Lua is for C/++.
|
Designed to add scripting to kotlin multiplatform application in easy and efficient way. This is attempt to achieve what Lua is for C/++.
|
||||||
|
|||||||
+8
-2
@@ -1252,7 +1252,7 @@ The same with `--`:
|
|||||||
sum
|
sum
|
||||||
>>> 5050
|
>>> 5050
|
||||||
|
|
||||||
There are self-assigning version for operators too:
|
There is a self-assigning version for operators too:
|
||||||
|
|
||||||
var count = 100
|
var count = 100
|
||||||
var sum = 0
|
var sum = 0
|
||||||
@@ -1471,7 +1471,13 @@ Part match:
|
|||||||
assert( "foo" == $~.value )
|
assert( "foo" == $~.value )
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
Typical set of String functions includes:
|
Repeating the fragment:
|
||||||
|
|
||||||
|
assertEquals("hellohello", "hello"*2)
|
||||||
|
assertEquals("", "hello"*0)
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
A typical set of String functions includes:
|
||||||
|
|
||||||
| fun/prop | description / notes |
|
| fun/prop | description / notes |
|
||||||
|----------------------|------------------------------------------------------------|
|
|----------------------|------------------------------------------------------------|
|
||||||
|
|||||||
@@ -0,0 +1,144 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng.idea.actions
|
||||||
|
|
||||||
|
import com.intellij.execution.filters.TextConsoleBuilderFactory
|
||||||
|
import com.intellij.execution.ui.ConsoleView
|
||||||
|
import com.intellij.execution.ui.ConsoleViewContentType
|
||||||
|
import com.intellij.openapi.actionSystem.AnAction
|
||||||
|
import com.intellij.openapi.actionSystem.AnActionEvent
|
||||||
|
import com.intellij.openapi.actionSystem.CommonDataKeys
|
||||||
|
import com.intellij.openapi.project.Project
|
||||||
|
import com.intellij.openapi.wm.ToolWindow
|
||||||
|
import com.intellij.openapi.wm.ToolWindowAnchor
|
||||||
|
import com.intellij.openapi.wm.ToolWindowId
|
||||||
|
import com.intellij.openapi.wm.ToolWindowManager
|
||||||
|
import com.intellij.psi.PsiFile
|
||||||
|
import com.intellij.psi.PsiManager
|
||||||
|
import com.intellij.ui.content.ContentFactory
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.SupervisorJob
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
import net.sergeych.lyng.ExecutionError
|
||||||
|
import net.sergeych.lyng.Script
|
||||||
|
import net.sergeych.lyng.Source
|
||||||
|
import net.sergeych.lyng.idea.LyngIcons
|
||||||
|
import net.sergeych.lyng.obj.ObjVoid
|
||||||
|
import net.sergeych.lyng.obj.getLyngExceptionMessageWithStackTrace
|
||||||
|
|
||||||
|
class RunLyngScriptAction : AnAction(LyngIcons.FILE) {
|
||||||
|
private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
|
||||||
|
|
||||||
|
private fun getPsiFile(e: AnActionEvent): PsiFile? {
|
||||||
|
val project = e.project ?: return null
|
||||||
|
return e.getData(CommonDataKeys.PSI_FILE) ?: run {
|
||||||
|
val vf = e.getData(CommonDataKeys.VIRTUAL_FILE)
|
||||||
|
if (vf != null) PsiManager.getInstance(project).findFile(vf) else null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun update(e: AnActionEvent) {
|
||||||
|
val psiFile = getPsiFile(e)
|
||||||
|
val isLyng = psiFile?.name?.endsWith(".lyng") == true
|
||||||
|
e.presentation.isEnabledAndVisible = isLyng
|
||||||
|
if (isLyng) {
|
||||||
|
e.presentation.text = "Run '${psiFile.name}'"
|
||||||
|
} else {
|
||||||
|
e.presentation.text = "Run Lyng Script"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun actionPerformed(e: AnActionEvent) {
|
||||||
|
val project = e.project ?: return
|
||||||
|
val psiFile = getPsiFile(e) ?: return
|
||||||
|
val text = psiFile.text
|
||||||
|
val fileName = psiFile.name
|
||||||
|
|
||||||
|
val (console, toolWindow) = getConsoleAndToolWindow(project)
|
||||||
|
console.clear()
|
||||||
|
|
||||||
|
toolWindow.show {
|
||||||
|
scope.launch {
|
||||||
|
try {
|
||||||
|
val lyngScope = Script.newScope()
|
||||||
|
lyngScope.addFn("print") {
|
||||||
|
val sb = StringBuilder()
|
||||||
|
for ((i, arg) in args.list.withIndex()) {
|
||||||
|
if (i > 0) sb.append(" ")
|
||||||
|
sb.append(arg.toString(this).value)
|
||||||
|
}
|
||||||
|
console.print(sb.toString(), ConsoleViewContentType.NORMAL_OUTPUT)
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
lyngScope.addFn("println") {
|
||||||
|
val sb = StringBuilder()
|
||||||
|
for ((i, arg) in args.list.withIndex()) {
|
||||||
|
if (i > 0) sb.append(" ")
|
||||||
|
sb.append(arg.toString(this).value)
|
||||||
|
}
|
||||||
|
console.print(sb.toString() + "\n", ConsoleViewContentType.NORMAL_OUTPUT)
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
|
||||||
|
console.print("--- Running $fileName ---\n", ConsoleViewContentType.SYSTEM_OUTPUT)
|
||||||
|
val result = lyngScope.eval(Source(fileName, text))
|
||||||
|
console.print("\n--- Finished with result: ${result.inspect(lyngScope)} ---\n", ConsoleViewContentType.SYSTEM_OUTPUT)
|
||||||
|
} catch (t: Throwable) {
|
||||||
|
console.print("\n--- Error ---\n", ConsoleViewContentType.ERROR_OUTPUT)
|
||||||
|
if( t is ExecutionError ) {
|
||||||
|
val m = t.errorObject.getLyngExceptionMessageWithStackTrace()
|
||||||
|
console.print(m, ConsoleViewContentType.ERROR_OUTPUT)
|
||||||
|
}
|
||||||
|
else
|
||||||
|
console.print(t.message ?: t.toString(), ConsoleViewContentType.ERROR_OUTPUT)
|
||||||
|
console.print("\n", ConsoleViewContentType.ERROR_OUTPUT)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getConsoleAndToolWindow(project: Project): Pair<ConsoleView, ToolWindow> {
|
||||||
|
val toolWindowManager = ToolWindowManager.getInstance(project)
|
||||||
|
var toolWindow = toolWindowManager.getToolWindow(ToolWindowId.RUN)
|
||||||
|
if (toolWindow == null) {
|
||||||
|
toolWindow = toolWindowManager.getToolWindow(ToolWindowId.MESSAGES_WINDOW)
|
||||||
|
}
|
||||||
|
if (toolWindow == null) {
|
||||||
|
toolWindow = toolWindowManager.getToolWindow("Lyng")
|
||||||
|
}
|
||||||
|
val actualToolWindow = toolWindow ?: run {
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
|
toolWindowManager.registerToolWindow("Lyng", true, ToolWindowAnchor.BOTTOM)
|
||||||
|
}
|
||||||
|
|
||||||
|
val contentManager = actualToolWindow.contentManager
|
||||||
|
val existingContent = contentManager.findContent("Lyng Run")
|
||||||
|
if (existingContent != null) {
|
||||||
|
val console = existingContent.component as ConsoleView
|
||||||
|
contentManager.setSelectedContent(existingContent)
|
||||||
|
return console to actualToolWindow
|
||||||
|
}
|
||||||
|
|
||||||
|
val console = TextConsoleBuilderFactory.getInstance().createBuilder(project).console
|
||||||
|
val content = ContentFactory.getInstance().createContent(console.component, "Lyng Run", false)
|
||||||
|
contentManager.addContent(content)
|
||||||
|
contentManager.setSelectedContent(content)
|
||||||
|
return console to actualToolWindow
|
||||||
|
}
|
||||||
|
}
|
||||||
+4
-62
@@ -44,10 +44,7 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
|
|
||||||
data class Span(val start: Int, val end: Int, val key: com.intellij.openapi.editor.colors.TextAttributesKey)
|
data class Span(val start: Int, val end: Int, val key: com.intellij.openapi.editor.colors.TextAttributesKey)
|
||||||
data class Error(val start: Int, val end: Int, val message: String)
|
data class Error(val start: Int, val end: Int, val message: String)
|
||||||
data class Result(val modStamp: Long, val spans: List<Span>, val error: Error? = null,
|
data class Result(val modStamp: Long, val spans: List<Span>, val error: Error? = null)
|
||||||
val spellIdentifiers: List<IntRange> = emptyList(),
|
|
||||||
val spellComments: List<IntRange> = emptyList(),
|
|
||||||
val spellStrings: List<IntRange> = emptyList())
|
|
||||||
|
|
||||||
override fun collectInformation(file: PsiFile): Input? {
|
override fun collectInformation(file: PsiFile): Input? {
|
||||||
val doc: Document = file.viewProvider.document ?: return null
|
val doc: Document = file.viewProvider.document ?: return null
|
||||||
@@ -62,6 +59,7 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
if (collectedInfo == null) return null
|
if (collectedInfo == null) return null
|
||||||
ProgressManager.checkCanceled()
|
ProgressManager.checkCanceled()
|
||||||
val text = collectedInfo.text
|
val text = collectedInfo.text
|
||||||
|
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
||||||
|
|
||||||
// Use LyngAstManager to get the (potentially merged) Mini-AST
|
// Use LyngAstManager to get the (potentially merged) Mini-AST
|
||||||
val mini = LyngAstManager.getMiniAst(collectedInfo.file)
|
val mini = LyngAstManager.getMiniAst(collectedInfo.file)
|
||||||
@@ -224,8 +222,6 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
// Heuristics on top of binder: function call-sites and simple name-based roles
|
// Heuristics on top of binder: function call-sites and simple name-based roles
|
||||||
ProgressManager.checkCanceled()
|
ProgressManager.checkCanceled()
|
||||||
|
|
||||||
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
|
||||||
|
|
||||||
// Build simple name -> role map for top-level vals/vars and parameters
|
// Build simple name -> role map for top-level vals/vars and parameters
|
||||||
val nameRole = HashMap<String, com.intellij.openapi.editor.colors.TextAttributesKey>(8)
|
val nameRole = HashMap<String, com.intellij.openapi.editor.colors.TextAttributesKey>(8)
|
||||||
mini.declarations.forEach { d ->
|
mini.declarations.forEach { d ->
|
||||||
@@ -280,7 +276,6 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
|
|
||||||
// Add annotation/label coloring using token highlighter
|
// Add annotation/label coloring using token highlighter
|
||||||
run {
|
run {
|
||||||
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
|
||||||
tokens.forEach { s ->
|
tokens.forEach { s ->
|
||||||
if (s.kind == HighlightKind.Label) {
|
if (s.kind == HighlightKind.Label) {
|
||||||
val start = s.range.start
|
val start = s.range.start
|
||||||
@@ -320,9 +315,6 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Map Enum constants from token highlighter to IDEA enum constant color
|
|
||||||
run {
|
|
||||||
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
|
||||||
tokens.forEach { s ->
|
tokens.forEach { s ->
|
||||||
if (s.kind == HighlightKind.EnumConstant) {
|
if (s.kind == HighlightKind.EnumConstant) {
|
||||||
val start = s.range.start
|
val start = s.range.start
|
||||||
@@ -332,34 +324,10 @@ 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)
|
|
||||||
binding.symbols.forEach { sym ->
|
|
||||||
val s = sym.declStart
|
|
||||||
val e = sym.declEnd
|
|
||||||
if (s in 0..e && e <= text.length && s < e) idRanges += (s until e)
|
|
||||||
}
|
|
||||||
binding.references.forEach { ref ->
|
|
||||||
val s = ref.start
|
|
||||||
val e = ref.end
|
|
||||||
if (s in 0..e && e <= text.length && s < e) idRanges += (s until e)
|
|
||||||
}
|
|
||||||
} catch (_: Throwable) {
|
|
||||||
// Best-effort; no identifiers if binder fails
|
|
||||||
}
|
|
||||||
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
|
||||||
val commentRanges = tokens.filter { it.kind == HighlightKind.Comment }.map { it.range.start until it.range.endExclusive }
|
|
||||||
val stringRanges = tokens.filter { it.kind == HighlightKind.String }.map { it.range.start until it.range.endExclusive }
|
|
||||||
|
|
||||||
return Result(collectedInfo.modStamp, out, null,
|
|
||||||
spellIdentifiers = idRanges.toList(),
|
|
||||||
spellComments = commentRanges,
|
|
||||||
spellStrings = stringRanges)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun apply(file: PsiFile, annotationResult: Result?, holder: AnnotationHolder) {
|
override fun apply(file: PsiFile, annotationResult: Result?, holder: AnnotationHolder) {
|
||||||
if (annotationResult == null) return
|
if (annotationResult == null) return
|
||||||
@@ -371,32 +339,6 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
|
|
||||||
val doc = file.viewProvider.document
|
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) {
|
for (s in result.spans) {
|
||||||
holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
|
holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
|
||||||
.range(TextRange(s.start, s.end))
|
.range(TextRange(s.start, s.end))
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
|
|
||||||
import com.intellij.codeInsight.intention.IntentionAction
|
|
||||||
import com.intellij.openapi.editor.Editor
|
|
||||||
import com.intellij.openapi.project.Project
|
|
||||||
import com.intellij.psi.PsiFile
|
|
||||||
import net.sergeych.lyng.idea.settings.LyngFormatterSettings
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lightweight quick-fix that adds a word to the per-project Lyng dictionary.
|
|
||||||
*/
|
|
||||||
class AddToLyngDictionaryFix(private val word: String) : IntentionAction {
|
|
||||||
override fun getText(): String = "Add '$word' to Lyng dictionary"
|
|
||||||
override fun getFamilyName(): String = "Lyng Spelling"
|
|
||||||
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?): Boolean = word.isNotBlank()
|
|
||||||
override fun startInWriteAction(): Boolean = true
|
|
||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor?, file: PsiFile?) {
|
|
||||||
val settings = LyngFormatterSettings.getInstance(project)
|
|
||||||
val learned = settings.learnedWords
|
|
||||||
learned.add(word.lowercase())
|
|
||||||
settings.learnedWords = learned
|
|
||||||
// Restart daemon to refresh highlights
|
|
||||||
if (file != null) DaemonCodeAnalyzer.getInstance(project).restart(file)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import java.io.BufferedReader
|
|
||||||
import java.io.InputStreamReader
|
|
||||||
import java.util.zip.GZIPInputStream
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Very simple English dictionary loader for offline suggestions on IC-243.
|
|
||||||
* It loads a word list from classpath resources. Supports plain text (one word per line)
|
|
||||||
* and gzipped text if the resource ends with .gz.
|
|
||||||
*/
|
|
||||||
object EnglishDictionary {
|
|
||||||
private val log = Logger.getInstance(EnglishDictionary::class.java)
|
|
||||||
|
|
||||||
@Volatile private var loaded = false
|
|
||||||
@Volatile private var words: Set<String> = emptySet()
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load dictionary from bundled resources (once).
|
|
||||||
* If multiple candidates exist, the first found is used.
|
|
||||||
*/
|
|
||||||
private fun ensureLoaded() {
|
|
||||||
if (loaded) return
|
|
||||||
synchronized(this) {
|
|
||||||
if (loaded) return
|
|
||||||
val candidates = listOf(
|
|
||||||
// preferred large bundles first (add en-basic.txt.gz ~3–5MB here)
|
|
||||||
"/dictionaries/en-basic.txt.gz",
|
|
||||||
"/dictionaries/en-large.txt.gz",
|
|
||||||
// plain text fallbacks
|
|
||||||
"/dictionaries/en-basic.txt",
|
|
||||||
"/dictionaries/en-large.txt",
|
|
||||||
)
|
|
||||||
val merged = HashSet<String>(128_000)
|
|
||||||
for (res in candidates) {
|
|
||||||
try {
|
|
||||||
val stream = javaClass.getResourceAsStream(res) ?: continue
|
|
||||||
val reader = if (res.endsWith(".gz"))
|
|
||||||
BufferedReader(InputStreamReader(GZIPInputStream(stream)))
|
|
||||||
else
|
|
||||||
BufferedReader(InputStreamReader(stream))
|
|
||||||
var loadedCount = 0
|
|
||||||
reader.useLines { seq -> seq.forEach { line ->
|
|
||||||
val w = line.trim()
|
|
||||||
if (w.isNotEmpty() && !w.startsWith("#")) { merged += w.lowercase(); loadedCount++ }
|
|
||||||
} }
|
|
||||||
log.info("EnglishDictionary: loaded $loadedCount words from $res (total=${merged.size})")
|
|
||||||
} catch (t: Throwable) {
|
|
||||||
log.info("EnglishDictionary: failed to load $res: ${t.javaClass.simpleName}: ${t.message}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (merged.isEmpty()) {
|
|
||||||
// Fallback minimal set
|
|
||||||
merged += setOf("comment","comments","error","errors","found","file","not","word","words","count","value","name","class","function","string")
|
|
||||||
log.info("EnglishDictionary: using minimal built-in set (${merged.size})")
|
|
||||||
}
|
|
||||||
words = merged
|
|
||||||
loaded = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun allWords(): Set<String> {
|
|
||||||
ensureLoaded()
|
|
||||||
return words
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,609 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Grazie-backed annotator for Lyng files.
|
|
||||||
*
|
|
||||||
* It consumes the MiniAst-driven LyngSpellIndex and, when Grazie is present,
|
|
||||||
* tries to run Grazie checks on the extracted TextContent. Results are painted
|
|
||||||
* as warnings in the editor. If the Grazie API changes, we use reflection and
|
|
||||||
* fail softly with INFO logs (no errors shown to users).
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
|
|
||||||
import com.intellij.grazie.text.TextContent
|
|
||||||
import com.intellij.grazie.text.TextContent.TextDomain
|
|
||||||
import com.intellij.ide.plugins.PluginManagerCore
|
|
||||||
import com.intellij.lang.annotation.AnnotationHolder
|
|
||||||
import com.intellij.lang.annotation.ExternalAnnotator
|
|
||||||
import com.intellij.lang.annotation.HighlightSeverity
|
|
||||||
import com.intellij.openapi.application.ApplicationManager
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import com.intellij.openapi.editor.Document
|
|
||||||
import com.intellij.openapi.editor.colors.TextAttributesKey
|
|
||||||
import com.intellij.openapi.project.DumbAware
|
|
||||||
import com.intellij.openapi.util.Key
|
|
||||||
import com.intellij.openapi.util.TextRange
|
|
||||||
import com.intellij.psi.PsiFile
|
|
||||||
import net.sergeych.lyng.idea.settings.LyngFormatterSettings
|
|
||||||
import net.sergeych.lyng.idea.spell.LyngSpellIndex
|
|
||||||
|
|
||||||
class LyngGrazieAnnotator : ExternalAnnotator<LyngGrazieAnnotator.Input, LyngGrazieAnnotator.Result>(), DumbAware {
|
|
||||||
private val log = Logger.getInstance(LyngGrazieAnnotator::class.java)
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
// Cache GrammarChecker availability to avoid repeated reflection + noisy logs
|
|
||||||
@Volatile
|
|
||||||
private var grammarCheckerAvailable: Boolean? = null
|
|
||||||
|
|
||||||
@Volatile
|
|
||||||
private var grammarCheckerMissingLogged: Boolean = false
|
|
||||||
|
|
||||||
private fun isGrammarCheckerKnownMissing(): Boolean = (grammarCheckerAvailable == false)
|
|
||||||
|
|
||||||
private fun markGrammarCheckerMissingOnce(log: Logger, message: String) {
|
|
||||||
if (!grammarCheckerMissingLogged) {
|
|
||||||
// Downgrade to debug to reduce log noise across projects/sessions
|
|
||||||
log.debug(message)
|
|
||||||
grammarCheckerMissingLogged = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private val RETRY_KEY: Key<Long> = Key.create("LYNG_GRAZIE_ANN_RETRY_STAMP")
|
|
||||||
}
|
|
||||||
|
|
||||||
data class Input(val modStamp: Long)
|
|
||||||
data class Finding(val range: TextRange, val message: String)
|
|
||||||
data class Result(val modStamp: Long, val findings: List<Finding>)
|
|
||||||
|
|
||||||
override fun collectInformation(file: PsiFile): Input? {
|
|
||||||
val doc: Document = file.viewProvider.document ?: return null
|
|
||||||
// Only require Grazie presence; index readiness is checked in apply with a retry.
|
|
||||||
val grazie = isGrazieInstalled()
|
|
||||||
if (!grazie) {
|
|
||||||
log.info("LyngGrazieAnnotator.collectInformation: skip (grazie=false) file='${file.name}'")
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
log.info("LyngGrazieAnnotator.collectInformation: file='${file.name}', modStamp=${doc.modificationStamp}")
|
|
||||||
return Input(doc.modificationStamp)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun doAnnotate(collectedInfo: Input?): Result? {
|
|
||||||
// All heavy lifting is done in apply where we have the file context
|
|
||||||
return collectedInfo?.let { Result(it.modStamp, emptyList()) }
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun apply(file: PsiFile, annotationResult: Result?, holder: AnnotationHolder) {
|
|
||||||
if (annotationResult == null || !isGrazieInstalled()) return
|
|
||||||
val doc = file.viewProvider.document ?: return
|
|
||||||
val idx = LyngSpellIndex.getUpToDate(file) ?: run {
|
|
||||||
log.info("LyngGrazieAnnotator.apply: index not ready for '${file.name}', scheduling one-shot restart")
|
|
||||||
scheduleOneShotRestart(file, annotationResult.modStamp)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
val settings = LyngFormatterSettings.getInstance(file.project)
|
|
||||||
|
|
||||||
// Build TextContent fragments for comments/strings/identifiers according to settings
|
|
||||||
val fragments = mutableListOf<Pair<TextContent, TextRange>>()
|
|
||||||
try {
|
|
||||||
fun addFragments(ranges: List<TextRange>, domain: TextDomain) {
|
|
||||||
for (r in ranges) {
|
|
||||||
val local = rangeToTextContent(file, domain, r) ?: continue
|
|
||||||
fragments += local to r
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Comments always via COMMENTS
|
|
||||||
addFragments(idx.comments, TextDomain.COMMENTS)
|
|
||||||
// Strings: LITERALS if requested, else COMMENTS if fallback enabled
|
|
||||||
if (settings.spellCheckStringLiterals) {
|
|
||||||
val domain = if (settings.grazieTreatLiteralsAsComments) TextDomain.COMMENTS else TextDomain.LITERALS
|
|
||||||
addFragments(idx.strings, domain)
|
|
||||||
}
|
|
||||||
// Identifiers via COMMENTS to force painting in 243 unless user disables fallback
|
|
||||||
val idsDomain = if (settings.grazieTreatIdentifiersAsComments) TextDomain.COMMENTS else TextDomain.DOCUMENTATION
|
|
||||||
addFragments(idx.identifiers, idsDomain)
|
|
||||||
log.info(
|
|
||||||
"LyngGrazieAnnotator.apply: file='${file.name}', idxCounts ids=${idx.identifiers.size}, comments=${idx.comments.size}, strings=${idx.strings.size}, builtFragments=${fragments.size}"
|
|
||||||
)
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator: failed to build TextContent fragments: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fragments.isEmpty()) return
|
|
||||||
|
|
||||||
val findings = mutableListOf<Finding>()
|
|
||||||
var totalReturned = 0
|
|
||||||
var chosenEntry: String? = null
|
|
||||||
for ((content, hostRange) in fragments) {
|
|
||||||
try {
|
|
||||||
val (typos, entryNote) = runGrazieChecksWithTracing(file, content)
|
|
||||||
if (chosenEntry == null) chosenEntry = entryNote
|
|
||||||
if (typos != null) {
|
|
||||||
totalReturned += typos.size
|
|
||||||
for (t in typos) {
|
|
||||||
val rel = extractRangeFromTypo(t) ?: continue
|
|
||||||
// Map relative range inside fragment to host file range
|
|
||||||
val abs = TextRange(hostRange.startOffset + rel.startOffset, hostRange.startOffset + rel.endOffset)
|
|
||||||
findings += Finding(abs, extractMessageFromTypo(t) ?: "Spelling/Grammar")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator: Grazie check failed: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
log.info("LyngGrazieAnnotator.apply: used=${chosenEntry ?: "<none>"}, totalFindings=$totalReturned, painting=${findings.size}")
|
|
||||||
|
|
||||||
// IMPORTANT: Do NOT fallback to the tiny bundled vocabulary on modern IDEs.
|
|
||||||
// If Grazie/Natural Languages processing returned nothing, we simply exit here
|
|
||||||
// to avoid low‑quality results from the legacy dictionary.
|
|
||||||
if (findings.isEmpty()) return
|
|
||||||
|
|
||||||
for (f in findings) {
|
|
||||||
val ab = holder.newAnnotation(HighlightSeverity.INFORMATION, f.message).range(f.range)
|
|
||||||
applyTypoStyleIfRequested(file, ab)
|
|
||||||
ab.create()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun scheduleOneShotRestart(file: PsiFile, modStamp: Long) {
|
|
||||||
try {
|
|
||||||
val last = file.getUserData(RETRY_KEY)
|
|
||||||
if (last == modStamp) {
|
|
||||||
log.info("LyngGrazieAnnotator.restart: already retried for modStamp=$modStamp, skip")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
file.putUserData(RETRY_KEY, modStamp)
|
|
||||||
ApplicationManager.getApplication().invokeLater({
|
|
||||||
try {
|
|
||||||
DaemonCodeAnalyzer.getInstance(file.project).restart(file)
|
|
||||||
log.info("LyngGrazieAnnotator.restart: daemon restarted for '${file.name}'")
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator.restart failed: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator.scheduleOneShotRestart failed: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun isGrazieInstalled(): Boolean {
|
|
||||||
return PluginManagerCore.isPluginInstalled(com.intellij.openapi.extensions.PluginId.getId("com.intellij.grazie")) ||
|
|
||||||
PluginManagerCore.isPluginInstalled(com.intellij.openapi.extensions.PluginId.getId("tanvd.grazi"))
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun rangeToTextContent(file: PsiFile, domain: TextDomain, range: TextRange): TextContent? {
|
|
||||||
// Build TextContent via reflection: prefer psiFragment(domain, element)
|
|
||||||
return try {
|
|
||||||
// Try to find an element that fully covers the target range
|
|
||||||
var element = file.findElementAt(range.startOffset) ?: return null
|
|
||||||
val start = range.startOffset
|
|
||||||
val end = range.endOffset
|
|
||||||
while (element.parent != null && (element.textRange.startOffset > start || element.textRange.endOffset < end)) {
|
|
||||||
element = element.parent
|
|
||||||
}
|
|
||||||
if (element.textRange.startOffset > start || element.textRange.endOffset < end) return null
|
|
||||||
// In many cases, the element may not span the whole range; use file + range via suitable factory
|
|
||||||
val methods = TextContent::class.java.methods.filter { it.name == "psiFragment" }
|
|
||||||
val byElementDomain = methods.firstOrNull { it.parameterCount == 2 && it.parameterTypes[0].name.endsWith("PsiElement") }
|
|
||||||
if (byElementDomain != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
return (byElementDomain.invoke(null, element, domain) as? TextContent)?.let { tc ->
|
|
||||||
val relStart = start - element.textRange.startOffset
|
|
||||||
val relEnd = end - element.textRange.startOffset
|
|
||||||
if (relStart < 0 || relEnd > tc.length || relStart >= relEnd) return null
|
|
||||||
tc.subText(TextRange(relStart, relEnd))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
val byDomainElement = methods.firstOrNull { it.parameterCount == 2 && it.parameterTypes[0].name.endsWith("TextDomain") }
|
|
||||||
if (byDomainElement != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
return (byDomainElement.invoke(null, domain, element) as? TextContent)?.let { tc ->
|
|
||||||
val relStart = start - element.textRange.startOffset
|
|
||||||
val relEnd = end - element.textRange.startOffset
|
|
||||||
if (relStart < 0 || relEnd > tc.length || relStart >= relEnd) return null
|
|
||||||
tc.subText(TextRange(relStart, relEnd))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
null
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator: rangeToTextContent failed: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun runGrazieChecksWithTracing(file: PsiFile, content: TextContent): Pair<Collection<Any>?, String?> {
|
|
||||||
// Try known entry points via reflection to avoid hard dependencies on Grazie internals
|
|
||||||
if (isGrammarCheckerKnownMissing()) return null to null
|
|
||||||
try {
|
|
||||||
// 1) Static GrammarChecker.check(TextContent)
|
|
||||||
val checkerCls = try {
|
|
||||||
Class.forName("com.intellij.grazie.grammar.GrammarChecker").also { grammarCheckerAvailable = true }
|
|
||||||
} catch (t: Throwable) {
|
|
||||||
grammarCheckerAvailable = false
|
|
||||||
markGrammarCheckerMissingOnce(log, "LyngGrazieAnnotator: GrammarChecker class not found: ${t.javaClass.simpleName}: ${t.message}")
|
|
||||||
null
|
|
||||||
}
|
|
||||||
if (checkerCls != null) {
|
|
||||||
// Diagnostic: list available 'check' methods once
|
|
||||||
runCatching {
|
|
||||||
val checks = checkerCls.methods.filter { it.name == "check" }
|
|
||||||
val sig = checks.joinToString { m ->
|
|
||||||
val params = m.parameterTypes.joinToString(prefix = "(", postfix = ")") { it.simpleName }
|
|
||||||
"${m.name}$params static=${java.lang.reflect.Modifier.isStatic(m.modifiers)}"
|
|
||||||
}
|
|
||||||
log.info("LyngGrazieAnnotator: GrammarChecker.check candidates: ${if (sig.isEmpty()) "<none>" else sig}")
|
|
||||||
}
|
|
||||||
checkerCls.methods.firstOrNull { it.name == "check" && it.parameterCount == 1 && it.parameterTypes[0].name.endsWith("TextContent") }?.let { m ->
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(null, content) as? Collection<Any>
|
|
||||||
return res to "GrammarChecker.check(TextContent) static"
|
|
||||||
}
|
|
||||||
// 2) GrammarChecker.getInstance().check(TextContent)
|
|
||||||
val getInstance = checkerCls.methods.firstOrNull { it.name == "getInstance" && it.parameterCount == 0 }
|
|
||||||
val inst = getInstance?.invoke(null)
|
|
||||||
if (inst != null) {
|
|
||||||
val m = checkerCls.methods.firstOrNull { it.name == "check" && it.parameterCount == 1 && it.parameterTypes[0].name.endsWith("TextContent") }
|
|
||||||
if (m != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(inst, content) as? Collection<Any>
|
|
||||||
return res to "GrammarChecker.getInstance().check(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 3) GrammarChecker.getDefault().check(TextContent)
|
|
||||||
val getDefault = checkerCls.methods.firstOrNull { it.name == "getDefault" && it.parameterCount == 0 }
|
|
||||||
val def = getDefault?.invoke(null)
|
|
||||||
if (def != null) {
|
|
||||||
val m = checkerCls.methods.firstOrNull { it.name == "check" && it.parameterCount == 1 && it.parameterTypes[0].name.endsWith("TextContent") }
|
|
||||||
if (m != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(def, content) as? Collection<Any>
|
|
||||||
return res to "GrammarChecker.getDefault().check(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 4) Service from project/application: GrammarChecker as a service
|
|
||||||
runCatching {
|
|
||||||
val app = com.intellij.openapi.application.ApplicationManager.getApplication()
|
|
||||||
val getService = app::class.java.methods.firstOrNull { it.name == "getService" && it.parameterCount == 1 }
|
|
||||||
val svc = getService?.invoke(app, checkerCls)
|
|
||||||
if (svc != null) {
|
|
||||||
val m = checkerCls.methods.firstOrNull { it.name == "check" && it.parameterCount == 1 && it.parameterTypes[0].name.endsWith("TextContent") }
|
|
||||||
if (m != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(svc, content) as? Collection<Any>
|
|
||||||
if (res != null) return res to "Application.getService(GrammarChecker).check(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
runCatching {
|
|
||||||
val getService = file.project::class.java.methods.firstOrNull { it.name == "getService" && it.parameterCount == 1 }
|
|
||||||
val svc = getService?.invoke(file.project, checkerCls)
|
|
||||||
if (svc != null) {
|
|
||||||
val m = checkerCls.methods.firstOrNull { it.name == "check" && it.parameterCount == 1 && it.parameterTypes[0].name.endsWith("TextContent") }
|
|
||||||
if (m != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(svc, content) as? Collection<Any>
|
|
||||||
if (res != null) return res to "Project.getService(GrammarChecker).check(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 5) Fallback: search any public method named check that accepts TextContent in any Grazie class (static)
|
|
||||||
val candidateClasses = listOf(
|
|
||||||
"com.intellij.grazie.grammar.GrammarChecker",
|
|
||||||
"com.intellij.grazie.grammar.GrammarRunner",
|
|
||||||
"com.intellij.grazie.grammar.Grammar" // historical names
|
|
||||||
)
|
|
||||||
for (cn in candidateClasses) {
|
|
||||||
val cls = try { Class.forName(cn) } catch (_: Throwable) { continue }
|
|
||||||
val m = cls.methods.firstOrNull { it.name == "check" && it.parameterTypes.any { p -> p.name.endsWith("TextContent") } }
|
|
||||||
if (m != null) {
|
|
||||||
val args = arrayOfNulls<Any>(m.parameterCount)
|
|
||||||
// place content to the first TextContent parameter; others left null (common defaults)
|
|
||||||
for (i in 0 until m.parameterCount) if (m.parameterTypes[i].name.endsWith("TextContent")) { args[i] = content; break }
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(null, *args) as? Collection<Any>
|
|
||||||
if (res != null) return res to "$cn.${m.name}(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 6) Kotlin top-level function: GrammarCheckerKt.check(TextContent)
|
|
||||||
runCatching {
|
|
||||||
val kt = Class.forName("com.intellij.grazie.grammar.GrammarCheckerKt")
|
|
||||||
val m = kt.methods.firstOrNull { it.name == "check" && it.parameterTypes.any { p -> p.name.endsWith("TextContent") } }
|
|
||||||
if (m != null) {
|
|
||||||
val args = arrayOfNulls<Any>(m.parameterCount)
|
|
||||||
for (i in 0 until m.parameterCount) if (m.parameterTypes[i].name.endsWith("TextContent")) { args[i] = content; break }
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(null, *args) as? Collection<Any>
|
|
||||||
if (res != null) return res to "GrammarCheckerKt.check(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator: runGrazieChecks reflection failed: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
}
|
|
||||||
return null to null
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun extractRangeFromTypo(typo: Any): TextRange? {
|
|
||||||
// Try to get a relative range from returned Grazie issue/typo via common accessors
|
|
||||||
return try {
|
|
||||||
// Common getters
|
|
||||||
val m1 = typo.javaClass.methods.firstOrNull { it.name == "getRange" && it.parameterCount == 0 }
|
|
||||||
val r1 = if (m1 != null) m1.invoke(typo) else null
|
|
||||||
when (r1) {
|
|
||||||
is TextRange -> return r1
|
|
||||||
is IntRange -> return TextRange(r1.first, r1.last + 1)
|
|
||||||
}
|
|
||||||
val m2 = typo.javaClass.methods.firstOrNull { it.name == "getHighlightRange" && it.parameterCount == 0 }
|
|
||||||
val r2 = if (m2 != null) m2.invoke(typo) else null
|
|
||||||
when (r2) {
|
|
||||||
is TextRange -> return r2
|
|
||||||
is IntRange -> return TextRange(r2.first, r2.last + 1)
|
|
||||||
}
|
|
||||||
// Separate from/to ints
|
|
||||||
val fromM = typo.javaClass.methods.firstOrNull { it.name == "getFrom" && it.parameterCount == 0 && it.returnType == Int::class.javaPrimitiveType }
|
|
||||||
val toM = typo.javaClass.methods.firstOrNull { it.name == "getTo" && it.parameterCount == 0 && it.returnType == Int::class.javaPrimitiveType }
|
|
||||||
if (fromM != null && toM != null) {
|
|
||||||
val s = (fromM.invoke(typo) as? Int) ?: return null
|
|
||||||
val e = (toM.invoke(typo) as? Int) ?: return null
|
|
||||||
if (e > s) return TextRange(s, e)
|
|
||||||
}
|
|
||||||
null
|
|
||||||
} catch (_: Throwable) { null }
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun extractMessageFromTypo(typo: Any): String? {
|
|
||||||
return try {
|
|
||||||
val m = typo.javaClass.methods.firstOrNull { it.name == "getMessage" && it.parameterCount == 0 }
|
|
||||||
(m?.invoke(typo) as? String)
|
|
||||||
} catch (_: Throwable) { null }
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Fallback that uses legacy SpellCheckerManager (if present) via reflection to validate words in fragments.
|
|
||||||
// Returns number of warnings painted.
|
|
||||||
private fun fallbackWithLegacySpellcheckerIfAvailable(
|
|
||||||
file: PsiFile,
|
|
||||||
fragments: List<Pair<TextContent, TextRange>>,
|
|
||||||
holder: AnnotationHolder
|
|
||||||
): Int {
|
|
||||||
return try {
|
|
||||||
val mgrCls = Class.forName("com.intellij.spellchecker.SpellCheckerManager")
|
|
||||||
val getInstance = mgrCls.methods.firstOrNull { it.name == "getInstance" && it.parameterCount == 1 }
|
|
||||||
val isCorrect = mgrCls.methods.firstOrNull { it.name == "isCorrect" && it.parameterCount == 1 && it.parameterTypes[0] == String::class.java }
|
|
||||||
if (getInstance == null || isCorrect == null) {
|
|
||||||
// No legacy spellchecker API available — fall back to naive painter
|
|
||||||
return naiveFallbackPaint(file, fragments, holder)
|
|
||||||
}
|
|
||||||
val mgr = getInstance.invoke(null, file.project)
|
|
||||||
if (mgr == null) {
|
|
||||||
// Legacy manager not present for this project — use naive fallback
|
|
||||||
return naiveFallbackPaint(file, fragments, holder)
|
|
||||||
}
|
|
||||||
var painted = 0
|
|
||||||
val docText = file.viewProvider.document?.text ?: return 0
|
|
||||||
val tokenRegex = Regex("[A-Za-z][A-Za-z0-9_']{2,}")
|
|
||||||
for ((content, hostRange) in fragments) {
|
|
||||||
val text = try { docText.substring(hostRange.startOffset, hostRange.endOffset) } catch (_: Throwable) { null } ?: continue
|
|
||||||
var seen = 0
|
|
||||||
var flagged = 0
|
|
||||||
for (m in tokenRegex.findAll(text)) {
|
|
||||||
val token = m.value
|
|
||||||
if ('%' in token) continue // skip printf fragments defensively
|
|
||||||
// Split snake_case and camelCase within the token
|
|
||||||
val parts = splitIdentifier(token)
|
|
||||||
for (part in parts) {
|
|
||||||
if (part.length <= 2) continue
|
|
||||||
if (isAllowedWord(part)) continue
|
|
||||||
// Quick allowlist for very common words to reduce noise if dictionaries differ
|
|
||||||
val ok = try { isCorrect.invoke(mgr, part) as? Boolean } catch (_: Throwable) { null }
|
|
||||||
if (ok == false) {
|
|
||||||
// Map part back to original token occurrence within this hostRange
|
|
||||||
val localStart = m.range.first + token.indexOf(part)
|
|
||||||
val localEnd = localStart + part.length
|
|
||||||
val abs = TextRange(hostRange.startOffset + localStart, hostRange.startOffset + localEnd)
|
|
||||||
paintTypoAnnotation(file, holder, abs, part)
|
|
||||||
painted++
|
|
||||||
flagged++
|
|
||||||
}
|
|
||||||
seen++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
log.info("LyngGrazieAnnotator.fallback: fragment words=$seen, flagged=$flagged")
|
|
||||||
}
|
|
||||||
painted
|
|
||||||
} catch (_: Throwable) {
|
|
||||||
// If legacy manager is not available, fall back to a very naive heuristic (no external deps)
|
|
||||||
return naiveFallbackPaint(file, fragments, holder)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun naiveFallbackPaint(
|
|
||||||
file: PsiFile,
|
|
||||||
fragments: List<Pair<TextContent, TextRange>>,
|
|
||||||
holder: AnnotationHolder
|
|
||||||
): Int {
|
|
||||||
var painted = 0
|
|
||||||
val docText = file.viewProvider.document?.text
|
|
||||||
val tokenRegex = Regex("[A-Za-z][A-Za-z0-9_']{2,}")
|
|
||||||
val baseWords = setOf(
|
|
||||||
// small, common vocabulary to catch near-miss typos in typical code/comments
|
|
||||||
"comment","comments","error","errors","found","file","not","word","words","count","value","name","class","function","string"
|
|
||||||
)
|
|
||||||
for ((content, hostRange) in fragments) {
|
|
||||||
val text: String? = docText?.let { dt ->
|
|
||||||
try { dt.substring(hostRange.startOffset, hostRange.endOffset) } catch (_: Throwable) { null }
|
|
||||||
}
|
|
||||||
if (text.isNullOrBlank()) continue
|
|
||||||
var seen = 0
|
|
||||||
var flagged = 0
|
|
||||||
for (m in tokenRegex.findAll(text)) {
|
|
||||||
val token = m.value
|
|
||||||
if ('%' in token) continue
|
|
||||||
val parts = splitIdentifier(token)
|
|
||||||
for (part in parts) {
|
|
||||||
seen++
|
|
||||||
val lower = part.lowercase()
|
|
||||||
if (lower.length <= 2 || isAllowedWord(part)) continue
|
|
||||||
// Heuristic: no vowels OR 3 repeated chars OR ends with unlikely double consonants
|
|
||||||
val noVowel = lower.none { it in "aeiouy" }
|
|
||||||
val triple = Regex("(.)\\1\\1").containsMatchIn(lower)
|
|
||||||
val dblCons = Regex("[bcdfghjklmnpqrstvwxyz]{2}$").containsMatchIn(lower)
|
|
||||||
var looksWrong = noVowel || triple || dblCons
|
|
||||||
// Additional: low vowel ratio for length>=4
|
|
||||||
if (!looksWrong && lower.length >= 4) {
|
|
||||||
val vowels = lower.count { it in "aeiouy" }
|
|
||||||
val ratio = if (lower.isNotEmpty()) vowels.toDouble() / lower.length else 1.0
|
|
||||||
if (ratio < 0.25) looksWrong = true
|
|
||||||
}
|
|
||||||
// Additional: near-miss to a small base vocabulary (edit distance 1, or 2 for words >=6)
|
|
||||||
if (!looksWrong) {
|
|
||||||
for (bw in baseWords) {
|
|
||||||
val d = editDistance(lower, bw)
|
|
||||||
if (d == 1 || (d == 2 && lower.length >= 6)) { looksWrong = true; break }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (looksWrong) {
|
|
||||||
val localStart = m.range.first + token.indexOf(part)
|
|
||||||
val localEnd = localStart + part.length
|
|
||||||
val abs = TextRange(hostRange.startOffset + localStart, hostRange.startOffset + localEnd)
|
|
||||||
paintTypoAnnotation(file, holder, abs, part)
|
|
||||||
painted++
|
|
||||||
flagged++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
log.info("LyngGrazieAnnotator.fallback(naive): fragment words=$seen, flagged=$flagged")
|
|
||||||
}
|
|
||||||
return painted
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun paintTypoAnnotation(file: PsiFile, holder: AnnotationHolder, range: TextRange, word: String) {
|
|
||||||
val settings = LyngFormatterSettings.getInstance(file.project)
|
|
||||||
val ab = holder.newAnnotation(HighlightSeverity.INFORMATION, "Possible typo")
|
|
||||||
.range(range)
|
|
||||||
applyTypoStyleIfRequested(file, ab)
|
|
||||||
if (settings.offerLyngTypoQuickFixes) {
|
|
||||||
// Offer lightweight fixes; for 243 provide Add-to-dictionary always
|
|
||||||
ab.withFix(net.sergeych.lyng.idea.grazie.AddToLyngDictionaryFix(word))
|
|
||||||
// Offer "Replace with…" candidates (top 7)
|
|
||||||
val cands = suggestReplacements(file, word).take(7)
|
|
||||||
for (c in cands) {
|
|
||||||
ab.withFix(net.sergeych.lyng.idea.grazie.ReplaceWordFix(range, word, c))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ab.create()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun applyTypoStyleIfRequested(file: PsiFile, ab: com.intellij.lang.annotation.AnnotationBuilder) {
|
|
||||||
val settings = LyngFormatterSettings.getInstance(file.project)
|
|
||||||
if (!settings.showTyposWithGreenUnderline) return
|
|
||||||
// Use the standard TYPO text attributes key used by the platform
|
|
||||||
val TYPO: TextAttributesKey = TextAttributesKey.createTextAttributesKey("TYPO")
|
|
||||||
try {
|
|
||||||
ab.textAttributes(TYPO)
|
|
||||||
} catch (_: Throwable) {
|
|
||||||
// some IDEs may not allow setting attributes on INFORMATION; ignore gracefully
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun suggestReplacements(file: PsiFile, word: String): List<String> {
|
|
||||||
val lower = word.lowercase()
|
|
||||||
val fromProject = collectProjectWords(file)
|
|
||||||
val fromTech = TechDictionary.allWords()
|
|
||||||
val fromEnglish = EnglishDictionary.allWords()
|
|
||||||
// Merge with priority: project (p=0), tech (p=1), english (p=2)
|
|
||||||
val all = LinkedHashSet<String>()
|
|
||||||
all.addAll(fromProject)
|
|
||||||
all.addAll(fromTech)
|
|
||||||
all.addAll(fromEnglish)
|
|
||||||
data class Cand(val w: String, val d: Int, val p: Int)
|
|
||||||
val cands = ArrayList<Cand>(32)
|
|
||||||
for (w in all) {
|
|
||||||
if (w == lower) continue
|
|
||||||
if (kotlin.math.abs(w.length - lower.length) > 2) continue
|
|
||||||
val d = editDistance(lower, w)
|
|
||||||
val p = when {
|
|
||||||
w in fromProject -> 0
|
|
||||||
w in fromTech -> 1
|
|
||||||
else -> 2
|
|
||||||
}
|
|
||||||
cands += Cand(w, d, p)
|
|
||||||
}
|
|
||||||
cands.sortWith(compareBy<Cand> { it.d }.thenBy { it.p }.thenBy { it.w })
|
|
||||||
// Return a larger pool so callers can choose desired display count
|
|
||||||
return cands.take(16).map { it.w }
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun collectProjectWords(file: PsiFile): Set<String> {
|
|
||||||
// Simple approach: use current file text; can be extended to project scanning later
|
|
||||||
val text = file.viewProvider.document?.text ?: return emptySet()
|
|
||||||
val out = LinkedHashSet<String>()
|
|
||||||
val tokenRegex = Regex("[A-Za-z][A-Za-z0-9_']{2,}")
|
|
||||||
for (m in tokenRegex.findAll(text)) {
|
|
||||||
val parts = splitIdentifier(m.value)
|
|
||||||
parts.forEach { out += it.lowercase() }
|
|
||||||
}
|
|
||||||
// Include learned words
|
|
||||||
val settings = LyngFormatterSettings.getInstance(file.project)
|
|
||||||
out.addAll(settings.learnedWords.map { it.lowercase() })
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun splitIdentifier(token: String): List<String> {
|
|
||||||
// Split on underscores and camelCase boundaries
|
|
||||||
val unders = token.split('_').filter { it.isNotBlank() }
|
|
||||||
val out = mutableListOf<String>()
|
|
||||||
val camelBoundary = Regex("(?<=[a-z])(?=[A-Z])")
|
|
||||||
for (u in unders) out += u.split(camelBoundary).filter { it.isNotBlank() }
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun isAllowedWord(w: String): Boolean {
|
|
||||||
val s = w.lowercase()
|
|
||||||
return s in setOf(
|
|
||||||
// common code words / language keywords to avoid noise
|
|
||||||
"val","var","fun","class","interface","enum","type","import","package","return","if","else","when","while","for","try","catch","finally","true","false","null",
|
|
||||||
"abstract","closed","override",
|
|
||||||
// very common English words
|
|
||||||
"the","and","or","not","with","from","into","this","that","file","found","count","name","value","object"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun editDistance(a: String, b: String): Int {
|
|
||||||
if (a == b) return 0
|
|
||||||
if (a.isEmpty()) return b.length
|
|
||||||
if (b.isEmpty()) return a.length
|
|
||||||
val dp = IntArray(b.length + 1) { it }
|
|
||||||
for (i in 1..a.length) {
|
|
||||||
var prev = dp[0]
|
|
||||||
dp[0] = i
|
|
||||||
for (j in 1..b.length) {
|
|
||||||
val temp = dp[j]
|
|
||||||
dp[j] = minOf(
|
|
||||||
dp[j] + 1, // deletion
|
|
||||||
dp[j - 1] + 1, // insertion
|
|
||||||
prev + if (a[i - 1] == b[j - 1]) 0 else 1 // substitution
|
|
||||||
)
|
|
||||||
prev = temp
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return dp[b.length]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,139 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.grazie.grammar.strategy.GrammarCheckingStrategy
|
|
||||||
import com.intellij.grazie.grammar.strategy.GrammarCheckingStrategy.TextDomain
|
|
||||||
import com.intellij.ide.plugins.PluginManagerCore
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import com.intellij.openapi.extensions.PluginId
|
|
||||||
import com.intellij.openapi.util.TextRange
|
|
||||||
import com.intellij.psi.PsiElement
|
|
||||||
import net.sergeych.lyng.idea.highlight.LyngTokenTypes
|
|
||||||
import net.sergeych.lyng.idea.settings.LyngFormatterSettings
|
|
||||||
import net.sergeych.lyng.idea.spell.LyngSpellIndex
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Grazie/Natural Languages strategy for Lyng.
|
|
||||||
*
|
|
||||||
* - Comments: checked as natural language (TextDomain.COMMENTS)
|
|
||||||
* - String literals: optionally checked (setting), skipping printf-like specifiers via stealth ranges (TextDomain.LITERALS)
|
|
||||||
* - Identifiers (non-keywords): checked under TextDomain.CODE so "Process code" controls apply
|
|
||||||
* - Keywords: skipped
|
|
||||||
*/
|
|
||||||
class LyngGrazieStrategy : GrammarCheckingStrategy {
|
|
||||||
|
|
||||||
private val log = Logger.getInstance(LyngGrazieStrategy::class.java)
|
|
||||||
@Volatile private var loggedOnce = false
|
|
||||||
@Volatile private var loggedFirstMatch = false
|
|
||||||
private val seenTypes: MutableSet<String> = java.util.Collections.synchronizedSet(mutableSetOf())
|
|
||||||
|
|
||||||
private fun legacySpellcheckerInstalled(): Boolean =
|
|
||||||
PluginManagerCore.isPluginInstalled(PluginId.getId("com.intellij.spellchecker"))
|
|
||||||
|
|
||||||
// Regex for printf-style specifiers: %[flags][width][.precision][length]type
|
|
||||||
private val spec = Regex("%(?:[-+ #0]*(?:\\d+)?(?:\\.\\d+)?[a-zA-Z%])")
|
|
||||||
|
|
||||||
override fun isMyContextRoot(element: PsiElement): Boolean {
|
|
||||||
val type = element.node?.elementType
|
|
||||||
val settings = LyngFormatterSettings.getInstance(element.project)
|
|
||||||
val legacyPresent = legacySpellcheckerInstalled()
|
|
||||||
if (type != null && seenTypes.size < 10) {
|
|
||||||
val name = type.toString()
|
|
||||||
if (seenTypes.add(name)) {
|
|
||||||
log.info("LyngGrazieStrategy: saw PSI type=$name")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!loggedOnce) {
|
|
||||||
loggedOnce = true
|
|
||||||
log.info("LyngGrazieStrategy activated: legacyPresent=$legacyPresent, preferGrazieForCommentsAndLiterals=${settings.preferGrazieForCommentsAndLiterals}, spellCheckStringLiterals=${settings.spellCheckStringLiterals}, grazieChecksIdentifiers=${settings.grazieChecksIdentifiers}")
|
|
||||||
}
|
|
||||||
|
|
||||||
val file = element.containingFile ?: return false
|
|
||||||
val index = LyngSpellIndex.getUpToDate(file) ?: return false // Suspend until ready
|
|
||||||
// To ensure Grazie asks TextExtractor for all leafs, accept any Lyng element once index is ready.
|
|
||||||
// The extractor will decide per-range/domain what to actually provide.
|
|
||||||
if (!loggedFirstMatch) {
|
|
||||||
loggedFirstMatch = true
|
|
||||||
log.info("LyngGrazieStrategy: enabling Grazie on all Lyng elements (index ready)")
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getContextRootTextDomain(root: PsiElement): TextDomain {
|
|
||||||
val type = root.node?.elementType
|
|
||||||
val settings = LyngFormatterSettings.getInstance(root.project)
|
|
||||||
val file = root.containingFile
|
|
||||||
val index = if (file != null) LyngSpellIndex.getUpToDate(file) else null
|
|
||||||
val r = root.textRange
|
|
||||||
|
|
||||||
fun overlaps(list: List<TextRange>): Boolean = r != null && list.any { it.intersects(r) }
|
|
||||||
|
|
||||||
return when (type) {
|
|
||||||
LyngTokenTypes.LINE_COMMENT, LyngTokenTypes.BLOCK_COMMENT -> TextDomain.COMMENTS
|
|
||||||
LyngTokenTypes.STRING -> if (settings.grazieTreatLiteralsAsComments) TextDomain.COMMENTS else TextDomain.LITERALS
|
|
||||||
LyngTokenTypes.IDENTIFIER -> {
|
|
||||||
// For Grazie-only reliability in 243, route identifiers via COMMENTS when configured
|
|
||||||
if (settings.grazieTreatIdentifiersAsComments && index != null && r != null && overlaps(index.identifiers))
|
|
||||||
TextDomain.COMMENTS
|
|
||||||
else TextDomain.PLAIN_TEXT
|
|
||||||
}
|
|
||||||
else -> TextDomain.PLAIN_TEXT
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Note: do not override getLanguageSupport to keep compatibility with 243 API
|
|
||||||
|
|
||||||
override fun getStealthyRanges(root: PsiElement, text: CharSequence): java.util.LinkedHashSet<IntRange> {
|
|
||||||
val result = LinkedHashSet<IntRange>()
|
|
||||||
val type = root.node?.elementType
|
|
||||||
if (type == LyngTokenTypes.STRING) {
|
|
||||||
if (!shouldCheckLiterals(root)) {
|
|
||||||
// Hide the entire string when literals checking is disabled by settings
|
|
||||||
result += (0 until text.length)
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
// Hide printf-like specifiers in strings
|
|
||||||
val (start, end) = stripQuotesBounds(text)
|
|
||||||
if (end > start) {
|
|
||||||
val content = text.subSequence(start, end)
|
|
||||||
for (m in spec.findAll(content)) {
|
|
||||||
val ms = start + m.range.first
|
|
||||||
val me = start + m.range.last
|
|
||||||
result += (ms..me)
|
|
||||||
}
|
|
||||||
if (result.isNotEmpty()) {
|
|
||||||
log.debug("LyngGrazieStrategy: hidden ${result.size} printf specifier ranges in string literal")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun isEnabledByDefault(): Boolean = true
|
|
||||||
|
|
||||||
private fun shouldCheckLiterals(root: PsiElement): Boolean =
|
|
||||||
LyngFormatterSettings.getInstance(root.project).spellCheckStringLiterals
|
|
||||||
|
|
||||||
private fun stripQuotesBounds(text: CharSequence): Pair<Int, Int> {
|
|
||||||
if (text.length < 2) return 0 to text.length
|
|
||||||
val first = text.first()
|
|
||||||
val last = text.last()
|
|
||||||
return if ((first == '"' && last == '"') || (first == '\'' && last == '\''))
|
|
||||||
1 to (text.length - 1) else (0 to text.length)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -19,86 +19,29 @@ package net.sergeych.lyng.idea.grazie
|
|||||||
import com.intellij.grazie.text.TextContent
|
import com.intellij.grazie.text.TextContent
|
||||||
import com.intellij.grazie.text.TextContent.TextDomain
|
import com.intellij.grazie.text.TextContent.TextDomain
|
||||||
import com.intellij.grazie.text.TextExtractor
|
import com.intellij.grazie.text.TextExtractor
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import net.sergeych.lyng.idea.highlight.LyngTokenTypes
|
import net.sergeych.lyng.idea.highlight.LyngTokenTypes
|
||||||
import net.sergeych.lyng.idea.settings.LyngFormatterSettings
|
import net.sergeych.lyng.idea.psi.LyngElementTypes
|
||||||
import net.sergeych.lyng.idea.spell.LyngSpellIndex
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides Grazie with extractable text for Lyng PSI elements.
|
* Simplified TextExtractor for Lyng.
|
||||||
* We return text for identifiers, comments, and (optionally) string literals.
|
* Designates areas for Natural Languages (Grazie) to check.
|
||||||
* printf-like specifiers are filtered by the Grammar strategy via stealth ranges.
|
|
||||||
*/
|
*/
|
||||||
class LyngTextExtractor : TextExtractor() {
|
class LyngTextExtractor : TextExtractor() {
|
||||||
private val log = Logger.getInstance(LyngTextExtractor::class.java)
|
|
||||||
@Volatile private var loggedOnce = false
|
|
||||||
private val seen: MutableSet<String> = java.util.Collections.synchronizedSet(mutableSetOf())
|
|
||||||
|
|
||||||
override fun buildTextContent(element: PsiElement, allowedDomains: Set<TextDomain>): TextContent? {
|
override fun buildTextContent(element: PsiElement, allowedDomains: Set<TextDomain>): TextContent? {
|
||||||
val type = element.node?.elementType ?: return null
|
val type = element.node?.elementType ?: return null
|
||||||
if (!loggedOnce) {
|
|
||||||
loggedOnce = true
|
|
||||||
log.info("LyngTextExtractor active; allowedDomains=${allowedDomains.joinToString()}")
|
|
||||||
}
|
|
||||||
val settings = LyngFormatterSettings.getInstance(element.project)
|
|
||||||
val file = element.containingFile
|
|
||||||
val index = if (file != null) LyngSpellIndex.getUpToDate(file) else null
|
|
||||||
val r = element.textRange
|
|
||||||
|
|
||||||
fun overlaps(list: List<com.intellij.openapi.util.TextRange>): Boolean = r != null && list.any { it.intersects(r) }
|
val domain = when (type) {
|
||||||
|
|
||||||
// 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.LINE_COMMENT, LyngTokenTypes.BLOCK_COMMENT -> TextDomain.COMMENTS
|
||||||
else -> null
|
LyngTokenTypes.STRING -> TextDomain.LITERALS
|
||||||
|
LyngElementTypes.NAME_IDENTIFIER,
|
||||||
|
LyngElementTypes.PARAMETER_NAME,
|
||||||
|
LyngElementTypes.ENUM_CONSTANT_NAME -> TextDomain.COMMENTS
|
||||||
|
else -> return null
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if (domain == null) return null
|
|
||||||
|
|
||||||
// If literals aren't requested but fallback is enabled, route strings as COMMENTS
|
if (!allowedDomains.contains(domain)) return null
|
||||||
if (domain == TextDomain.LITERALS && !allowedDomains.contains(TextDomain.LITERALS) && settings.grazieTreatLiteralsAsComments) {
|
|
||||||
domain = TextDomain.COMMENTS
|
return TextContent.psiFragment(domain, element)
|
||||||
}
|
|
||||||
if (!allowedDomains.contains(domain)) {
|
|
||||||
if (seen.add("deny-${domain.name}")) {
|
|
||||||
log.info("LyngTextExtractor: domain ${domain.name} not in allowedDomains; skipping")
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
return try {
|
|
||||||
// Try common factory names across versions
|
|
||||||
val methods = TextContent::class.java.methods.filter { it.name == "psiFragment" }
|
|
||||||
val built: TextContent? = when {
|
|
||||||
// Try psiFragment(PsiElement, TextDomain)
|
|
||||||
methods.any { it.parameterCount == 2 && it.parameterTypes[0].name.contains("PsiElement") } -> {
|
|
||||||
val m = methods.first { it.parameterCount == 2 && it.parameterTypes[0].name.contains("PsiElement") }
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
(m.invoke(null, element, domain) as? TextContent)?.also {
|
|
||||||
if (seen.add("ok-${domain.name}")) log.info("LyngTextExtractor: provided ${domain.name} for ${type} via psiFragment(element, domain)")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Try psiFragment(TextDomain, PsiElement)
|
|
||||||
methods.any { it.parameterCount == 2 && it.parameterTypes[0].name.endsWith("TextDomain") } -> {
|
|
||||||
val m = methods.first { it.parameterCount == 2 && it.parameterTypes[0].name.endsWith("TextDomain") }
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
(m.invoke(null, domain, element) as? TextContent)?.also {
|
|
||||||
if (seen.add("ok-${domain.name}")) log.info("LyngTextExtractor: provided ${domain.name} for ${type} via psiFragment(domain, element)")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
built
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngTextExtractor: failed to build TextContent: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,86 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
|
|
||||||
import com.intellij.codeInsight.intention.IntentionAction
|
|
||||||
import com.intellij.openapi.command.WriteCommandAction
|
|
||||||
import com.intellij.openapi.editor.CaretModel
|
|
||||||
import com.intellij.openapi.editor.Document
|
|
||||||
import com.intellij.openapi.editor.Editor
|
|
||||||
import com.intellij.openapi.project.Project
|
|
||||||
import com.intellij.openapi.util.TextRange
|
|
||||||
import com.intellij.psi.PsiFile
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lightweight quick-fix to replace a misspelled word (subrange) with a suggested alternative.
|
|
||||||
* Works without the legacy Spell Checker. The replacement is applied directly to the file text.
|
|
||||||
*/
|
|
||||||
class ReplaceWordFix(
|
|
||||||
private val range: TextRange,
|
|
||||||
private val original: String,
|
|
||||||
private val replacementRaw: String
|
|
||||||
) : IntentionAction {
|
|
||||||
|
|
||||||
override fun getText(): String = "Replace '$original' with '$replacementRaw'"
|
|
||||||
override fun getFamilyName(): String = "Lyng Spelling"
|
|
||||||
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?): Boolean =
|
|
||||||
editor != null && file != null && range.startOffset in 0..range.endOffset
|
|
||||||
|
|
||||||
override fun startInWriteAction(): Boolean = true
|
|
||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor?, file: PsiFile?) {
|
|
||||||
if (editor == null) return
|
|
||||||
val doc: Document = editor.document
|
|
||||||
val safeRange = range.constrainTo(doc)
|
|
||||||
val current = doc.getText(safeRange)
|
|
||||||
// Preserve basic case style based on the original token
|
|
||||||
val replacement = adaptCaseStyle(current, replacementRaw)
|
|
||||||
WriteCommandAction.runWriteCommandAction(project, "Replace word", null, Runnable {
|
|
||||||
doc.replaceString(safeRange.startOffset, safeRange.endOffset, replacement)
|
|
||||||
}, file)
|
|
||||||
// Move caret to end of replacement for convenience
|
|
||||||
try {
|
|
||||||
val caret: CaretModel = editor.caretModel
|
|
||||||
caret.moveToOffset(safeRange.startOffset + replacement.length)
|
|
||||||
} catch (_: Throwable) {}
|
|
||||||
// Restart daemon to refresh highlights
|
|
||||||
if (file != null) DaemonCodeAnalyzer.getInstance(project).restart(file)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun TextRange.constrainTo(doc: Document): TextRange {
|
|
||||||
val start = startOffset.coerceIn(0, doc.textLength)
|
|
||||||
val end = endOffset.coerceIn(start, doc.textLength)
|
|
||||||
return TextRange(start, end)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun adaptCaseStyle(sample: String, suggestion: String): String {
|
|
||||||
if (suggestion.isEmpty()) return suggestion
|
|
||||||
return when {
|
|
||||||
sample.all { it.isUpperCase() } -> suggestion.uppercase()
|
|
||||||
// PascalCase / Capitalized single word
|
|
||||||
sample.firstOrNull()?.isUpperCase() == true && sample.drop(1).any { it.isLowerCase() } ->
|
|
||||||
suggestion.replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
|
|
||||||
// snake_case -> lower
|
|
||||||
sample.contains('_') -> suggestion.lowercase()
|
|
||||||
// camelCase -> lower first
|
|
||||||
sample.firstOrNull()?.isLowerCase() == true && sample.any { it.isUpperCase() } ->
|
|
||||||
suggestion.replaceFirstChar { it.lowercase() }
|
|
||||||
else -> suggestion
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import java.io.BufferedReader
|
|
||||||
import java.io.InputStreamReader
|
|
||||||
import java.util.zip.GZIPInputStream
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lightweight technical/Lyng vocabulary dictionary.
|
|
||||||
* Loaded from classpath resources; supports .txt and .txt.gz. Merged with EnglishDictionary.
|
|
||||||
*/
|
|
||||||
object TechDictionary {
|
|
||||||
private val log = Logger.getInstance(TechDictionary::class.java)
|
|
||||||
@Volatile private var loaded = false
|
|
||||||
@Volatile private var words: Set<String> = emptySet()
|
|
||||||
|
|
||||||
private fun ensureLoaded() {
|
|
||||||
if (loaded) return
|
|
||||||
synchronized(this) {
|
|
||||||
if (loaded) return
|
|
||||||
val candidates = listOf(
|
|
||||||
"/dictionaries/tech-lyng.txt.gz",
|
|
||||||
"/dictionaries/tech-lyng.txt"
|
|
||||||
)
|
|
||||||
val merged = HashSet<String>(8_000)
|
|
||||||
for (res in candidates) {
|
|
||||||
try {
|
|
||||||
val stream = javaClass.getResourceAsStream(res) ?: continue
|
|
||||||
val reader = if (res.endsWith(".gz"))
|
|
||||||
BufferedReader(InputStreamReader(GZIPInputStream(stream)))
|
|
||||||
else
|
|
||||||
BufferedReader(InputStreamReader(stream))
|
|
||||||
var n = 0
|
|
||||||
reader.useLines { seq -> seq.forEach { line ->
|
|
||||||
val w = line.trim()
|
|
||||||
if (w.isNotEmpty() && !w.startsWith("#")) { merged += w.lowercase(); n++ }
|
|
||||||
} }
|
|
||||||
log.info("TechDictionary: loaded $n words from $res (total=${merged.size})")
|
|
||||||
} catch (t: Throwable) {
|
|
||||||
log.info("TechDictionary: failed to load $res: ${t.javaClass.simpleName}: ${t.message}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (merged.isEmpty()) {
|
|
||||||
merged += setOf(
|
|
||||||
// minimal Lyng/tech seeding to avoid empty dictionary
|
|
||||||
"lyng","miniast","binder","printf","specifier","specifiers","regex","token","tokens",
|
|
||||||
"identifier","identifiers","keyword","keywords","comment","comments","string","strings",
|
|
||||||
"literal","literals","formatting","formatter","grazie","typo","typos","dictionary","dictionaries"
|
|
||||||
)
|
|
||||||
log.info("TechDictionary: using minimal built-in set (${merged.size})")
|
|
||||||
}
|
|
||||||
words = merged
|
|
||||||
loaded = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun allWords(): Set<String> {
|
|
||||||
ensureLoaded()
|
|
||||||
return words
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -101,8 +101,9 @@ class LyngLexer : LexerBase() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// String "..." with simple escape handling
|
// String "..." or '...' with simple escape handling
|
||||||
if (ch == '"') {
|
if (ch == '"' || ch == '\'') {
|
||||||
|
val quote = ch
|
||||||
i++
|
i++
|
||||||
while (i < endOffset) {
|
while (i < endOffset) {
|
||||||
val c = buffer[i]
|
val c = buffer[i]
|
||||||
@@ -110,7 +111,7 @@ class LyngLexer : LexerBase() {
|
|||||||
i += 2
|
i += 2
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if (c == '"') { i++; break }
|
if (c == quote) { i++; break }
|
||||||
i++
|
i++
|
||||||
}
|
}
|
||||||
myTokenEnd = i
|
myTokenEnd = i
|
||||||
|
|||||||
+2
-1
@@ -20,13 +20,14 @@ package net.sergeych.lyng.idea.navigation
|
|||||||
import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler
|
import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
|
import net.sergeych.lyng.idea.LyngLanguage
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ensures Ctrl+B (Go to Definition) works on Lyng identifiers by resolving through LyngPsiReference.
|
* Ensures Ctrl+B (Go to Definition) works on Lyng identifiers by resolving through LyngPsiReference.
|
||||||
*/
|
*/
|
||||||
class LyngGotoDeclarationHandler : GotoDeclarationHandler {
|
class LyngGotoDeclarationHandler : GotoDeclarationHandler {
|
||||||
override fun getGotoDeclarationTargets(sourceElement: PsiElement?, offset: Int, editor: Editor?): Array<PsiElement>? {
|
override fun getGotoDeclarationTargets(sourceElement: PsiElement?, offset: Int, editor: Editor?): Array<PsiElement>? {
|
||||||
if (sourceElement == null) return null
|
if (sourceElement == null || sourceElement.language != LyngLanguage) return null
|
||||||
|
|
||||||
val allTargets = mutableListOf<PsiElement>()
|
val allTargets = mutableListOf<PsiElement>()
|
||||||
|
|
||||||
|
|||||||
@@ -38,16 +38,18 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
|
|
||||||
val mini = LyngAstManager.getMiniAst(file) ?: return emptyArray()
|
val mini = LyngAstManager.getMiniAst(file) ?: return emptyArray()
|
||||||
val binding = LyngAstManager.getBinding(file)
|
val binding = LyngAstManager.getBinding(file)
|
||||||
|
val imported = DocLookupUtils.canonicalImportedModules(mini, text).toSet()
|
||||||
|
val currentPackage = getPackageName(file)
|
||||||
|
val allowedPackages = if (currentPackage != null) imported + currentPackage else imported
|
||||||
|
|
||||||
// 1. Member resolution (obj.member)
|
// 1. Member resolution (obj.member)
|
||||||
val dotPos = TextCtx.findDotLeft(text, offset)
|
val dotPos = TextCtx.findDotLeft(text, offset)
|
||||||
if (dotPos != null) {
|
if (dotPos != null) {
|
||||||
val imported = DocLookupUtils.canonicalImportedModules(mini, text)
|
val receiverClass = DocLookupUtils.guessReceiverClassViaMini(mini, text, dotPos, imported.toList(), binding)
|
||||||
val receiverClass = DocLookupUtils.guessReceiverClassViaMini(mini, text, dotPos, imported, binding)
|
?: DocLookupUtils.guessReceiverClass(text, dotPos, imported.toList(), mini)
|
||||||
?: DocLookupUtils.guessReceiverClass(text, dotPos, imported, mini)
|
|
||||||
|
|
||||||
if (receiverClass != null) {
|
if (receiverClass != null) {
|
||||||
val resolved = DocLookupUtils.resolveMemberWithInheritance(imported, receiverClass, name, mini)
|
val resolved = DocLookupUtils.resolveMemberWithInheritance(imported.toList(), receiverClass, name, mini)
|
||||||
if (resolved != null) {
|
if (resolved != null) {
|
||||||
val owner = resolved.first
|
val owner = resolved.first
|
||||||
val member = resolved.second
|
val member = resolved.second
|
||||||
@@ -75,7 +77,7 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
}
|
}
|
||||||
// If we couldn't resolve exactly, we might still want to search globally but ONLY for members
|
// If we couldn't resolve exactly, we might still want to search globally but ONLY for members
|
||||||
if (results.isEmpty()) {
|
if (results.isEmpty()) {
|
||||||
results.addAll(resolveGlobally(file.project, name, membersOnly = true))
|
results.addAll(resolveGlobally(file.project, name, membersOnly = true, allowedPackages = allowedPackages))
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// 2. Local resolution via Binder
|
// 2. Local resolution via Binder
|
||||||
@@ -94,7 +96,7 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
// 3. Global project scan
|
// 3. Global project scan
|
||||||
// Only search globally if we haven't found a strong local match
|
// Only search globally if we haven't found a strong local match
|
||||||
if (results.isEmpty()) {
|
if (results.isEmpty()) {
|
||||||
results.addAll(resolveGlobally(file.project, name))
|
results.addAll(resolveGlobally(file.project, name, allowedPackages = allowedPackages))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -141,6 +143,16 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun getPackageName(file: PsiFile): String? {
|
||||||
|
val mini = LyngAstManager.getMiniAst(file) ?: return null
|
||||||
|
return try {
|
||||||
|
val pkg = mini.range.start.source.extractPackageName()
|
||||||
|
if (pkg.startsWith("lyng.")) pkg else "lyng.$pkg"
|
||||||
|
} catch (e: Exception) {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override fun resolve(): PsiElement? {
|
override fun resolve(): PsiElement? {
|
||||||
val results = multiResolve(false)
|
val results = multiResolve(false)
|
||||||
if (results.isEmpty()) return null
|
if (results.isEmpty()) return null
|
||||||
@@ -154,13 +166,20 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
return target
|
return target
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun resolveGlobally(project: Project, name: String, membersOnly: Boolean = false): List<ResolveResult> {
|
private fun resolveGlobally(project: Project, name: String, membersOnly: Boolean = false, allowedPackages: Set<String>? = null): List<ResolveResult> {
|
||||||
val results = mutableListOf<ResolveResult>()
|
val results = mutableListOf<ResolveResult>()
|
||||||
val files = FilenameIndex.getAllFilesByExt(project, "lyng", GlobalSearchScope.projectScope(project))
|
val files = FilenameIndex.getAllFilesByExt(project, "lyng", GlobalSearchScope.projectScope(project))
|
||||||
val psiManager = PsiManager.getInstance(project)
|
val psiManager = PsiManager.getInstance(project)
|
||||||
|
|
||||||
for (vFile in files) {
|
for (vFile in files) {
|
||||||
val file = psiManager.findFile(vFile) ?: continue
|
val file = psiManager.findFile(vFile) ?: continue
|
||||||
|
|
||||||
|
// Filter by package if requested
|
||||||
|
if (allowedPackages != null) {
|
||||||
|
val pkg = getPackageName(file)
|
||||||
|
if (pkg == null || pkg !in allowedPackages) continue
|
||||||
|
}
|
||||||
|
|
||||||
val mini = LyngAstManager.getMiniAst(file) ?: continue
|
val mini = LyngAstManager.getMiniAst(file) ?: continue
|
||||||
val src = mini.range.start.source
|
val src = mini.range.start.source
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng.idea.psi
|
||||||
|
|
||||||
|
import com.intellij.psi.tree.IElementType
|
||||||
|
import net.sergeych.lyng.idea.LyngLanguage
|
||||||
|
|
||||||
|
object LyngElementTypes {
|
||||||
|
val NAME_IDENTIFIER = IElementType("NAME_IDENTIFIER", LyngLanguage)
|
||||||
|
val PARAMETER_NAME = IElementType("PARAMETER_NAME", LyngLanguage)
|
||||||
|
val ENUM_CONSTANT_NAME = IElementType("ENUM_CONSTANT_NAME", LyngLanguage)
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -45,7 +45,68 @@ class LyngParserDefinition : ParserDefinition {
|
|||||||
|
|
||||||
override fun createParser(project: Project?): PsiParser = PsiParser { root, builder ->
|
override fun createParser(project: Project?): PsiParser = PsiParser { root, builder ->
|
||||||
val mark: PsiBuilder.Marker = builder.mark()
|
val mark: PsiBuilder.Marker = builder.mark()
|
||||||
while (!builder.eof()) builder.advanceLexer()
|
var lastKeyword: String? = null
|
||||||
|
var inEnum = false
|
||||||
|
var inParams = false
|
||||||
|
var parenDepth = 0
|
||||||
|
var braceDepth = 0
|
||||||
|
|
||||||
|
while (!builder.eof()) {
|
||||||
|
val type = builder.tokenType
|
||||||
|
val text = builder.tokenText
|
||||||
|
|
||||||
|
when (type) {
|
||||||
|
LyngTokenTypes.KEYWORD -> {
|
||||||
|
lastKeyword = text
|
||||||
|
if (text == "enum") inEnum = true
|
||||||
|
}
|
||||||
|
LyngTokenTypes.PUNCT -> {
|
||||||
|
if (text == "(") {
|
||||||
|
parenDepth++
|
||||||
|
if (lastKeyword == "fun" || lastKeyword == "constructor" || lastKeyword == "init") inParams = true
|
||||||
|
} else if (text == ")") {
|
||||||
|
parenDepth--
|
||||||
|
if (parenDepth == 0) inParams = false
|
||||||
|
} else if (text == "{") {
|
||||||
|
braceDepth++
|
||||||
|
} else if (text == "}") {
|
||||||
|
braceDepth--
|
||||||
|
if (braceDepth == 0) inEnum = false
|
||||||
|
}
|
||||||
|
if (text != ".") lastKeyword = null
|
||||||
|
}
|
||||||
|
LyngTokenTypes.IDENTIFIER -> {
|
||||||
|
val m = builder.mark()
|
||||||
|
builder.advanceLexer()
|
||||||
|
val nextType = builder.tokenType
|
||||||
|
val isQualified = nextType == LyngTokenTypes.PUNCT && builder.tokenText == "."
|
||||||
|
|
||||||
|
if (!isQualified) {
|
||||||
|
when {
|
||||||
|
lastKeyword in setOf("fun", "val", "var", "class", "enum", "object", "interface", "type", "property") -> {
|
||||||
|
m.done(LyngElementTypes.NAME_IDENTIFIER)
|
||||||
|
}
|
||||||
|
inParams && parenDepth > 0 -> {
|
||||||
|
m.done(LyngElementTypes.PARAMETER_NAME)
|
||||||
|
}
|
||||||
|
inEnum && braceDepth > 0 && parenDepth == 0 -> {
|
||||||
|
m.done(LyngElementTypes.ENUM_CONSTANT_NAME)
|
||||||
|
}
|
||||||
|
else -> m.drop()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
m.drop()
|
||||||
|
}
|
||||||
|
lastKeyword = null
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
LyngTokenTypes.WHITESPACE, LyngTokenTypes.LINE_COMMENT, LyngTokenTypes.BLOCK_COMMENT -> {
|
||||||
|
// keep lastKeyword
|
||||||
|
}
|
||||||
|
else -> lastKeyword = null
|
||||||
|
}
|
||||||
|
builder.advanceLexer()
|
||||||
|
}
|
||||||
mark.done(root)
|
mark.done(root)
|
||||||
builder.treeBuilt
|
builder.treeBuilt
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -32,24 +32,6 @@ class LyngFormatterSettings(private val project: Project) : PersistentStateCompo
|
|||||||
var reindentClosedBlockOnEnter: Boolean = true,
|
var reindentClosedBlockOnEnter: Boolean = true,
|
||||||
var reindentPastedBlocks: Boolean = true,
|
var reindentPastedBlocks: Boolean = true,
|
||||||
var normalizeBlockCommentIndent: Boolean = false,
|
var normalizeBlockCommentIndent: Boolean = false,
|
||||||
var spellCheckStringLiterals: Boolean = true,
|
|
||||||
// When Grazie/Natural Languages is present, prefer it for comments and literals (avoid legacy duplicates)
|
|
||||||
var preferGrazieForCommentsAndLiterals: Boolean = true,
|
|
||||||
// When Grazie is available, also check identifiers via Grazie.
|
|
||||||
// Default OFF because Grazie typically doesn't flag code identifiers; legacy Spellchecker is better for code.
|
|
||||||
var grazieChecksIdentifiers: Boolean = false,
|
|
||||||
// Grazie-only fallback: treat identifiers as comments domain so Grazie applies spelling rules
|
|
||||||
var grazieTreatIdentifiersAsComments: Boolean = true,
|
|
||||||
// Grazie-only fallback: treat string literals as comments domain when LITERALS domain is not requested
|
|
||||||
var grazieTreatLiteralsAsComments: Boolean = true,
|
|
||||||
// Debug helper: show the exact ranges we feed to Grazie/legacy as weak warnings
|
|
||||||
var debugShowSpellFeed: Boolean = false,
|
|
||||||
// Visuals: render Lyng typos using the standard Typo green underline styling
|
|
||||||
var showTyposWithGreenUnderline: Boolean = true,
|
|
||||||
// Enable lightweight quick-fixes (Replace..., Add to dictionary) without legacy Spell Checker
|
|
||||||
var offerLyngTypoQuickFixes: Boolean = true,
|
|
||||||
// Per-project learned words (do not flag again)
|
|
||||||
var learnedWords: MutableSet<String> = mutableSetOf(),
|
|
||||||
// Experimental: enable Lyng autocompletion (can be disabled if needed)
|
// Experimental: enable Lyng autocompletion (can be disabled if needed)
|
||||||
var enableLyngCompletionExperimental: Boolean = true,
|
var enableLyngCompletionExperimental: Boolean = true,
|
||||||
)
|
)
|
||||||
@@ -82,42 +64,6 @@ class LyngFormatterSettings(private val project: Project) : PersistentStateCompo
|
|||||||
get() = myState.normalizeBlockCommentIndent
|
get() = myState.normalizeBlockCommentIndent
|
||||||
set(value) { myState.normalizeBlockCommentIndent = value }
|
set(value) { myState.normalizeBlockCommentIndent = value }
|
||||||
|
|
||||||
var spellCheckStringLiterals: Boolean
|
|
||||||
get() = myState.spellCheckStringLiterals
|
|
||||||
set(value) { myState.spellCheckStringLiterals = value }
|
|
||||||
|
|
||||||
var preferGrazieForCommentsAndLiterals: Boolean
|
|
||||||
get() = myState.preferGrazieForCommentsAndLiterals
|
|
||||||
set(value) { myState.preferGrazieForCommentsAndLiterals = value }
|
|
||||||
|
|
||||||
var grazieChecksIdentifiers: Boolean
|
|
||||||
get() = myState.grazieChecksIdentifiers
|
|
||||||
set(value) { myState.grazieChecksIdentifiers = value }
|
|
||||||
|
|
||||||
var grazieTreatIdentifiersAsComments: Boolean
|
|
||||||
get() = myState.grazieTreatIdentifiersAsComments
|
|
||||||
set(value) { myState.grazieTreatIdentifiersAsComments = value }
|
|
||||||
|
|
||||||
var grazieTreatLiteralsAsComments: Boolean
|
|
||||||
get() = myState.grazieTreatLiteralsAsComments
|
|
||||||
set(value) { myState.grazieTreatLiteralsAsComments = value }
|
|
||||||
|
|
||||||
var debugShowSpellFeed: Boolean
|
|
||||||
get() = myState.debugShowSpellFeed
|
|
||||||
set(value) { myState.debugShowSpellFeed = value }
|
|
||||||
|
|
||||||
var showTyposWithGreenUnderline: Boolean
|
|
||||||
get() = myState.showTyposWithGreenUnderline
|
|
||||||
set(value) { myState.showTyposWithGreenUnderline = value }
|
|
||||||
|
|
||||||
var offerLyngTypoQuickFixes: Boolean
|
|
||||||
get() = myState.offerLyngTypoQuickFixes
|
|
||||||
set(value) { myState.offerLyngTypoQuickFixes = value }
|
|
||||||
|
|
||||||
var learnedWords: MutableSet<String>
|
|
||||||
get() = myState.learnedWords
|
|
||||||
set(value) { myState.learnedWords = value }
|
|
||||||
|
|
||||||
var enableLyngCompletionExperimental: Boolean
|
var enableLyngCompletionExperimental: Boolean
|
||||||
get() = myState.enableLyngCompletionExperimental
|
get() = myState.enableLyngCompletionExperimental
|
||||||
set(value) { myState.enableLyngCompletionExperimental = value }
|
set(value) { myState.enableLyngCompletionExperimental = value }
|
||||||
|
|||||||
+1
-56
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -30,14 +30,6 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
private var reindentClosedBlockCb: JCheckBox? = null
|
private var reindentClosedBlockCb: JCheckBox? = null
|
||||||
private var reindentPasteCb: JCheckBox? = null
|
private var reindentPasteCb: JCheckBox? = null
|
||||||
private var normalizeBlockCommentIndentCb: JCheckBox? = null
|
private var normalizeBlockCommentIndentCb: JCheckBox? = null
|
||||||
private var spellCheckLiteralsCb: JCheckBox? = null
|
|
||||||
private var preferGrazieCommentsLiteralsCb: JCheckBox? = null
|
|
||||||
private var grazieChecksIdentifiersCb: JCheckBox? = null
|
|
||||||
private var grazieIdsAsCommentsCb: JCheckBox? = null
|
|
||||||
private var grazieLiteralsAsCommentsCb: JCheckBox? = null
|
|
||||||
private var debugShowSpellFeedCb: JCheckBox? = null
|
|
||||||
private var showTyposGreenCb: JCheckBox? = null
|
|
||||||
private var offerQuickFixesCb: JCheckBox? = null
|
|
||||||
private var enableCompletionCb: JCheckBox? = null
|
private var enableCompletionCb: JCheckBox? = null
|
||||||
|
|
||||||
override fun getDisplayName(): String = "Lyng Formatter"
|
override fun getDisplayName(): String = "Lyng Formatter"
|
||||||
@@ -50,14 +42,6 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
reindentClosedBlockCb = JCheckBox("Reindent enclosed block on Enter after '}'")
|
reindentClosedBlockCb = JCheckBox("Reindent enclosed block on Enter after '}'")
|
||||||
reindentPasteCb = JCheckBox("Reindent pasted blocks (align pasted code to current indent)")
|
reindentPasteCb = JCheckBox("Reindent pasted blocks (align pasted code to current indent)")
|
||||||
normalizeBlockCommentIndentCb = JCheckBox("Normalize block comment indentation [experimental]")
|
normalizeBlockCommentIndentCb = JCheckBox("Normalize block comment indentation [experimental]")
|
||||||
spellCheckLiteralsCb = JCheckBox("Spell check string literals (skip % specifiers like %s, %d, %-12s)")
|
|
||||||
preferGrazieCommentsLiteralsCb = JCheckBox("Prefer Natural Languages/Grazie for comments and string literals (avoid duplicates)")
|
|
||||||
grazieChecksIdentifiersCb = JCheckBox("Check identifiers via Natural Languages/Grazie when available")
|
|
||||||
grazieIdsAsCommentsCb = JCheckBox("Natural Languages/Grazie: treat identifiers as comments (forces spelling checks in 2024.3)")
|
|
||||||
grazieLiteralsAsCommentsCb = JCheckBox("Natural Languages/Grazie: treat string literals as comments when literals are not processed")
|
|
||||||
debugShowSpellFeedCb = JCheckBox("Debug: show spell-feed ranges (weak warnings)")
|
|
||||||
showTyposGreenCb = JCheckBox("Show Lyng typos with green underline (TYPO styling)")
|
|
||||||
offerQuickFixesCb = JCheckBox("Offer Lyng typo quick fixes (Replace…, Add to dictionary) without Spell Checker")
|
|
||||||
enableCompletionCb = JCheckBox("Enable Lyng autocompletion (experimental)")
|
enableCompletionCb = JCheckBox("Enable Lyng autocompletion (experimental)")
|
||||||
|
|
||||||
// Tooltips / short help
|
// Tooltips / short help
|
||||||
@@ -66,27 +50,12 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
reindentClosedBlockCb?.toolTipText = "On Enter after a closing '}', reindent the just-closed {…} block using formatter rules."
|
reindentClosedBlockCb?.toolTipText = "On Enter after a closing '}', reindent the just-closed {…} block using formatter rules."
|
||||||
reindentPasteCb?.toolTipText = "When caret is in leading whitespace, reindent the pasted text and align it to the caret's indent."
|
reindentPasteCb?.toolTipText = "When caret is in leading whitespace, reindent the pasted text and align it to the caret's indent."
|
||||||
normalizeBlockCommentIndentCb?.toolTipText = "Experimental: normalize indentation inside /* … */ comments (code is not modified)."
|
normalizeBlockCommentIndentCb?.toolTipText = "Experimental: normalize indentation inside /* … */ comments (code is not modified)."
|
||||||
preferGrazieCommentsLiteralsCb?.toolTipText = "When ON and Natural Languages/Grazie is installed, comments and string literals are checked by Grazie. Turn OFF to force legacy Spellchecker to check them."
|
|
||||||
grazieChecksIdentifiersCb?.toolTipText = "When ON and Natural Languages/Grazie is installed, identifiers (non-keywords) are checked by Grazie too."
|
|
||||||
grazieIdsAsCommentsCb?.toolTipText = "Grazie-only fallback: route identifiers as COMMENTS domain so Grazie applies spelling in 2024.3."
|
|
||||||
grazieLiteralsAsCommentsCb?.toolTipText = "Grazie-only fallback: when Grammar doesn't process literals, route strings as COMMENTS so they are checked."
|
|
||||||
debugShowSpellFeedCb?.toolTipText = "Show the exact ranges we feed to spellcheckers (ids/comments/strings) as weak warnings."
|
|
||||||
showTyposGreenCb?.toolTipText = "Render Lyng typos using the platform's green TYPO underline instead of generic warnings."
|
|
||||||
offerQuickFixesCb?.toolTipText = "Provide lightweight Replace… and Add to dictionary quick-fixes without requiring the legacy Spell Checker."
|
|
||||||
enableCompletionCb?.toolTipText = "Turn on/off the lightweight Lyng code completion (BASIC)."
|
enableCompletionCb?.toolTipText = "Turn on/off the lightweight Lyng code completion (BASIC)."
|
||||||
p.add(spacingCb)
|
p.add(spacingCb)
|
||||||
p.add(wrappingCb)
|
p.add(wrappingCb)
|
||||||
p.add(reindentClosedBlockCb)
|
p.add(reindentClosedBlockCb)
|
||||||
p.add(reindentPasteCb)
|
p.add(reindentPasteCb)
|
||||||
p.add(normalizeBlockCommentIndentCb)
|
p.add(normalizeBlockCommentIndentCb)
|
||||||
p.add(spellCheckLiteralsCb)
|
|
||||||
p.add(preferGrazieCommentsLiteralsCb)
|
|
||||||
p.add(grazieChecksIdentifiersCb)
|
|
||||||
p.add(grazieIdsAsCommentsCb)
|
|
||||||
p.add(grazieLiteralsAsCommentsCb)
|
|
||||||
p.add(debugShowSpellFeedCb)
|
|
||||||
p.add(showTyposGreenCb)
|
|
||||||
p.add(offerQuickFixesCb)
|
|
||||||
p.add(enableCompletionCb)
|
p.add(enableCompletionCb)
|
||||||
panel = p
|
panel = p
|
||||||
reset()
|
reset()
|
||||||
@@ -100,14 +69,6 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
reindentClosedBlockCb?.isSelected != s.reindentClosedBlockOnEnter ||
|
reindentClosedBlockCb?.isSelected != s.reindentClosedBlockOnEnter ||
|
||||||
reindentPasteCb?.isSelected != s.reindentPastedBlocks ||
|
reindentPasteCb?.isSelected != s.reindentPastedBlocks ||
|
||||||
normalizeBlockCommentIndentCb?.isSelected != s.normalizeBlockCommentIndent ||
|
normalizeBlockCommentIndentCb?.isSelected != s.normalizeBlockCommentIndent ||
|
||||||
spellCheckLiteralsCb?.isSelected != s.spellCheckStringLiterals ||
|
|
||||||
preferGrazieCommentsLiteralsCb?.isSelected != s.preferGrazieForCommentsAndLiterals ||
|
|
||||||
grazieChecksIdentifiersCb?.isSelected != s.grazieChecksIdentifiers ||
|
|
||||||
grazieIdsAsCommentsCb?.isSelected != s.grazieTreatIdentifiersAsComments ||
|
|
||||||
grazieLiteralsAsCommentsCb?.isSelected != s.grazieTreatLiteralsAsComments ||
|
|
||||||
debugShowSpellFeedCb?.isSelected != s.debugShowSpellFeed ||
|
|
||||||
showTyposGreenCb?.isSelected != s.showTyposWithGreenUnderline ||
|
|
||||||
offerQuickFixesCb?.isSelected != s.offerLyngTypoQuickFixes ||
|
|
||||||
enableCompletionCb?.isSelected != s.enableLyngCompletionExperimental
|
enableCompletionCb?.isSelected != s.enableLyngCompletionExperimental
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,14 +79,6 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
s.reindentClosedBlockOnEnter = reindentClosedBlockCb?.isSelected == true
|
s.reindentClosedBlockOnEnter = reindentClosedBlockCb?.isSelected == true
|
||||||
s.reindentPastedBlocks = reindentPasteCb?.isSelected == true
|
s.reindentPastedBlocks = reindentPasteCb?.isSelected == true
|
||||||
s.normalizeBlockCommentIndent = normalizeBlockCommentIndentCb?.isSelected == true
|
s.normalizeBlockCommentIndent = normalizeBlockCommentIndentCb?.isSelected == true
|
||||||
s.spellCheckStringLiterals = spellCheckLiteralsCb?.isSelected == true
|
|
||||||
s.preferGrazieForCommentsAndLiterals = preferGrazieCommentsLiteralsCb?.isSelected == true
|
|
||||||
s.grazieChecksIdentifiers = grazieChecksIdentifiersCb?.isSelected == true
|
|
||||||
s.grazieTreatIdentifiersAsComments = grazieIdsAsCommentsCb?.isSelected == true
|
|
||||||
s.grazieTreatLiteralsAsComments = grazieLiteralsAsCommentsCb?.isSelected == true
|
|
||||||
s.debugShowSpellFeed = debugShowSpellFeedCb?.isSelected == true
|
|
||||||
s.showTyposWithGreenUnderline = showTyposGreenCb?.isSelected == true
|
|
||||||
s.offerLyngTypoQuickFixes = offerQuickFixesCb?.isSelected == true
|
|
||||||
s.enableLyngCompletionExperimental = enableCompletionCb?.isSelected == true
|
s.enableLyngCompletionExperimental = enableCompletionCb?.isSelected == true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -136,14 +89,6 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
reindentClosedBlockCb?.isSelected = s.reindentClosedBlockOnEnter
|
reindentClosedBlockCb?.isSelected = s.reindentClosedBlockOnEnter
|
||||||
reindentPasteCb?.isSelected = s.reindentPastedBlocks
|
reindentPasteCb?.isSelected = s.reindentPastedBlocks
|
||||||
normalizeBlockCommentIndentCb?.isSelected = s.normalizeBlockCommentIndent
|
normalizeBlockCommentIndentCb?.isSelected = s.normalizeBlockCommentIndent
|
||||||
spellCheckLiteralsCb?.isSelected = s.spellCheckStringLiterals
|
|
||||||
preferGrazieCommentsLiteralsCb?.isSelected = s.preferGrazieForCommentsAndLiterals
|
|
||||||
grazieChecksIdentifiersCb?.isSelected = s.grazieChecksIdentifiers
|
|
||||||
grazieIdsAsCommentsCb?.isSelected = s.grazieTreatIdentifiersAsComments
|
|
||||||
grazieLiteralsAsCommentsCb?.isSelected = s.grazieTreatLiteralsAsComments
|
|
||||||
debugShowSpellFeedCb?.isSelected = s.debugShowSpellFeed
|
|
||||||
showTyposGreenCb?.isSelected = s.showTyposWithGreenUnderline
|
|
||||||
offerQuickFixesCb?.isSelected = s.offerLyngTypoQuickFixes
|
|
||||||
enableCompletionCb?.isSelected = s.enableLyngCompletionExperimental
|
enableCompletionCb?.isSelected = s.enableLyngCompletionExperimental
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.spell
|
|
||||||
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import com.intellij.openapi.util.Key
|
|
||||||
import com.intellij.openapi.util.TextRange
|
|
||||||
import com.intellij.psi.PsiFile
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Per-file cached spellcheck index built from MiniAst-based highlighting and the lynglib highlighter.
|
|
||||||
* It exposes identifier, comment, and string literal ranges. Strategies should suspend until data is ready.
|
|
||||||
*/
|
|
||||||
object LyngSpellIndex {
|
|
||||||
private val LOG = Logger.getInstance(LyngSpellIndex::class.java)
|
|
||||||
|
|
||||||
data class Data(
|
|
||||||
val modStamp: Long,
|
|
||||||
val identifiers: List<TextRange>,
|
|
||||||
val comments: List<TextRange>,
|
|
||||||
val strings: List<TextRange>,
|
|
||||||
)
|
|
||||||
|
|
||||||
private val KEY: Key<Data> = Key.create("LYNG_SPELL_INDEX")
|
|
||||||
|
|
||||||
fun getUpToDate(file: PsiFile): Data? {
|
|
||||||
val doc = file.viewProvider.document ?: return null
|
|
||||||
val d = file.getUserData(KEY) ?: return null
|
|
||||||
return if (d.modStamp == doc.modificationStamp) d else null
|
|
||||||
}
|
|
||||||
|
|
||||||
fun store(file: PsiFile, data: Data) {
|
|
||||||
file.putUserData(KEY, data)
|
|
||||||
LOG.info("LyngSpellIndex built: ids=${data.identifiers.size}, comments=${data.comments.size}, strings=${data.strings.size}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+13
-142
@@ -16,155 +16,26 @@
|
|||||||
*/
|
*/
|
||||||
package net.sergeych.lyng.idea.spell
|
package net.sergeych.lyng.idea.spell
|
||||||
|
|
||||||
// Avoid Tokenizers helper to keep compatibility; implement our own tokenizers
|
|
||||||
import com.intellij.ide.plugins.PluginManagerCore
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import com.intellij.openapi.extensions.PluginId
|
|
||||||
import com.intellij.openapi.util.TextRange
|
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import com.intellij.spellchecker.inspections.PlainTextSplitter
|
|
||||||
import com.intellij.spellchecker.tokenizer.SpellcheckingStrategy
|
import com.intellij.spellchecker.tokenizer.SpellcheckingStrategy
|
||||||
import com.intellij.spellchecker.tokenizer.TokenConsumer
|
|
||||||
import com.intellij.spellchecker.tokenizer.Tokenizer
|
import com.intellij.spellchecker.tokenizer.Tokenizer
|
||||||
import net.sergeych.lyng.idea.settings.LyngFormatterSettings
|
import net.sergeych.lyng.idea.highlight.LyngTokenTypes
|
||||||
|
import net.sergeych.lyng.idea.psi.LyngElementTypes
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Spellchecking strategy for Lyng:
|
* Standard IntelliJ spellchecking strategy for Lyng.
|
||||||
* - Identifiers: checked as identifiers
|
* Uses the simplified PSI structure to identify declarations.
|
||||||
* - Comments: checked as plain text
|
|
||||||
* - Keywords: skipped
|
|
||||||
* - String literals: optional (controlled by settings), and we exclude printf-style format specifiers like
|
|
||||||
* %s, %d, %-12s, %0.2f, etc.
|
|
||||||
*/
|
*/
|
||||||
class LyngSpellcheckingStrategy : SpellcheckingStrategy() {
|
class LyngSpellcheckingStrategy : SpellcheckingStrategy() {
|
||||||
|
override fun getTokenizer(element: PsiElement?): Tokenizer<*> {
|
||||||
private val log = Logger.getInstance(LyngSpellcheckingStrategy::class.java)
|
val type = element?.node?.elementType
|
||||||
@Volatile private var loggedOnce = false
|
return when (type) {
|
||||||
|
LyngTokenTypes.LINE_COMMENT, LyngTokenTypes.BLOCK_COMMENT -> TEXT_TOKENIZER
|
||||||
private fun grazieInstalled(): Boolean {
|
LyngTokenTypes.STRING -> TEXT_TOKENIZER
|
||||||
// Support both historical and bundled IDs
|
LyngElementTypes.NAME_IDENTIFIER,
|
||||||
return PluginManagerCore.isPluginInstalled(PluginId.getId("com.intellij.grazie")) ||
|
LyngElementTypes.PARAMETER_NAME,
|
||||||
PluginManagerCore.isPluginInstalled(PluginId.getId("tanvd.grazi"))
|
LyngElementTypes.ENUM_CONSTANT_NAME -> TEXT_TOKENIZER
|
||||||
}
|
else -> super.getTokenizer(element)
|
||||||
|
|
||||||
private fun grazieApiAvailable(): Boolean = try {
|
|
||||||
// If this class is absent (as in IC-243), third-party plugins can't run Grazie programmatically
|
|
||||||
Class.forName("com.intellij.grazie.grammar.GrammarChecker")
|
|
||||||
true
|
|
||||||
} catch (_: Throwable) { false }
|
|
||||||
|
|
||||||
override fun getTokenizer(element: PsiElement): Tokenizer<*> {
|
|
||||||
if (element is com.intellij.psi.PsiFile) return EMPTY_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 et = element.node?.elementType
|
|
||||||
val index = LyngSpellIndex.getUpToDate(file)
|
|
||||||
|
|
||||||
// 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
|
|
||||||
|
|
||||||
if (index == null) {
|
|
||||||
// Index not ready: fall back to Lexer-based token types.
|
|
||||||
// Identifiers are safe because LyngLexer separates keywords from identifiers.
|
|
||||||
if (et == net.sergeych.lyng.idea.highlight.LyngTokenTypes.IDENTIFIER) {
|
|
||||||
return if (grazieIds) EMPTY_TOKENIZER else IDENTIFIER_TOKENIZER
|
|
||||||
}
|
|
||||||
if (et == net.sergeych.lyng.idea.highlight.LyngTokenTypes.LINE_COMMENT || et == net.sergeych.lyng.idea.highlight.LyngTokenTypes.BLOCK_COMMENT) {
|
|
||||||
return if (preferGrazie) EMPTY_TOKENIZER else COMMENT_TEXT_TOKENIZER
|
|
||||||
}
|
|
||||||
if (et == net.sergeych.lyng.idea.highlight.LyngTokenTypes.STRING && settings.spellCheckStringLiterals) {
|
|
||||||
return if (preferGrazie) EMPTY_TOKENIZER else STRING_WITH_PRINTF_EXCLUDES
|
|
||||||
}
|
|
||||||
return EMPTY_TOKENIZER
|
|
||||||
}
|
|
||||||
|
|
||||||
val elRange = element.textRange ?: return EMPTY_TOKENIZER
|
|
||||||
fun overlaps(list: List<TextRange>) = list.any { it.intersects(elRange) }
|
|
||||||
|
|
||||||
// Identifiers: only if range is within identifiers index and not delegated to Grazie
|
|
||||||
if (et == net.sergeych.lyng.idea.highlight.LyngTokenTypes.IDENTIFIER && overlaps(index.identifiers) && !grazieIds) return IDENTIFIER_TOKENIZER
|
|
||||||
|
|
||||||
// Comments: only if not delegated to Grazie and overlapping indexed comments
|
|
||||||
if ((et == net.sergeych.lyng.idea.highlight.LyngTokenTypes.LINE_COMMENT || et == net.sergeych.lyng.idea.highlight.LyngTokenTypes.BLOCK_COMMENT) && overlaps(index.comments) && !preferGrazie) return COMMENT_TEXT_TOKENIZER
|
|
||||||
|
|
||||||
// Strings: only if not delegated to Grazie, literals checking enabled, and overlapping indexed strings
|
|
||||||
if (et == net.sergeych.lyng.idea.highlight.LyngTokenTypes.STRING && settings.spellCheckStringLiterals && overlaps(index.strings) && !preferGrazie) 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 = com.intellij.spellchecker.inspections.IdentifierSplitter.getInstance()
|
|
||||||
override fun tokenize(element: PsiElement, consumer: TokenConsumer) {
|
|
||||||
val text = element.text
|
|
||||||
if (text.isNullOrEmpty()) return
|
|
||||||
consumer.consumeToken(element, text, false, 0, TextRange(0, text.length), splitter)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private object COMMENT_TEXT_TOKENIZER : Tokenizer<PsiElement>() {
|
|
||||||
private val splitter = PlainTextSplitter.getInstance()
|
|
||||||
override fun tokenize(element: PsiElement, consumer: TokenConsumer) {
|
|
||||||
val text = element.text
|
|
||||||
if (text.isNullOrEmpty()) return
|
|
||||||
consumer.consumeToken(element, text, false, 0, TextRange(0, text.length), splitter)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private object STRING_WITH_PRINTF_EXCLUDES : Tokenizer<PsiElement>() {
|
|
||||||
private val splitter = PlainTextSplitter.getInstance()
|
|
||||||
|
|
||||||
// Regex for printf-style specifiers: %[flags][width][.precision][length]type
|
|
||||||
// This is intentionally permissive to skip common cases like %s, %d, %-12s, %08x, %.2f, %%
|
|
||||||
private val SPEC = Regex("%(?:[-+ #0]*(?:\\d+)?(?:\\.\\d+)?[a-zA-Z%])")
|
|
||||||
|
|
||||||
override fun tokenize(element: PsiElement, consumer: TokenConsumer) {
|
|
||||||
// Check project settings whether literals should be spell-checked
|
|
||||||
val settings = LyngFormatterSettings.getInstance(element.project)
|
|
||||||
if (!settings.spellCheckStringLiterals) return
|
|
||||||
|
|
||||||
val text = element.text
|
|
||||||
if (text.isEmpty()) return
|
|
||||||
|
|
||||||
// Try to strip surrounding quotes (simple lexer token for Lyng strings)
|
|
||||||
var startOffsetInElement = 0
|
|
||||||
var endOffsetInElement = text.length
|
|
||||||
if (text.length >= 2 && (text.first() == '"' && text.last() == '"' || text.first() == '\'' && text.last() == '\'')) {
|
|
||||||
startOffsetInElement = 1
|
|
||||||
endOffsetInElement = text.length - 1
|
|
||||||
}
|
|
||||||
if (endOffsetInElement <= startOffsetInElement) return
|
|
||||||
|
|
||||||
val content = text.substring(startOffsetInElement, endOffsetInElement)
|
|
||||||
|
|
||||||
var last = 0
|
|
||||||
for (m in SPEC.findAll(content)) {
|
|
||||||
val ms = m.range.first
|
|
||||||
val me = m.range.last + 1
|
|
||||||
if (ms > last) {
|
|
||||||
val range = TextRange(startOffsetInElement + last, startOffsetInElement + ms)
|
|
||||||
consumer.consumeToken(element, text, false, 0, range, splitter)
|
|
||||||
}
|
|
||||||
last = me
|
|
||||||
}
|
|
||||||
if (last < content.length) {
|
|
||||||
val range = TextRange(startOffsetInElement + last, startOffsetInElement + content.length)
|
|
||||||
consumer.consumeToken(element, text, false, 0, range, splitter)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<!--
|
<!--
|
||||||
~ Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
~ Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
~
|
~
|
||||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
~ you may not use this file except in compliance with the License.
|
~ you may not use this file except in compliance with the License.
|
||||||
@@ -20,8 +20,6 @@
|
|||||||
-->
|
-->
|
||||||
<idea-plugin>
|
<idea-plugin>
|
||||||
<extensions defaultExtensionNs="com.intellij">
|
<extensions defaultExtensionNs="com.intellij">
|
||||||
<grazie.grammar.strategy language="Lyng"
|
|
||||||
implementationClass="net.sergeych.lyng.idea.grazie.LyngGrazieStrategy"/>
|
|
||||||
<!-- Provide text extraction for Lyng PSI so Grazie (bundled Natural Languages) can check content -->
|
<!-- Provide text extraction for Lyng PSI so Grazie (bundled Natural Languages) can check content -->
|
||||||
<grazie.textExtractor language="Lyng"
|
<grazie.textExtractor language="Lyng"
|
||||||
implementationClass="net.sergeych.lyng.idea.grazie.LyngTextExtractor"/>
|
implementationClass="net.sergeych.lyng.idea.grazie.LyngTextExtractor"/>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<!--
|
<!--
|
||||||
~ Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
~ Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
~
|
~
|
||||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
~ you may not use this file except in compliance with the License.
|
~ you may not use this file except in compliance with the License.
|
||||||
@@ -21,8 +21,6 @@
|
|||||||
-->
|
-->
|
||||||
<idea-plugin>
|
<idea-plugin>
|
||||||
<extensions defaultExtensionNs="com.intellij">
|
<extensions defaultExtensionNs="com.intellij">
|
||||||
<grazie.grammar.strategy language="Lyng"
|
|
||||||
implementationClass="net.sergeych.lyng.idea.grazie.LyngGrazieStrategy"/>
|
|
||||||
<!-- Provide text extraction for Lyng PSI so Grazie can actually check content -->
|
<!-- Provide text extraction for Lyng PSI so Grazie can actually check content -->
|
||||||
<grazie.textExtractor language="Lyng"
|
<grazie.textExtractor language="Lyng"
|
||||||
implementationClass="net.sergeych.lyng.idea.grazie.LyngTextExtractor"/>
|
implementationClass="net.sergeych.lyng.idea.grazie.LyngTextExtractor"/>
|
||||||
|
|||||||
@@ -57,9 +57,6 @@
|
|||||||
<!-- External annotator for semantic highlighting -->
|
<!-- External annotator for semantic highlighting -->
|
||||||
<externalAnnotator language="Lyng" implementationClass="net.sergeych.lyng.idea.annotators.LyngExternalAnnotator"/>
|
<externalAnnotator language="Lyng" implementationClass="net.sergeych.lyng.idea.annotators.LyngExternalAnnotator"/>
|
||||||
|
|
||||||
<!-- Grazie-backed spell/grammar annotator (runs only when Grazie is installed) -->
|
|
||||||
<externalAnnotator language="Lyng" implementationClass="net.sergeych.lyng.idea.grazie.LyngGrazieAnnotator"/>
|
|
||||||
|
|
||||||
<!-- Quick documentation provider bound to Lyng language -->
|
<!-- Quick documentation provider bound to Lyng language -->
|
||||||
<lang.documentationProvider language="Lyng" implementationClass="net.sergeych.lyng.idea.docs.LyngDocumentationProvider"/>
|
<lang.documentationProvider language="Lyng" implementationClass="net.sergeych.lyng.idea.docs.LyngDocumentationProvider"/>
|
||||||
|
|
||||||
@@ -105,5 +102,15 @@
|
|||||||
|
|
||||||
</extensions>
|
</extensions>
|
||||||
|
|
||||||
<actions/>
|
<actions>
|
||||||
|
<action id="net.sergeych.lyng.idea.actions.RunLyngScriptAction"
|
||||||
|
class="net.sergeych.lyng.idea.actions.RunLyngScriptAction"
|
||||||
|
text="Run Lyng Script"
|
||||||
|
description="Run the current Lyng script and show output in console">
|
||||||
|
<add-to-group group-id="EditorPopupMenu" anchor="last"/>
|
||||||
|
<add-to-group group-id="ProjectViewPopupMenu" anchor="last"/>
|
||||||
|
<add-to-group group-id="RunMenu" anchor="last"/>
|
||||||
|
<keyboard-shortcut keymap="$default" first-keystroke="control shift F10"/>
|
||||||
|
</action>
|
||||||
|
</actions>
|
||||||
</idea-plugin>
|
</idea-plugin>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<!--
|
<!--
|
||||||
~ Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
~ Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
~
|
~
|
||||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
~ you may not use this file except in compliance with the License.
|
~ you may not use this file except in compliance with the License.
|
||||||
@@ -22,7 +22,6 @@
|
|||||||
-->
|
-->
|
||||||
<idea-plugin>
|
<idea-plugin>
|
||||||
<extensions defaultExtensionNs="com.intellij">
|
<extensions defaultExtensionNs="com.intellij">
|
||||||
<!-- Spellchecker strategy: identifiers + comments; literals configurable, skipping printf-like specs -->
|
|
||||||
<spellchecker.support language="Lyng"
|
<spellchecker.support language="Lyng"
|
||||||
implementationClass="net.sergeych.lyng.idea.spell.LyngSpellcheckingStrategy"/>
|
implementationClass="net.sergeych.lyng.idea.spell.LyngSpellcheckingStrategy"/>
|
||||||
</extensions>
|
</extensions>
|
||||||
|
|||||||
@@ -1,466 +0,0 @@
|
|||||||
the
|
|
||||||
be
|
|
||||||
to
|
|
||||||
of
|
|
||||||
and
|
|
||||||
a
|
|
||||||
in
|
|
||||||
that
|
|
||||||
have
|
|
||||||
I
|
|
||||||
it
|
|
||||||
for
|
|
||||||
not
|
|
||||||
on
|
|
||||||
with
|
|
||||||
he
|
|
||||||
as
|
|
||||||
you
|
|
||||||
do
|
|
||||||
at
|
|
||||||
this
|
|
||||||
but
|
|
||||||
his
|
|
||||||
by
|
|
||||||
from
|
|
||||||
they
|
|
||||||
we
|
|
||||||
say
|
|
||||||
her
|
|
||||||
she
|
|
||||||
or
|
|
||||||
an
|
|
||||||
will
|
|
||||||
my
|
|
||||||
one
|
|
||||||
all
|
|
||||||
would
|
|
||||||
there
|
|
||||||
their
|
|
||||||
what
|
|
||||||
so
|
|
||||||
up
|
|
||||||
out
|
|
||||||
if
|
|
||||||
about
|
|
||||||
who
|
|
||||||
get
|
|
||||||
which
|
|
||||||
go
|
|
||||||
me
|
|
||||||
when
|
|
||||||
make
|
|
||||||
can
|
|
||||||
like
|
|
||||||
time
|
|
||||||
no
|
|
||||||
just
|
|
||||||
him
|
|
||||||
know
|
|
||||||
take
|
|
||||||
people
|
|
||||||
into
|
|
||||||
year
|
|
||||||
your
|
|
||||||
good
|
|
||||||
some
|
|
||||||
could
|
|
||||||
them
|
|
||||||
see
|
|
||||||
other
|
|
||||||
than
|
|
||||||
then
|
|
||||||
now
|
|
||||||
look
|
|
||||||
only
|
|
||||||
come
|
|
||||||
its
|
|
||||||
over
|
|
||||||
think
|
|
||||||
also
|
|
||||||
back
|
|
||||||
after
|
|
||||||
use
|
|
||||||
two
|
|
||||||
how
|
|
||||||
our
|
|
||||||
work
|
|
||||||
first
|
|
||||||
well
|
|
||||||
way
|
|
||||||
even
|
|
||||||
new
|
|
||||||
want
|
|
||||||
because
|
|
||||||
any
|
|
||||||
these
|
|
||||||
give
|
|
||||||
day
|
|
||||||
most
|
|
||||||
us
|
|
||||||
is
|
|
||||||
are
|
|
||||||
was
|
|
||||||
were
|
|
||||||
been
|
|
||||||
being
|
|
||||||
does
|
|
||||||
did
|
|
||||||
done
|
|
||||||
has
|
|
||||||
had
|
|
||||||
having
|
|
||||||
may
|
|
||||||
might
|
|
||||||
must
|
|
||||||
shall
|
|
||||||
should
|
|
||||||
ought
|
|
||||||
need
|
|
||||||
used
|
|
||||||
here
|
|
||||||
therefore
|
|
||||||
where
|
|
||||||
why
|
|
||||||
while
|
|
||||||
until
|
|
||||||
since
|
|
||||||
before
|
|
||||||
afterward
|
|
||||||
between
|
|
||||||
among
|
|
||||||
without
|
|
||||||
within
|
|
||||||
through
|
|
||||||
across
|
|
||||||
against
|
|
||||||
toward
|
|
||||||
upon
|
|
||||||
above
|
|
||||||
below
|
|
||||||
under
|
|
||||||
around
|
|
||||||
near
|
|
||||||
far
|
|
||||||
early
|
|
||||||
late
|
|
||||||
often
|
|
||||||
always
|
|
||||||
never
|
|
||||||
seldom
|
|
||||||
sometimes
|
|
||||||
usually
|
|
||||||
really
|
|
||||||
very
|
|
||||||
quite
|
|
||||||
rather
|
|
||||||
almost
|
|
||||||
already
|
|
||||||
again
|
|
||||||
still
|
|
||||||
yet
|
|
||||||
soon
|
|
||||||
today
|
|
||||||
tomorrow
|
|
||||||
yesterday
|
|
||||||
number
|
|
||||||
string
|
|
||||||
boolean
|
|
||||||
true
|
|
||||||
false
|
|
||||||
null
|
|
||||||
none
|
|
||||||
file
|
|
||||||
files
|
|
||||||
path
|
|
||||||
paths
|
|
||||||
line
|
|
||||||
lines
|
|
||||||
word
|
|
||||||
words
|
|
||||||
count
|
|
||||||
value
|
|
||||||
values
|
|
||||||
name
|
|
||||||
names
|
|
||||||
title
|
|
||||||
text
|
|
||||||
message
|
|
||||||
error
|
|
||||||
errors
|
|
||||||
warning
|
|
||||||
warnings
|
|
||||||
info
|
|
||||||
information
|
|
||||||
debug
|
|
||||||
trace
|
|
||||||
format
|
|
||||||
printf
|
|
||||||
specifier
|
|
||||||
specifiers
|
|
||||||
pattern
|
|
||||||
patterns
|
|
||||||
match
|
|
||||||
matches
|
|
||||||
regex
|
|
||||||
version
|
|
||||||
versions
|
|
||||||
module
|
|
||||||
modules
|
|
||||||
package
|
|
||||||
packages
|
|
||||||
import
|
|
||||||
imports
|
|
||||||
export
|
|
||||||
exports
|
|
||||||
class
|
|
||||||
classes
|
|
||||||
object
|
|
||||||
objects
|
|
||||||
function
|
|
||||||
functions
|
|
||||||
method
|
|
||||||
methods
|
|
||||||
parameter
|
|
||||||
parameters
|
|
||||||
argument
|
|
||||||
arguments
|
|
||||||
variable
|
|
||||||
variables
|
|
||||||
constant
|
|
||||||
constants
|
|
||||||
type
|
|
||||||
types
|
|
||||||
generic
|
|
||||||
generics
|
|
||||||
map
|
|
||||||
maps
|
|
||||||
list
|
|
||||||
lists
|
|
||||||
array
|
|
||||||
arrays
|
|
||||||
set
|
|
||||||
sets
|
|
||||||
queue
|
|
||||||
stack
|
|
||||||
graph
|
|
||||||
tree
|
|
||||||
node
|
|
||||||
nodes
|
|
||||||
edge
|
|
||||||
edges
|
|
||||||
pair
|
|
||||||
pairs
|
|
||||||
key
|
|
||||||
keys
|
|
||||||
value
|
|
||||||
values
|
|
||||||
index
|
|
||||||
indices
|
|
||||||
length
|
|
||||||
size
|
|
||||||
empty
|
|
||||||
contains
|
|
||||||
equals
|
|
||||||
compare
|
|
||||||
greater
|
|
||||||
less
|
|
||||||
minimum
|
|
||||||
maximum
|
|
||||||
average
|
|
||||||
sum
|
|
||||||
total
|
|
||||||
random
|
|
||||||
round
|
|
||||||
floor
|
|
||||||
ceil
|
|
||||||
sin
|
|
||||||
cos
|
|
||||||
tan
|
|
||||||
sqrt
|
|
||||||
abs
|
|
||||||
min
|
|
||||||
max
|
|
||||||
read
|
|
||||||
write
|
|
||||||
open
|
|
||||||
close
|
|
||||||
append
|
|
||||||
create
|
|
||||||
delete
|
|
||||||
remove
|
|
||||||
update
|
|
||||||
save
|
|
||||||
load
|
|
||||||
start
|
|
||||||
stop
|
|
||||||
run
|
|
||||||
execute
|
|
||||||
return
|
|
||||||
break
|
|
||||||
continue
|
|
||||||
try
|
|
||||||
catch
|
|
||||||
finally
|
|
||||||
throw
|
|
||||||
throws
|
|
||||||
if
|
|
||||||
else
|
|
||||||
when
|
|
||||||
while
|
|
||||||
for
|
|
||||||
loop
|
|
||||||
range
|
|
||||||
case
|
|
||||||
switch
|
|
||||||
default
|
|
||||||
optional
|
|
||||||
required
|
|
||||||
enable
|
|
||||||
disable
|
|
||||||
enabled
|
|
||||||
disabled
|
|
||||||
visible
|
|
||||||
hidden
|
|
||||||
public
|
|
||||||
private
|
|
||||||
protected
|
|
||||||
internal
|
|
||||||
external
|
|
||||||
inline
|
|
||||||
override
|
|
||||||
abstract
|
|
||||||
sealed
|
|
||||||
open
|
|
||||||
final
|
|
||||||
static
|
|
||||||
const
|
|
||||||
lazy
|
|
||||||
late
|
|
||||||
init
|
|
||||||
initialize
|
|
||||||
configuration
|
|
||||||
settings
|
|
||||||
option
|
|
||||||
options
|
|
||||||
preference
|
|
||||||
preferences
|
|
||||||
project
|
|
||||||
projects
|
|
||||||
module
|
|
||||||
modules
|
|
||||||
build
|
|
||||||
builds
|
|
||||||
compile
|
|
||||||
compiles
|
|
||||||
compiler
|
|
||||||
test
|
|
||||||
tests
|
|
||||||
testing
|
|
||||||
assert
|
|
||||||
assertion
|
|
||||||
result
|
|
||||||
results
|
|
||||||
success
|
|
||||||
failure
|
|
||||||
status
|
|
||||||
state
|
|
||||||
context
|
|
||||||
scope
|
|
||||||
scopes
|
|
||||||
token
|
|
||||||
tokens
|
|
||||||
identifier
|
|
||||||
identifiers
|
|
||||||
keyword
|
|
||||||
keywords
|
|
||||||
comment
|
|
||||||
comments
|
|
||||||
string
|
|
||||||
strings
|
|
||||||
literal
|
|
||||||
literals
|
|
||||||
formatting
|
|
||||||
formatter
|
|
||||||
spell
|
|
||||||
spelling
|
|
||||||
dictionary
|
|
||||||
dictionaries
|
|
||||||
language
|
|
||||||
languages
|
|
||||||
natural
|
|
||||||
grazie
|
|
||||||
typo
|
|
||||||
typos
|
|
||||||
suggest
|
|
||||||
suggestion
|
|
||||||
suggestions
|
|
||||||
replace
|
|
||||||
replacement
|
|
||||||
replacements
|
|
||||||
learn
|
|
||||||
learned
|
|
||||||
learns
|
|
||||||
filter
|
|
||||||
filters
|
|
||||||
exclude
|
|
||||||
excludes
|
|
||||||
include
|
|
||||||
includes
|
|
||||||
bundle
|
|
||||||
bundled
|
|
||||||
resource
|
|
||||||
resources
|
|
||||||
gzipped
|
|
||||||
plain
|
|
||||||
text
|
|
||||||
editor
|
|
||||||
editors
|
|
||||||
inspection
|
|
||||||
inspections
|
|
||||||
highlight
|
|
||||||
highlighting
|
|
||||||
underline
|
|
||||||
underlines
|
|
||||||
style
|
|
||||||
styles
|
|
||||||
range
|
|
||||||
ranges
|
|
||||||
offset
|
|
||||||
offsets
|
|
||||||
position
|
|
||||||
positions
|
|
||||||
apply
|
|
||||||
applies
|
|
||||||
provides
|
|
||||||
present
|
|
||||||
absent
|
|
||||||
available
|
|
||||||
unavailable
|
|
||||||
version
|
|
||||||
build
|
|
||||||
platform
|
|
||||||
ide
|
|
||||||
intellij
|
|
||||||
plugin
|
|
||||||
plugins
|
|
||||||
sandbox
|
|
||||||
gradle
|
|
||||||
kotlin
|
|
||||||
java
|
|
||||||
linux
|
|
||||||
macos
|
|
||||||
windows
|
|
||||||
unix
|
|
||||||
system
|
|
||||||
systems
|
|
||||||
support
|
|
||||||
supports
|
|
||||||
compatible
|
|
||||||
compatibility
|
|
||||||
fallback
|
|
||||||
native
|
|
||||||
automatic
|
|
||||||
autoswitch
|
|
||||||
switch
|
|
||||||
switches
|
|
||||||
@@ -1,282 +0,0 @@
|
|||||||
# Lyng/tech vocabulary – one word per line, lowercase
|
|
||||||
lyng
|
|
||||||
miniast
|
|
||||||
binder
|
|
||||||
printf
|
|
||||||
specifier
|
|
||||||
specifiers
|
|
||||||
regex
|
|
||||||
regexp
|
|
||||||
token
|
|
||||||
tokens
|
|
||||||
lexer
|
|
||||||
parser
|
|
||||||
syntax
|
|
||||||
semantic
|
|
||||||
highlight
|
|
||||||
highlighting
|
|
||||||
underline
|
|
||||||
typo
|
|
||||||
typos
|
|
||||||
dictionary
|
|
||||||
dictionaries
|
|
||||||
grazie
|
|
||||||
natural
|
|
||||||
languages
|
|
||||||
inspection
|
|
||||||
inspections
|
|
||||||
annotation
|
|
||||||
annotator
|
|
||||||
annotations
|
|
||||||
quickfix
|
|
||||||
quickfixes
|
|
||||||
intention
|
|
||||||
intentions
|
|
||||||
replacement
|
|
||||||
replacements
|
|
||||||
identifier
|
|
||||||
identifiers
|
|
||||||
keyword
|
|
||||||
keywords
|
|
||||||
comment
|
|
||||||
comments
|
|
||||||
string
|
|
||||||
strings
|
|
||||||
literal
|
|
||||||
literals
|
|
||||||
formatting
|
|
||||||
formatter
|
|
||||||
splitter
|
|
||||||
camelcase
|
|
||||||
snakecase
|
|
||||||
pascalcase
|
|
||||||
uppercase
|
|
||||||
lowercase
|
|
||||||
titlecase
|
|
||||||
case
|
|
||||||
cases
|
|
||||||
project
|
|
||||||
module
|
|
||||||
modules
|
|
||||||
resource
|
|
||||||
resources
|
|
||||||
bundle
|
|
||||||
bundled
|
|
||||||
gzipped
|
|
||||||
plaintext
|
|
||||||
text
|
|
||||||
range
|
|
||||||
ranges
|
|
||||||
offset
|
|
||||||
offsets
|
|
||||||
position
|
|
||||||
positions
|
|
||||||
apply
|
|
||||||
applies
|
|
||||||
runtime
|
|
||||||
compile
|
|
||||||
build
|
|
||||||
artifact
|
|
||||||
artifacts
|
|
||||||
plugin
|
|
||||||
plugins
|
|
||||||
intellij
|
|
||||||
idea
|
|
||||||
sandbox
|
|
||||||
gradle
|
|
||||||
kotlin
|
|
||||||
java
|
|
||||||
jvm
|
|
||||||
coroutines
|
|
||||||
suspend
|
|
||||||
scope
|
|
||||||
scopes
|
|
||||||
context
|
|
||||||
contexts
|
|
||||||
tokenizer
|
|
||||||
tokenizers
|
|
||||||
spell
|
|
||||||
spelling
|
|
||||||
spellcheck
|
|
||||||
spellchecker
|
|
||||||
fallback
|
|
||||||
native
|
|
||||||
autoswitch
|
|
||||||
switch
|
|
||||||
switching
|
|
||||||
enable
|
|
||||||
disable
|
|
||||||
enabled
|
|
||||||
disabled
|
|
||||||
setting
|
|
||||||
settings
|
|
||||||
preference
|
|
||||||
preferences
|
|
||||||
editor
|
|
||||||
filetype
|
|
||||||
filetypes
|
|
||||||
language
|
|
||||||
languages
|
|
||||||
psi
|
|
||||||
psielement
|
|
||||||
psifile
|
|
||||||
textcontent
|
|
||||||
textdomain
|
|
||||||
stealth
|
|
||||||
stealthy
|
|
||||||
printfspec
|
|
||||||
format
|
|
||||||
formats
|
|
||||||
pattern
|
|
||||||
patterns
|
|
||||||
match
|
|
||||||
matches
|
|
||||||
group
|
|
||||||
groups
|
|
||||||
node
|
|
||||||
nodes
|
|
||||||
tree
|
|
||||||
graph
|
|
||||||
edge
|
|
||||||
edges
|
|
||||||
pair
|
|
||||||
pairs
|
|
||||||
map
|
|
||||||
maps
|
|
||||||
list
|
|
||||||
lists
|
|
||||||
array
|
|
||||||
arrays
|
|
||||||
set
|
|
||||||
sets
|
|
||||||
queue
|
|
||||||
stack
|
|
||||||
index
|
|
||||||
indices
|
|
||||||
length
|
|
||||||
size
|
|
||||||
empty
|
|
||||||
contains
|
|
||||||
equals
|
|
||||||
compare
|
|
||||||
greater
|
|
||||||
less
|
|
||||||
minimum
|
|
||||||
maximum
|
|
||||||
average
|
|
||||||
sum
|
|
||||||
total
|
|
||||||
random
|
|
||||||
round
|
|
||||||
floor
|
|
||||||
ceil
|
|
||||||
sin
|
|
||||||
cos
|
|
||||||
tan
|
|
||||||
sqrt
|
|
||||||
abs
|
|
||||||
min
|
|
||||||
max
|
|
||||||
read
|
|
||||||
write
|
|
||||||
open
|
|
||||||
close
|
|
||||||
append
|
|
||||||
create
|
|
||||||
delete
|
|
||||||
remove
|
|
||||||
update
|
|
||||||
save
|
|
||||||
load
|
|
||||||
start
|
|
||||||
stop
|
|
||||||
run
|
|
||||||
execute
|
|
||||||
return
|
|
||||||
break
|
|
||||||
continue
|
|
||||||
try
|
|
||||||
catch
|
|
||||||
finally
|
|
||||||
throw
|
|
||||||
throws
|
|
||||||
if
|
|
||||||
else
|
|
||||||
when
|
|
||||||
while
|
|
||||||
for
|
|
||||||
loop
|
|
||||||
rangeop
|
|
||||||
caseop
|
|
||||||
switchop
|
|
||||||
default
|
|
||||||
optional
|
|
||||||
required
|
|
||||||
public
|
|
||||||
private
|
|
||||||
protected
|
|
||||||
internal
|
|
||||||
external
|
|
||||||
inline
|
|
||||||
override
|
|
||||||
abstract
|
|
||||||
sealed
|
|
||||||
open
|
|
||||||
final
|
|
||||||
static
|
|
||||||
const
|
|
||||||
lazy
|
|
||||||
late
|
|
||||||
init
|
|
||||||
initialize
|
|
||||||
configuration
|
|
||||||
option
|
|
||||||
options
|
|
||||||
projectwide
|
|
||||||
workspace
|
|
||||||
crossplatform
|
|
||||||
multiplatform
|
|
||||||
commonmain
|
|
||||||
jsmain
|
|
||||||
native
|
|
||||||
platform
|
|
||||||
api
|
|
||||||
implementation
|
|
||||||
dependency
|
|
||||||
dependencies
|
|
||||||
classpath
|
|
||||||
source
|
|
||||||
sources
|
|
||||||
document
|
|
||||||
documents
|
|
||||||
logging
|
|
||||||
logger
|
|
||||||
info
|
|
||||||
debug
|
|
||||||
trace
|
|
||||||
warning
|
|
||||||
error
|
|
||||||
severity
|
|
||||||
severitylevel
|
|
||||||
intentionaction
|
|
||||||
daemon
|
|
||||||
daemoncodeanalyzer
|
|
||||||
restart
|
|
||||||
textattributes
|
|
||||||
textattributeskey
|
|
||||||
typostyle
|
|
||||||
learned
|
|
||||||
learn
|
|
||||||
tech
|
|
||||||
vocabulary
|
|
||||||
domain
|
|
||||||
term
|
|
||||||
terms
|
|
||||||
us
|
|
||||||
uk
|
|
||||||
american
|
|
||||||
british
|
|
||||||
colour
|
|
||||||
color
|
|
||||||
organisation
|
|
||||||
organization
|
|
||||||
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
|
|||||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
|
|
||||||
group = "net.sergeych"
|
group = "net.sergeych"
|
||||||
version = "1.2.0-SNAPSHOT"
|
version = "1.2.0"
|
||||||
|
|
||||||
// Removed legacy buildscript classpath declarations; plugins are applied via the plugins DSL below
|
// Removed legacy buildscript classpath declarations; plugins are applied via the plugins DSL below
|
||||||
|
|
||||||
|
|||||||
@@ -1048,7 +1048,12 @@ class Compiler(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Nullable suffix after base or generic
|
// Nullable suffix after base or generic
|
||||||
val isNullable = cc.skipTokenOfType(Token.Type.QUESTION, isOptional = true)
|
val isNullable = if (cc.skipTokenOfType(Token.Type.QUESTION, isOptional = true)) {
|
||||||
|
true
|
||||||
|
} else if (cc.skipTokenOfType(Token.Type.IFNULLASSIGN, isOptional = true)) {
|
||||||
|
cc.pushPendingAssign()
|
||||||
|
true
|
||||||
|
} else false
|
||||||
val endPos = cc.currentPos()
|
val endPos = cc.currentPos()
|
||||||
|
|
||||||
val miniRef = buildBaseRef(if (miniArgs != null) endPos else lastEnd, miniArgs, isNullable)
|
val miniRef = buildBaseRef(if (miniArgs != null) endPos else lastEnd, miniArgs, isNullable)
|
||||||
@@ -1876,6 +1881,7 @@ class Compiler(
|
|||||||
pendingDeclStart = null
|
pendingDeclStart = null
|
||||||
// so far only simplest enums:
|
// so far only simplest enums:
|
||||||
val names = mutableListOf<String>()
|
val names = mutableListOf<String>()
|
||||||
|
val positions = mutableListOf<Pos>()
|
||||||
// skip '{'
|
// skip '{'
|
||||||
cc.skipTokenOfType(Token.Type.LBRACE)
|
cc.skipTokenOfType(Token.Type.LBRACE)
|
||||||
|
|
||||||
@@ -1884,6 +1890,7 @@ class Compiler(
|
|||||||
when (t.type) {
|
when (t.type) {
|
||||||
Token.Type.ID -> {
|
Token.Type.ID -> {
|
||||||
names += t.value
|
names += t.value
|
||||||
|
positions += t.pos
|
||||||
val t1 = cc.nextNonWhitespace()
|
val t1 = cc.nextNonWhitespace()
|
||||||
when (t1.type) {
|
when (t1.type) {
|
||||||
Token.Type.COMMA ->
|
Token.Type.COMMA ->
|
||||||
@@ -1907,7 +1914,8 @@ class Compiler(
|
|||||||
entries = names,
|
entries = names,
|
||||||
doc = doc,
|
doc = doc,
|
||||||
nameStart = nameToken.pos,
|
nameStart = nameToken.pos,
|
||||||
isExtern = isExtern
|
isExtern = isExtern,
|
||||||
|
entryPositions = positions
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -35,8 +35,9 @@ class CompilerContext(val tokens: List<Token>) {
|
|||||||
|
|
||||||
var currentIndex = 0
|
var currentIndex = 0
|
||||||
private var pendingGT = 0
|
private var pendingGT = 0
|
||||||
|
private var pendingAssign = false
|
||||||
|
|
||||||
fun hasNext() = currentIndex < tokens.size || pendingGT > 0
|
fun hasNext() = currentIndex < tokens.size || pendingGT > 0 || pendingAssign
|
||||||
fun hasPrevious() = currentIndex > 0
|
fun hasPrevious() = currentIndex > 0
|
||||||
fun next(): Token {
|
fun next(): Token {
|
||||||
if (pendingGT > 0) {
|
if (pendingGT > 0) {
|
||||||
@@ -44,6 +45,11 @@ class CompilerContext(val tokens: List<Token>) {
|
|||||||
val last = tokens[currentIndex - 1]
|
val last = tokens[currentIndex - 1]
|
||||||
return Token(">", last.pos.copy(column = last.pos.column + 1), Token.Type.GT)
|
return Token(">", last.pos.copy(column = last.pos.column + 1), Token.Type.GT)
|
||||||
}
|
}
|
||||||
|
if (pendingAssign) {
|
||||||
|
pendingAssign = false
|
||||||
|
val last = tokens[currentIndex - 1]
|
||||||
|
return Token("=", last.pos.copy(column = last.pos.column + 1), Token.Type.ASSIGN)
|
||||||
|
}
|
||||||
return if (currentIndex < tokens.size) tokens[currentIndex++]
|
return if (currentIndex < tokens.size) tokens[currentIndex++]
|
||||||
else Token("", tokens.last().pos, Token.Type.EOF)
|
else Token("", tokens.last().pos, Token.Type.EOF)
|
||||||
}
|
}
|
||||||
@@ -52,16 +58,19 @@ class CompilerContext(val tokens: List<Token>) {
|
|||||||
pendingGT++
|
pendingGT++
|
||||||
}
|
}
|
||||||
|
|
||||||
fun previous() = if (pendingGT > 0) {
|
fun pushPendingAssign() {
|
||||||
pendingGT-- // This is wrong, previous should go back.
|
pendingAssign = true
|
||||||
// But we don't really use previous() in generics parser after splitting.
|
}
|
||||||
throw IllegalStateException("previous() not supported after pushPendingGT")
|
|
||||||
|
fun previous() = if (pendingGT > 0 || pendingAssign) {
|
||||||
|
throw IllegalStateException("previous() not supported after pushPending tokens")
|
||||||
} else if (!hasPrevious()) throw IllegalStateException("No previous token") else tokens[--currentIndex]
|
} else if (!hasPrevious()) throw IllegalStateException("No previous token") else tokens[--currentIndex]
|
||||||
|
|
||||||
fun savePos() = (currentIndex shl 2) or (pendingGT and 3)
|
fun savePos() = (currentIndex shl 3) or (pendingGT and 3) or (if (pendingAssign) 4 else 0)
|
||||||
fun restorePos(pos: Int) {
|
fun restorePos(pos: Int) {
|
||||||
currentIndex = pos shr 2
|
currentIndex = pos shr 3
|
||||||
pendingGT = pos and 3
|
pendingGT = pos and 3
|
||||||
|
pendingAssign = (pos and 4) != 0
|
||||||
}
|
}
|
||||||
|
|
||||||
fun ensureLabelIsValid(pos: Pos, label: String) {
|
fun ensureLabelIsValid(pos: Pos, label: String) {
|
||||||
|
|||||||
@@ -100,11 +100,16 @@ object LyngFormatter {
|
|||||||
fun isControlHeaderNoBrace(s: String): Boolean {
|
fun isControlHeaderNoBrace(s: String): Boolean {
|
||||||
val t = s.trim()
|
val t = s.trim()
|
||||||
if (t.isEmpty()) return false
|
if (t.isEmpty()) return false
|
||||||
// match: if (...) | else if (...) | else
|
// match: if (...) | else if (...) | else | catch (...) | finally
|
||||||
val isIf = Regex("^if\\s*\\(.*\\)\\s*$").matches(t)
|
if (Regex("^if\\s*\\(.*\\)$").matches(t)) return true
|
||||||
val isElseIf = Regex("^else\\s+if\\s*\\(.*\\)\\s*$").matches(t)
|
if (Regex("^else\\s+if\\s*\\(.*\\)$").matches(t)) return true
|
||||||
val isElse = t == "else"
|
if (t == "else") return true
|
||||||
if (isIf || isElseIf || isElse) return true
|
if (Regex("^catch\\s*\\(.*\\)$").matches(t)) return true
|
||||||
|
if (t == "finally") return true
|
||||||
|
|
||||||
|
// Short definition form: fun x() = or val x =
|
||||||
|
if (Regex("^(override\\s+)?(fun|fn)\\b.*=\\s*$").matches(t)) return true
|
||||||
|
if (Regex("^(private\\s+|protected\\s+|public\\s+|override\\s+)?(val|var)\\b.*=\\s*$").matches(t)) return true
|
||||||
|
|
||||||
// property accessors ending with ) or =
|
// property accessors ending with ) or =
|
||||||
if (isAccessorRelated(t)) {
|
if (isAccessorRelated(t)) {
|
||||||
@@ -113,11 +118,23 @@ object LyngFormatter {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun isDoubleIndentHeader(s: String): Boolean {
|
||||||
|
val t = s.trim()
|
||||||
|
if (!t.endsWith("=")) return false
|
||||||
|
// Is it a function or property definition?
|
||||||
|
if (Regex("\\b(fun|fn|val|var)\\b").containsMatchIn(t)) return true
|
||||||
|
// Is it an accessor?
|
||||||
|
if (isPropertyAccessor(t)) return true
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
for ((i, rawLine) in lines.withIndex()) {
|
for ((i, rawLine) in lines.withIndex()) {
|
||||||
val (parts, nextInBlockComment) = splitIntoParts(rawLine, inBlockComment)
|
val (parts, nextInBlockComment) = splitIntoParts(rawLine, inBlockComment)
|
||||||
val code = parts.filter { it.type == PartType.Code }.joinToString("") { it.text }
|
val code = parts.filter { it.type == PartType.Code }.joinToString("") { it.text }
|
||||||
|
val codeAndStrings = parts.filter { it.type != PartType.BlockComment && it.type != PartType.LineComment }.joinToString("") { it.text }
|
||||||
val trimmedStart = code.dropWhile { it == ' ' || it == '\t' }
|
val trimmedStart = code.dropWhile { it == ' ' || it == '\t' }
|
||||||
val trimmedLine = rawLine.trim()
|
val trimmedLine = rawLine.trim()
|
||||||
|
val trimmedCodeAndStrings = codeAndStrings.trim()
|
||||||
|
|
||||||
// Compute effective indent level for this line
|
// Compute effective indent level for this line
|
||||||
val currentExtraIndent = extraIndents.sum()
|
val currentExtraIndent = extraIndents.sum()
|
||||||
@@ -138,9 +155,15 @@ object LyngFormatter {
|
|||||||
|
|
||||||
// Single-line control header (if/else/else if) without braces: indent the next
|
// Single-line control header (if/else/else if) without braces: indent the next
|
||||||
// non-empty, non-'}', non-'else' line by one extra level
|
// non-empty, non-'}', non-'else' line by one extra level
|
||||||
|
val isContinuation = trimmedStart.startsWith("else") || trimmedStart.startsWith("catch") || trimmedStart.startsWith("finally")
|
||||||
val applyAwaiting = awaitingExtraIndent > 0 && trimmedStart.isNotEmpty() &&
|
val applyAwaiting = awaitingExtraIndent > 0 && trimmedStart.isNotEmpty() &&
|
||||||
!trimmedStart.startsWith("else") && !trimmedStart.startsWith("}")
|
!trimmedStart.startsWith("}")
|
||||||
if (applyAwaiting) effectiveLevel += awaitingExtraIndent
|
var actualAwaiting = 0
|
||||||
|
if (applyAwaiting) {
|
||||||
|
actualAwaiting = awaitingExtraIndent
|
||||||
|
if (isContinuation) actualAwaiting = (actualAwaiting - 1).coerceAtLeast(0)
|
||||||
|
effectiveLevel += actualAwaiting
|
||||||
|
}
|
||||||
|
|
||||||
val firstChar = trimmedStart.firstOrNull()
|
val firstChar = trimmedStart.firstOrNull()
|
||||||
// While inside parentheses, continuation applies scaled by nesting level
|
// While inside parentheses, continuation applies scaled by nesting level
|
||||||
@@ -194,7 +217,7 @@ object LyngFormatter {
|
|||||||
val newBlockLevel = blockLevel
|
val newBlockLevel = blockLevel
|
||||||
if (newBlockLevel > oldBlockLevel) {
|
if (newBlockLevel > oldBlockLevel) {
|
||||||
val isAccessorRelatedLine = isAccessor || (!inBlockComment && isAccessorRelated(code))
|
val isAccessorRelatedLine = isAccessor || (!inBlockComment && isAccessorRelated(code))
|
||||||
val addedThisLine = (if (applyAwaiting) awaitingExtraIndent else 0) + (if (isAccessorRelatedLine) 1 else 0)
|
val addedThisLine = actualAwaiting + (if (isAccessorRelatedLine) 1 else 0)
|
||||||
repeat(newBlockLevel - oldBlockLevel) {
|
repeat(newBlockLevel - oldBlockLevel) {
|
||||||
extraIndents.add(addedThisLine)
|
extraIndents.add(addedThisLine)
|
||||||
}
|
}
|
||||||
@@ -207,23 +230,29 @@ object LyngFormatter {
|
|||||||
inBlockComment = nextInBlockComment
|
inBlockComment = nextInBlockComment
|
||||||
|
|
||||||
// Update awaitingExtraIndent based on current line
|
// Update awaitingExtraIndent based on current line
|
||||||
|
val nextLineTrimmed = lines.getOrNull(i + 1)?.trim() ?: ""
|
||||||
|
val nextIsContinuation = nextLineTrimmed.startsWith("else") ||
|
||||||
|
nextLineTrimmed.startsWith("catch") ||
|
||||||
|
nextLineTrimmed.startsWith("finally")
|
||||||
|
|
||||||
if (applyAwaiting && trimmedStart.isNotEmpty()) {
|
if (applyAwaiting && trimmedStart.isNotEmpty()) {
|
||||||
// we have just applied it.
|
// we have just applied it.
|
||||||
val endsWithBrace = code.trimEnd().endsWith("{")
|
val endsWithBrace = code.trimEnd().endsWith("{")
|
||||||
if (!endsWithBrace && isControlHeaderNoBrace(code)) {
|
if (!endsWithBrace && isControlHeaderNoBrace(trimmedCodeAndStrings)) {
|
||||||
// It's another header, increment
|
// It's another header, increment
|
||||||
val isAccessorRelatedLine = isAccessor || (!inBlockComment && isAccessorRelated(code))
|
val isAccessorOrDouble = isAccessor || (!inBlockComment && isAccessorRelated(code)) || isDoubleIndentHeader(trimmedCodeAndStrings)
|
||||||
awaitingExtraIndent += if (isAccessorRelatedLine) 2 else 1
|
val increment = if (isAccessorOrDouble) 2 else 1
|
||||||
} else {
|
awaitingExtraIndent = actualAwaiting + increment
|
||||||
// It's the body, reset
|
} else if (!nextIsContinuation) {
|
||||||
|
// It's the body, and no continuation follows, so reset
|
||||||
awaitingExtraIndent = 0
|
awaitingExtraIndent = 0
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// start awaiting if current line is a control header without '{'
|
// start awaiting if current line is a control header without '{'
|
||||||
val endsWithBrace = code.trimEnd().endsWith("{")
|
val endsWithBrace = code.trimEnd().endsWith("{")
|
||||||
if (!endsWithBrace && isControlHeaderNoBrace(code)) {
|
if (!endsWithBrace && isControlHeaderNoBrace(trimmedCodeAndStrings)) {
|
||||||
val isAccessorRelatedLine = isAccessor || (!inBlockComment && isAccessorRelated(code))
|
val isAccessorOrDouble = isAccessor || (!inBlockComment && isAccessorRelated(code)) || isDoubleIndentHeader(trimmedCodeAndStrings)
|
||||||
awaitingExtraIndent = if (isAccessorRelatedLine) 2 else 1
|
awaitingExtraIndent = if (isAccessorOrDouble) 2 else 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ private val fallbackKeywordIds = setOf(
|
|||||||
"and", "or", "not",
|
"and", "or", "not",
|
||||||
// declarations & modifiers
|
// declarations & modifiers
|
||||||
"fun", "fn", "class", "interface", "enum", "val", "var", "import", "package",
|
"fun", "fn", "class", "interface", "enum", "val", "var", "import", "package",
|
||||||
"abstract", "closed", "override",
|
"abstract", "closed", "override", "public", "lazy", "dynamic",
|
||||||
"private", "protected", "static", "open", "extern", "init", "get", "set", "by",
|
"private", "protected", "static", "open", "extern", "init", "get", "set", "by",
|
||||||
// control flow and misc
|
// control flow and misc
|
||||||
"if", "else", "when", "while", "do", "for", "try", "catch", "finally",
|
"if", "else", "when", "while", "do", "for", "try", "catch", "finally",
|
||||||
|
|||||||
@@ -239,6 +239,9 @@ object CompletionEngineLight {
|
|||||||
fun addMembersOf(name: String, direct: Boolean) {
|
fun addMembersOf(name: String, direct: Boolean) {
|
||||||
val cls = classes[name] ?: return
|
val cls = classes[name] ?: return
|
||||||
val target = if (direct) directMap else inheritedMap
|
val target = if (direct) directMap else inheritedMap
|
||||||
|
for (cf in cls.ctorFields + cls.classFields) {
|
||||||
|
target.getOrPut(cf.name) { mutableListOf() }.add(DocLookupUtils.toMemberVal(cf))
|
||||||
|
}
|
||||||
for (m in cls.members) target.getOrPut(m.name) { mutableListOf() }.add(m)
|
for (m in cls.members) target.getOrPut(m.name) { mutableListOf() }.add(m)
|
||||||
for (b in cls.bases) if (visited.add(b)) addMembersOf(b, false)
|
for (b in cls.bases) if (visited.add(b)) addMembersOf(b, false)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -96,6 +96,19 @@ object DocLookupUtils {
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun findEnclosingClass(mini: MiniScript, offset: Int): MiniClassDecl? {
|
||||||
|
val src = mini.range.start.source
|
||||||
|
return mini.declarations.filterIsInstance<MiniClassDecl>()
|
||||||
|
.filter {
|
||||||
|
val start = src.offsetOf(it.range.start)
|
||||||
|
val end = src.offsetOf(it.range.end)
|
||||||
|
offset in start..end
|
||||||
|
}
|
||||||
|
.minByOrNull {
|
||||||
|
src.offsetOf(it.range.end) - src.offsetOf(it.range.start)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun findTypeByRange(mini: MiniScript?, name: String, startOffset: Int, text: String? = null, imported: List<String>? = null): MiniTypeRef? {
|
fun findTypeByRange(mini: MiniScript?, name: String, startOffset: Int, text: String? = null, imported: List<String>? = null): MiniTypeRef? {
|
||||||
if (mini == null) return null
|
if (mini == null) return null
|
||||||
val src = mini.range.start.source
|
val src = mini.range.start.source
|
||||||
@@ -233,10 +246,14 @@ object DocLookupUtils {
|
|||||||
val rep = list.first()
|
val rep = list.first()
|
||||||
val bases = LinkedHashSet<String>()
|
val bases = LinkedHashSet<String>()
|
||||||
val members = LinkedHashMap<String, MutableList<MiniMemberDecl>>()
|
val members = LinkedHashMap<String, MutableList<MiniMemberDecl>>()
|
||||||
|
val ctorFields = LinkedHashMap<String, MiniCtorField>()
|
||||||
|
val classFields = LinkedHashMap<String, MiniCtorField>()
|
||||||
var doc: MiniDoc? = null
|
var doc: MiniDoc? = null
|
||||||
for (c in list) {
|
for (c in list) {
|
||||||
bases.addAll(c.bases)
|
bases.addAll(c.bases)
|
||||||
if (doc == null && c.doc != null && c.doc.raw.isNotBlank()) doc = c.doc
|
if (doc == null && c.doc != null && c.doc.raw.isNotBlank()) doc = c.doc
|
||||||
|
for (cf in c.ctorFields) ctorFields[cf.name] = cf
|
||||||
|
for (cf in c.classFields) classFields[cf.name] = cf
|
||||||
for (m in c.members) {
|
for (m in c.members) {
|
||||||
// Group by name to keep overloads together
|
// Group by name to keep overloads together
|
||||||
members.getOrPut(m.name) { mutableListOf() }.add(m)
|
members.getOrPut(m.name) { mutableListOf() }.add(m)
|
||||||
@@ -249,8 +266,8 @@ object DocLookupUtils {
|
|||||||
name = rep.name,
|
name = rep.name,
|
||||||
bases = bases.toList(),
|
bases = bases.toList(),
|
||||||
bodyRange = rep.bodyRange,
|
bodyRange = rep.bodyRange,
|
||||||
ctorFields = rep.ctorFields,
|
ctorFields = ctorFields.values.toList(),
|
||||||
classFields = rep.classFields,
|
classFields = classFields.values.toList(),
|
||||||
doc = doc,
|
doc = doc,
|
||||||
nameStart = rep.nameStart,
|
nameStart = rep.nameStart,
|
||||||
members = mergedMembers
|
members = mergedMembers
|
||||||
@@ -268,6 +285,18 @@ object DocLookupUtils {
|
|||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal fun toMemberVal(cf: MiniCtorField): MiniMemberValDecl = MiniMemberValDecl(
|
||||||
|
range = MiniRange(cf.nameStart, cf.nameStart),
|
||||||
|
name = cf.name,
|
||||||
|
mutable = cf.mutable,
|
||||||
|
type = cf.type,
|
||||||
|
initRange = null,
|
||||||
|
doc = null,
|
||||||
|
nameStart = cf.nameStart,
|
||||||
|
isStatic = false,
|
||||||
|
isExtern = false
|
||||||
|
)
|
||||||
|
|
||||||
fun resolveMemberWithInheritance(importedModules: List<String>, className: String, member: String, localMini: MiniScript? = null): Pair<String, MiniNamedDecl>? {
|
fun resolveMemberWithInheritance(importedModules: List<String>, className: String, member: String, localMini: MiniScript? = null): Pair<String, MiniNamedDecl>? {
|
||||||
val classes = aggregateClasses(importedModules, localMini)
|
val classes = aggregateClasses(importedModules, localMini)
|
||||||
fun dfs(name: String, visited: MutableSet<String>): Pair<String, MiniNamedDecl>? {
|
fun dfs(name: String, visited: MutableSet<String>): Pair<String, MiniNamedDecl>? {
|
||||||
@@ -275,6 +304,8 @@ object DocLookupUtils {
|
|||||||
val cls = classes[name]
|
val cls = classes[name]
|
||||||
if (cls != null) {
|
if (cls != null) {
|
||||||
cls.members.firstOrNull { it.name == member }?.let { return name to it }
|
cls.members.firstOrNull { it.name == member }?.let { return name to it }
|
||||||
|
cls.ctorFields.firstOrNull { it.name == member }?.let { return name to toMemberVal(it) }
|
||||||
|
cls.classFields.firstOrNull { it.name == member }?.let { return name to toMemberVal(it) }
|
||||||
for (baseName in cls.bases) {
|
for (baseName in cls.bases) {
|
||||||
dfs(baseName, visited)?.let { return it }
|
dfs(baseName, visited)?.let { return it }
|
||||||
}
|
}
|
||||||
@@ -656,6 +687,12 @@ object DocLookupUtils {
|
|||||||
val identRange = wordRangeAt(text, i + 1)
|
val identRange = wordRangeAt(text, i + 1)
|
||||||
if (identRange != null) {
|
if (identRange != null) {
|
||||||
val ident = text.substring(identRange.first, identRange.second)
|
val ident = text.substring(identRange.first, identRange.second)
|
||||||
|
|
||||||
|
// 3a) Handle plain "this"
|
||||||
|
if (ident == "this" && mini != null) {
|
||||||
|
findEnclosingClass(mini, identRange.first)?.let { return it.name }
|
||||||
|
}
|
||||||
|
|
||||||
// if it's "as Type", we want Type
|
// if it's "as Type", we want Type
|
||||||
var k = prevNonWs(text, identRange.first - 1)
|
var k = prevNonWs(text, identRange.first - 1)
|
||||||
if (k >= 1 && text[k] == 's' && text[k - 1] == 'a' && (k - 1 == 0 || !text[k - 2].isLetterOrDigit())) {
|
if (k >= 1 && text[k] == 's' && text[k - 1] == 'a' && (k - 1 == 0 || !text[k - 2].isLetterOrDigit())) {
|
||||||
|
|||||||
@@ -205,6 +205,7 @@ data class MiniEnumDecl(
|
|||||||
override val nameStart: Pos,
|
override val nameStart: Pos,
|
||||||
override val isExtern: Boolean = false,
|
override val isExtern: Boolean = false,
|
||||||
override val isStatic: Boolean = false,
|
override val isStatic: Boolean = false,
|
||||||
|
val entryPositions: List<Pos> = emptyList()
|
||||||
) : MiniDecl
|
) : MiniDecl
|
||||||
|
|
||||||
data class MiniCtorField(
|
data class MiniCtorField(
|
||||||
|
|||||||
@@ -72,10 +72,11 @@ open class ObjException(
|
|||||||
val l = getStackTrace().list
|
val l = getStackTrace().list
|
||||||
return buildString {
|
return buildString {
|
||||||
append(message.value)
|
append(message.value)
|
||||||
for( t in l)
|
for (t in l)
|
||||||
append("\n\tat ${t.toString(scope)}")
|
append("\n\tat ${t.toString(scope)}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun defaultToString(scope: Scope): ObjString {
|
override suspend fun defaultToString(scope: Scope): ObjString {
|
||||||
val at = getStackTrace().list.firstOrNull()?.toString(scope)
|
val at = getStackTrace().list.firstOrNull()?.toString(scope)
|
||||||
?: ObjString("(unknown)")
|
?: ObjString("(unknown)")
|
||||||
@@ -100,6 +101,7 @@ open class ObjException(
|
|||||||
while (s != null) {
|
while (s != null) {
|
||||||
val pos = s.pos
|
val pos = s.pos
|
||||||
if (pos != lastPos && !pos.currentLine.isEmpty()) {
|
if (pos != lastPos && !pos.currentLine.isEmpty()) {
|
||||||
|
if( (lastPos == null || (lastPos.source != pos.source || lastPos.line != pos.line)) ) {
|
||||||
if (maybeCls != null) {
|
if (maybeCls != null) {
|
||||||
result.list += maybeCls.callWithArgs(
|
result.list += maybeCls.callWithArgs(
|
||||||
scope,
|
scope,
|
||||||
@@ -110,11 +112,12 @@ open class ObjException(
|
|||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
// Fallback textual entry if StackTraceEntry class is not available in this scope
|
// Fallback textual entry if StackTraceEntry class is not available in this scope
|
||||||
result.list += ObjString("${pos.source.objSourceName}:${pos.line}:${pos.column}: ${pos.currentLine}")
|
result.list += ObjString("#${pos.source.objSourceName}:${pos.line+1}:${pos.column+1}: ${pos.currentLine}")
|
||||||
|
}
|
||||||
|
lastPos = pos
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
s = s.parent
|
s = s.parent
|
||||||
lastPos = pos
|
|
||||||
}
|
}
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
@@ -339,8 +342,8 @@ fun Obj.isLyngException(): Boolean = isInstanceOf("Exception")
|
|||||||
/**
|
/**
|
||||||
* Get the exception message.
|
* Get the exception message.
|
||||||
*/
|
*/
|
||||||
suspend fun Obj.getLyngExceptionMessage(scope: Scope?=null): String {
|
suspend fun Obj.getLyngExceptionMessage(scope: Scope? = null): String {
|
||||||
require( this.isLyngException() )
|
require(this.isLyngException())
|
||||||
val s = scope ?: Script.newScope()
|
val s = scope ?: Script.newScope()
|
||||||
return invokeInstanceMethod(s, "message").toString(s).value
|
return invokeInstanceMethod(s, "message").toString(s).value
|
||||||
}
|
}
|
||||||
@@ -356,18 +359,18 @@ suspend fun Obj.getLyngExceptionMessage(scope: Scope?=null): String {
|
|||||||
* The stack trace details each frame using indentation for clarity.
|
* The stack trace details each frame using indentation for clarity.
|
||||||
* @throws IllegalArgumentException if the object is not a Lyng exception.
|
* @throws IllegalArgumentException if the object is not a Lyng exception.
|
||||||
*/
|
*/
|
||||||
suspend fun Obj.getLyngExceptionMessageWithStackTrace(scope: Scope?=null): String {
|
suspend fun Obj.getLyngExceptionMessageWithStackTrace(scope: Scope? = null,showDetails:Boolean=true): String {
|
||||||
require( this.isLyngException() )
|
require(this.isLyngException())
|
||||||
val s = scope ?: Script.newScope()
|
val s = scope ?: Script.newScope()
|
||||||
val msg = getLyngExceptionMessage(s)
|
val msg = getLyngExceptionMessage(s)
|
||||||
val trace = getLyngExceptionStackTrace(s)
|
val trace = getLyngExceptionStackTrace(s)
|
||||||
var at = "unknown"
|
var at = "unknown"
|
||||||
val stack = if( !trace.list.isEmpty() ) {
|
// var firstLine = true
|
||||||
|
val stack = if (!trace.list.isEmpty()) {
|
||||||
val first = trace.list[0]
|
val first = trace.list[0]
|
||||||
at = (first.readField(s, "at").value as ObjString).value
|
at = (first.readField(s, "at").value as ObjString).value
|
||||||
"\n" + trace.list.map { " at " + it.toString(s).value }.joinToString("\n")
|
"\n" + trace.list.map { " at " + it.toString(s).value }.joinToString("\n")
|
||||||
}
|
} else ""
|
||||||
else ""
|
|
||||||
return "$at: $msg$stack"
|
return "$at: $msg$stack"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -392,7 +395,7 @@ suspend fun Obj.getLyngExceptionString(scope: Scope): String =
|
|||||||
/**
|
/**
|
||||||
* Rethrow this object as a Kotlin [ExecutionError] if it's an exception.
|
* Rethrow this object as a Kotlin [ExecutionError] if it's an exception.
|
||||||
*/
|
*/
|
||||||
suspend fun Obj.raiseAsExecutionError(scope: Scope?=null): Nothing {
|
suspend fun Obj.raiseAsExecutionError(scope: Scope? = null): Nothing {
|
||||||
if (this is ObjException) raise()
|
if (this is ObjException) raise()
|
||||||
val sc = scope ?: Script.newScope()
|
val sc = scope ?: Script.newScope()
|
||||||
val msg = getLyngExceptionMessage(sc)
|
val msg = getLyngExceptionMessage(sc)
|
||||||
|
|||||||
@@ -79,6 +79,14 @@ data class ObjString(val value: String) : Obj() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override suspend fun mul(scope: Scope, other: Obj): Obj {
|
||||||
|
var times = other.toInt()
|
||||||
|
if( times < 0 ) scope.raiseIllegalArgument("negative string repetitions")
|
||||||
|
return ObjString( buildString {
|
||||||
|
while( times-- > 0 ) append(value)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
override fun hashCode(): Int {
|
override fun hashCode(): Int {
|
||||||
return value.hashCode()
|
return value.hashCode()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -168,6 +168,7 @@ class MiniAstTest {
|
|||||||
assertNotNull(ed.doc)
|
assertNotNull(ed.doc)
|
||||||
assertTrue(ed.doc.raw.contains("Enum E docs"))
|
assertTrue(ed.doc.raw.contains("Enum E docs"))
|
||||||
assertEquals(listOf("A", "B", "C"), ed.entries)
|
assertEquals(listOf("A", "B", "C"), ed.entries)
|
||||||
|
assertEquals(3, ed.entryPositions.size)
|
||||||
assertEquals("E", ed.name)
|
assertEquals("E", ed.name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4160,6 +4160,14 @@ class ScriptTest {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testStringMul() = runTest {
|
||||||
|
eval("""
|
||||||
|
assertEquals("hellohello", "hello"*2)
|
||||||
|
assertEquals("", "hello"*0)
|
||||||
|
""".trimIndent())
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testLogicalNot() = runTest {
|
fun testLogicalNot() = runTest {
|
||||||
eval(
|
eval(
|
||||||
@@ -4672,6 +4680,29 @@ class ScriptTest {
|
|||||||
// source name, in our case, is is "tc2":
|
// source name, in our case, is is "tc2":
|
||||||
assertContains(x1.message!!, "tc2")
|
assertContains(x1.message!!, "tc2")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testFilterStackTrace() = runTest {
|
||||||
|
var x = try {
|
||||||
|
evalNamed( "tc1","""
|
||||||
|
fun f2() = throw IllegalArgumentException("test3")
|
||||||
|
fun f1() = f2()
|
||||||
|
f1()
|
||||||
|
""".trimIndent())
|
||||||
|
fail("this should throw")
|
||||||
|
}
|
||||||
|
catch(x: ExecutionError) {
|
||||||
|
x
|
||||||
|
}
|
||||||
|
assertEquals("""
|
||||||
|
tc1:1:12: test3
|
||||||
|
at tc1:1:12: fun f2() = throw IllegalArgumentException("test3")
|
||||||
|
at tc1:2:12: fun f1() = f2()
|
||||||
|
at tc1:3:1: f1()
|
||||||
|
""".trimIndent(),x.errorObject.getLyngExceptionMessageWithStackTrace())
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testLyngToKotlinExceptionHelpers() = runTest {
|
fun testLyngToKotlinExceptionHelpers() = runTest {
|
||||||
var x = evalNamed( "tc1","""
|
var x = evalNamed( "tc1","""
|
||||||
@@ -4796,5 +4827,33 @@ class ScriptTest {
|
|||||||
assertEquals("r:r", T().l("r"))
|
assertEquals("r:r", T().l("r"))
|
||||||
""".trimIndent())
|
""".trimIndent())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testTypedArgsWithInitializers() = runTest {
|
||||||
|
eval("""
|
||||||
|
fun f(a: String = "foo") = a + "!"
|
||||||
|
fun g(a: String? = null) = a ?: "!!"
|
||||||
|
assertEquals(f(), "foo!")
|
||||||
|
assertEquals(g(), "!!")
|
||||||
|
assertEquals(f("bar"), "bar!")
|
||||||
|
class T(b: Int=42,c: String?=null)
|
||||||
|
assertEquals(42, T().b)
|
||||||
|
assertEquals(null, T().c)
|
||||||
|
""".trimIndent())
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testArgsPriorityWithSplash() = runTest {
|
||||||
|
eval("""
|
||||||
|
class A {
|
||||||
|
val tags get() = ["foo"]
|
||||||
|
|
||||||
|
fun f1(tags...) = tags
|
||||||
|
|
||||||
|
fun f2(tags...) = f1(...tags)
|
||||||
|
}
|
||||||
|
assertEquals(["bar"], A().f2("bar"))
|
||||||
|
""")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39,7 +39,7 @@ fun Iterable.filter(predicate) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Count all items in this iterable for which predicate return true
|
Count all items in this iterable for which predicate returns true
|
||||||
*/
|
*/
|
||||||
fun Iterable.count(predicate): Int {
|
fun Iterable.count(predicate): Int {
|
||||||
var hits = 0
|
var hits = 0
|
||||||
@@ -266,12 +266,8 @@ class StackTraceEntry(
|
|||||||
/* Print this exception and its stack trace to standard output. */
|
/* Print this exception and its stack trace to standard output. */
|
||||||
fun Exception.printStackTrace() {
|
fun Exception.printStackTrace() {
|
||||||
println(this)
|
println(this)
|
||||||
var lastEntry = null
|
for( entry in stackTrace )
|
||||||
for( entry in stackTrace ) {
|
|
||||||
if( lastEntry == null || lastEntry !is StackTraceEntry || lastEntry.line != entry.line )
|
|
||||||
println("\tat "+entry.toString())
|
println("\tat "+entry.toString())
|
||||||
lastEntry = entry
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Compile this string into a regular expression. */
|
/* Compile this string into a regular expression. */
|
||||||
|
|||||||
@@ -329,7 +329,7 @@
|
|||||||
<!-- Top-left version ribbon -->
|
<!-- Top-left version ribbon -->
|
||||||
<div class="corner-ribbon bg-danger text-white">
|
<div class="corner-ribbon bg-danger text-white">
|
||||||
<span style="margin-left: -5em">
|
<span style="margin-left: -5em">
|
||||||
v1.2.0-SNAPSHOT
|
v1.2.0!
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<!-- Fixed top navbar for the whole site -->
|
<!-- Fixed top navbar for the whole site -->
|
||||||
|
|||||||
Reference in new issue
Block a user