SergeychWorks/lyng
1
0 Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 1 Releases 21 Wiki Activity

code cleanup performed (trivial cases)

Browse Source
This commit is contained in:
sergeych committed 2026-01-06 10:38:31 +01:00
1 parent fa4dc45f15
commit 8cd980514b
16 files changed
+86 -81
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lynglib/src/commonTest/kotlin/BindingHighlightTest.kt
+4 -4
View File
@@ -47,7 +47,7 @@ class BindingHighlightTest {
val mini = sink.build()
assertNotNull(mini, "Mini-AST must be built")
val binding = Binder.bind(text, mini!!)
val binding = Binder.bind(text, mini)
// Find the top-level symbol for counter and ensure it is mutable (Variable)
val sym = binding.symbols.firstOrNull { it.name == "counter" }
@@ -78,7 +78,7 @@ class BindingHighlightTest {
val mini = sink.build()
assertNotNull(mini, "Mini-AST must be built")
val binding = Binder.bind(text, mini!!)
val binding = Binder.bind(text, mini)
val sym = binding.symbols.firstOrNull { it.name == "answer" }
assertNotNull(sym, "Top-level val 'answer' must be registered as a symbol")
@@ -114,7 +114,7 @@ class BindingHighlightTest {
val mini = sink.build()
assertNotNull(mini, "Mini-AST must be built")
val binding = Binder.bind(text, mini!!)
val binding = Binder.bind(text, mini)
// Ensure we registered the local var/val symbol for `name`
val nameSym = binding.symbols.firstOrNull { it.name == "name" }
@@ -163,7 +163,7 @@ class BindingHighlightTest {
val mini = sink.build()
assertNotNull(mini, "Mini-AST must be built")
val binding = Binder.bind(text, mini!!)
val binding = Binder.bind(text, mini)
val nameSym = binding.symbols.firstOrNull { it.name == "name" && (it.kind == SymbolKind.Variable || it.kind == SymbolKind.Value) }
assertNotNull(nameSym, "Local variable 'name' should be registered as a symbol")
lynglib/src/commonTest/kotlin/BindingTest.kt
+4 -4
View File
@@ -36,7 +36,7 @@ class BindingTest {
Compiler.compileWithMini(src, sink)
val mini = sink.build()
assertNotNull(mini, "MiniScript should be built")
return Binder.bind(src, mini!!)
return Binder.bind(src, mini)
}
@Test
@@ -72,7 +72,7 @@ class BindingTest {
val xSym = snap.symbols.firstOrNull { it.name == "x" }
assertNotNull(xSym)
// One reference usage to top-level x
val refs = snap.references.filter { it.symbolId == xSym!!.id }
val refs = snap.references.filter { it.symbolId == xSym.id }
assertEquals(1, refs.size)
}
@@ -111,7 +111,7 @@ class BindingTest {
val fooField = snap.symbols.firstOrNull { it.name == "foo" }
assertNotNull(fooField)
// Should have at least one reference (usage in bar)
val refs = snap.references.count { it.symbolId == fooField!!.id }
val refs = snap.references.count { it.symbolId == fooField.id }
assertEquals(1, refs)
}
@@ -126,7 +126,7 @@ class BindingTest {
)
val xField = snap.symbols.firstOrNull { it.name == "x" }
assertNotNull(xField)
val refs = snap.references.count { it.symbolId == xField!!.id }
val refs = snap.references.count { it.symbolId == xField.id }
assertEquals(1, refs)
}
}
lynglib/src/commonTest/kotlin/MiniAstTest.kt
+12 -12
View File
@@ -44,7 +44,7 @@ class MiniAstTest {
val (_, sink) = compileWithMini(code)
val mini = sink.build()
assertNotNull(mini)
val imps = mini!!.imports
val imps = mini.imports
assertTrue(imps.isNotEmpty(), "imports should be captured")
val first = imps.first()
val segNames = first.segments.map { it.name }
@@ -68,12 +68,12 @@ class MiniAstTest {
val (_, sink) = compileWithMini(code)
val mini = sink.build()
assertNotNull(mini)
val fn = mini!!.declarations.filterIsInstance<MiniFunDecl>().firstOrNull { it.name == "foo" }
val fn = mini.declarations.filterIsInstance<MiniFunDecl>().firstOrNull { it.name == "foo" }
assertNotNull(fn, "function decl should be captured")
// Doc
assertNotNull(fn.doc)
assertEquals("Summary: does foo", fn.doc!!.summary)
assertTrue(fn.doc!!.raw.contains("details"))
assertEquals("Summary: does foo", fn.doc.summary)
assertTrue(fn.doc.raw.contains("details"))
// Params
assertEquals(2, fn.params.size)
val p1 = fn.params[0]
@@ -99,10 +99,10 @@ class MiniAstTest {
val (_, sink) = compileWithMini(code)
val mini = sink.build()
assertNotNull(mini)
val vd = mini!!.declarations.filterIsInstance<net.sergeych.lyng.miniast.MiniValDecl>().firstOrNull { it.name == "x" }
val vd = mini.declarations.filterIsInstance<net.sergeych.lyng.miniast.MiniValDecl>().firstOrNull { it.name == "x" }
assertNotNull(vd)
assertNotNull(vd.doc)
assertEquals("docs for x", vd.doc!!.summary)
assertEquals("docs for x", vd.doc.summary)
val ty = vd.type
assertNotNull(ty)
val gen = ty as MiniGenericType
@@ -126,10 +126,10 @@ class MiniAstTest {
val (_, sink) = compileWithMini(code)
val mini = sink.build()
assertNotNull(mini)
val cd = mini!!.declarations.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == "C" }
val cd = mini.declarations.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == "C" }
assertNotNull(cd)
assertNotNull(cd.doc, "Class doc should be preserved even with members")
assertTrue(cd.doc!!.raw.contains("Class C docs"))
assertTrue(cd.doc.raw.contains("Class C docs"))
}
@Test
@@ -141,10 +141,10 @@ class MiniAstTest {
val (_, sink) = compileWithMini(code)
val mini = sink.build()
assertNotNull(mini)
val cd = mini!!.declarations.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == "C" }
val cd = mini.declarations.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == "C" }
assertNotNull(cd)
assertNotNull(cd.doc)
assertTrue(cd.doc!!.raw.contains("Class C docs"))
assertTrue(cd.doc.raw.contains("Class C docs"))
// Bases captured as plain names for now
assertEquals(listOf("Base1", "Base2"), cd.bases)
}
@@ -162,10 +162,10 @@ class MiniAstTest {
val (_, sink) = compileWithMini(code)
val mini = sink.build()
assertNotNull(mini)
val ed = mini!!.declarations.filterIsInstance<MiniEnumDecl>().firstOrNull { it.name == "E" }
val ed = mini.declarations.filterIsInstance<MiniEnumDecl>().firstOrNull { it.name == "E" }
assertNotNull(ed)
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("E", ed.name)
}
lynglib/src/commonTest/kotlin/net/sergeych/lyng/format/BlockReindentTest.kt
+2 -2
View File
@@ -39,7 +39,7 @@ class BlockReindentTest {
val open = BraceUtils.findMatchingOpenBrace(text, close)
assertNotNull(open)
// The char at open must be '{'
assertEquals('{', text[open!!])
assertEquals('{', text[open])
}
@Test
@@ -55,7 +55,7 @@ class BlockReindentTest {
val range = BraceUtils.findEnclosingBlockRange(text, close, includeTrailingNewline = true)
assertNotNull(range)
// The range must start at the line start of the matching '{' and end at or after the newline after '}'
val start = range!!.first
val start = range.first
val end = range.last + 1
val startLinePrefix = text.substring(BraceUtils.lineStart(text, start), start)
// start at column 0 of the line
lynglib/src/commonTest/kotlin/net/sergeych/lyng/highlight/CommentEolTest.kt
+2 -2
View File
@@ -34,7 +34,7 @@ class CommentEolTest {
assertTrue(cmt != null, "Expected a comment span")
// It should start at 0 and extend exactly to the end of the line (before \n)
val eol = text.indexOf('\n')
assertEquals(0, cmt!!.range.start, "Comment should start at column 0")
assertEquals(0, cmt.range.start, "Comment should start at column 0")
assertEquals(eol, cmt.range.endExclusive, "Comment should extend to EOL")
// Ensure there is no other span overlapping within the same line
spans.filter { it !== cmt }.forEach {
@@ -50,7 +50,7 @@ class CommentEolTest {
assertTrue(cmt != null, "Expected a block comment span")
// The comment should end right after "/* block */"
val expectedEnd = "/* block */".length
assertEquals(expectedEnd, cmt!!.range.endExclusive, "Block comment should not be extended to EOL")
assertEquals(expectedEnd, cmt.range.endExclusive, "Block comment should not be extended to EOL")
}
@Test