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

Fix wasm map usage and ignore annotation

Browse Source
This commit is contained in:
Sergey Chernov 2026-02-04 00:24:19 +03:00
parent ac2a734998
commit 6539b9deff
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt
View File

@ -364,13 +364,15 @@ class Compiler(
for (base in allBaseNames) { for (base in allBaseNames) {
val info = resolveCompileClassInfo(base) ?: continue val info = resolveCompileClassInfo(base) ?: continue
for ((name, id) in info.fieldIds) { for ((name, id) in info.fieldIds) {
val prev = fieldIds.putIfAbsent(name, id) val prev = fieldIds[name]
if (prev != null && prev != id) fieldConflicts.add(name) if (prev == null) fieldIds[name] = id
else if (prev != id) fieldConflicts.add(name)
if (id > maxFieldId) maxFieldId = id if (id > maxFieldId) maxFieldId = id
} }
for ((name, id) in info.methodIds) { for ((name, id) in info.methodIds) {
val prev = methodIds.putIfAbsent(name, id) val prev = methodIds[name]
if (prev != null && prev != id) methodConflicts.add(name) if (prev == null) methodIds[name] = id
else if (prev != id) methodConflicts.add(name)
if (id > maxMethodId) maxMethodId = id if (id > maxMethodId) maxMethodId = id
} }
} }

12
lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjClass.kt
View File

@ -428,14 +428,14 @@ open class ObjClass(
if (rec.type != ObjRecord.Type.Field && rec.type != ObjRecord.Type.ConstructorField) continue if (rec.type != ObjRecord.Type.Field && rec.type != ObjRecord.Type.ConstructorField) continue
if (rec.visibility == Visibility.Private) continue if (rec.visibility == Visibility.Private) continue
val id = rec.fieldId ?: cls.assignFieldId(name, rec) val id = rec.fieldId ?: cls.assignFieldId(name, rec)
result.putIfAbsent(name, id) if (!result.containsKey(name)) result[name] = id
} }
cls.classScope?.objects?.forEach { (name, rec) -> cls.classScope?.objects?.forEach { (name, rec) ->
if (rec.isAbstract) return@forEach if (rec.isAbstract) return@forEach
if (rec.type != ObjRecord.Type.Field && rec.type != ObjRecord.Type.ConstructorField) return@forEach if (rec.type != ObjRecord.Type.Field && rec.type != ObjRecord.Type.ConstructorField) return@forEach
if (rec.visibility == Visibility.Private) return@forEach if (rec.visibility == Visibility.Private) return@forEach
val id = rec.fieldId ?: cls.assignFieldId(name, rec) val id = rec.fieldId ?: cls.assignFieldId(name, rec)
result.putIfAbsent(name, id) if (!result.containsKey(name)) result[name] = id
} }
} }
return result return result
@ -451,7 +451,7 @@ open class ObjClass(
rec.type != ObjRecord.Type.Property && rec.type != ObjRecord.Type.Property &&
rec.type != ObjRecord.Type.Delegated) continue rec.type != ObjRecord.Type.Delegated) continue
val id = rec.methodId ?: cls.assignMethodId(name, rec) val id = rec.methodId ?: cls.assignMethodId(name, rec)
result.putIfAbsent(name, id) if (!result.containsKey(name)) result[name] = id
} }
cls.classScope?.objects?.forEach { (name, rec) -> cls.classScope?.objects?.forEach { (name, rec) ->
if (!includeAbstract && rec.isAbstract) return@forEach if (!includeAbstract && rec.isAbstract) return@forEach
@ -460,7 +460,7 @@ open class ObjClass(
rec.type != ObjRecord.Type.Property && rec.type != ObjRecord.Type.Property &&
rec.type != ObjRecord.Type.Delegated) return@forEach rec.type != ObjRecord.Type.Delegated) return@forEach
val id = rec.methodId ?: cls.assignMethodId(name, rec) val id = rec.methodId ?: cls.assignMethodId(name, rec)
result.putIfAbsent(name, id) if (!result.containsKey(name)) result[name] = id
} }
} }
return result return result
@ -497,7 +497,7 @@ open class ObjClass(
rec.type != ObjRecord.Type.Delegated rec.type != ObjRecord.Type.Delegated
) continue ) continue
val id = rec.methodId ?: cls.assignMethodId(name, rec) val id = rec.methodId ?: cls.assignMethodId(name, rec)
methodIdMap.putIfAbsent(name, id) if (!methodIdMap.containsKey(name)) methodIdMap[name] = id
if (id > maxId) maxId = id if (id > maxId) maxId = id
} }
cls.classScope?.objects?.forEach { (name, rec) -> cls.classScope?.objects?.forEach { (name, rec) ->
@ -506,7 +506,7 @@ open class ObjClass(
rec.type != ObjRecord.Type.Delegated rec.type != ObjRecord.Type.Delegated
) return@forEach ) return@forEach
val id = rec.methodId ?: cls.assignMethodId(name, rec) val id = rec.methodId ?: cls.assignMethodId(name, rec)
methodIdMap.putIfAbsent(name, id) if (!methodIdMap.containsKey(name)) methodIdMap[name] = id
if (id > maxId) maxId = id if (id > maxId) maxId = id
} }
} }

2
lynglib/src/commonTest/kotlin/net/sergeych/lyng/highlight/MapLiteralHighlightTest.kt
View File

@ -21,7 +21,7 @@ import kotlin.test.Ignore
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertTrue import kotlin.test.assertTrue
@Ignore("Highlight tests postponed until ScriptTest baseline is restored") @Ignore
class MapLiteralHighlightTest { class MapLiteralHighlightTest {
private fun spansToLabeled(text: String, spans: List<HighlightSpan>): List<Pair<String, HighlightKind>> = private fun spansToLabeled(text: String, spans: List<HighlightSpan>): List<Pair<String, HighlightKind>> =