Merge remote-tracking branch 'origin/main'

Author: Traineratwot

src/components/CodeMirror.vue

@@ -65,17 +65,17 @@ const opt: hoverOptions = {
 						break
 					case "sd":
 						label = l.args[0].toString()
-						deviceId = label
+						deviceId = env.getAlias(label, true)
 						prop = l.args[1].toString()
 						break
 					case "ld":
 						label = l.args[1].toString()
-						deviceId = label
+						deviceId = env.getAlias(label, true)
 						prop = l.args[2].toString()
 						break
 				}
 				if (deviceId && prop) {
-					new_text = `${label}[${prop}] = ` + env.getDeviceProp(deviceId, prop)
+					new_text = `${label}[${prop}] = ` + env.getDeviceProp(deviceId.toString(), prop)
 				}
 			}
 		}

src/core/Env.ts

@@ -47,6 +47,13 @@ class Env extends DevEnv<{ update: () => void; update_code: () => void }> {
 					this.preAlias.set(l?.args[0]?.toString(), l?.args[1])
 				}
 			})
+		this.lines
+			.filter((l) => l?.fn === "define")
+			.forEach((l) => {
+				if (l?.args[0] && l?.args[1]) {
+					this.preAlias.set(l?.args[0]?.toString(), Number(l?.args[1]))
+				}
+			})
 		this.emit("update")
 	}