From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Mon, 16 Sep 2019 15:23:29 +0000 (+0200)
Subject: JsonHandler preserves line numbers
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=ad145f3c3d843239d273cee29683e32ba04eb0d2;p=Mograsim.git

JsonHandler preserves line numbers
---

diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
index 20491ce5..d2d6de31 100644
--- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
+++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
@@ -39,8 +39,13 @@ public class JsonHandler
 
 	public static <T> T fromJson(String src, Class<T> type)
 	{
-		// throw away legacy version line
-		String rawJson = src.lines().dropWhile(s -> s.length() == 0 || s.charAt(0) != '{').collect(Collectors.joining());
+		// throw away legacy version line, but keep line numbers
+		int linesBeforeJsonStart = (int) src.lines().takeWhile(s -> s.length() == 0 || s.charAt(0) != '{').count();
+		String rawJson;
+		if (linesBeforeJsonStart == 0)
+			rawJson = src;
+		else
+			rawJson = "\n".repeat(linesBeforeJsonStart) + src.lines().skip(linesBeforeJsonStart).collect(Collectors.joining("\n"));
 		return parser.fromJson(rawJson, type);
 	}