Fixed some source editor bugs

DrawableGui/src/main/java/org/openzen/drawablegui/swing/SwingRoot.java

@@ -83,7 +83,7 @@ public final class SwingRoot extends Component implements ComponentListener, Mou
 			component.setBounds(new DIRectangle(0, 0, getWidth(), getHeight()));
 		}
 		
-		long start = System.currentTimeMillis();
+		//long start = System.currentTimeMillis();
 		Rectangle clipBounds = g.getClipBounds();
 		DIRectangle clipBounds2 = clipBounds == null ? null : new DIRectangle(clipBounds.x, clipBounds.y, clipBounds.width, clipBounds.height);
 		Graphics2D g2d = (Graphics2D) g;
@@ -91,7 +91,7 @@ public final class SwingRoot extends Component implements ComponentListener, Mou
 		g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
 		surface.paint(g2d, clipBounds2);
 		
-		System.out.println("Paint in " + (System.currentTimeMillis() - start) + " ms, bounds: " + clipBounds.toString());
+		//System.out.println("Paint in " + (System.currentTimeMillis() - start) + " ms, bounds: " + clipBounds.toString());
 	}
 
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/editor/SourceEditor.java

@@ -745,6 +745,9 @@ public class SourceEditor implements DComponent {
 		public void onLineDeleted(int index) {
 			onLinesUpdated();
 			
+			if (index >= lineNumbers.size())
+				return;
+			
 			if (bounds != null) {
 				lineNumbers.remove(lineNumbers.size() - 1).close();
 				removeLineTokens(drawnTokens.remove(index));

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/editor/SourcePosition.java

@@ -18,6 +18,11 @@ public class SourcePosition {
 	private TokenModel.Position position;
 
 	public SourcePosition(TokenModel tokens, int line, int offset) {
+		if (line < 0)
+			throw new IllegalArgumentException("line cannot be negative");
+		if (offset < 0)
+			throw new IllegalArgumentException("offset cannot be negative");
+		
 		this.tokens = tokens;
 		this.line = line;
 		this.offset = offset;

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/editor/TokenLine.java

@@ -54,6 +54,16 @@ public final class TokenLine {
 		}
 		return indent.toString();
 	}
+	
+	/**
+	 * Adds a temporary token. This token must be relexed later using the relexer.
+	 * 
+	 * @param token 
+	 */
+	public void addTemporary(ZSToken token) {
+		tokens.add(token);
+		length += token.content.length();
+	}
 
 	public void add(ZSToken token) {
 		insert(tokens.size(), token);

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/editor/TokenModel.java

@@ -193,7 +193,7 @@ public class TokenModel {
 		if (!remainder.isEmpty())
 			getLine(fromT.line).insert(fromT.token, new ZSToken(ZSTokenType.INVALID, remainder));
 		
-		relex(fromT.line, Math.max(0, fromT.token - 1), fromT.line, fromT.token + 1);
+		relex(fromT.line, Math.max(0, fromT.token - 1), fromT.line, Math.min(lines.get(fromT.line).getTokenCount(), fromT.token + 1));
 	}
 	
 	public void insert(SourcePosition position, String value) {
@@ -201,7 +201,7 @@ public class TokenModel {
 		Position tokenPosition = position.asTokenPosition();
 		ZSToken token = getTokenAt(tokenPosition);
 		if (token == null) {
-			line.add(new ZSToken(ZSTokenType.INVALID, value));
+			line.addTemporary(new ZSToken(ZSTokenType.INVALID, value));
 		} else {
 			token = token.insert(tokenPosition.offset, value);
 			line.replace(tokenPosition.token, token);
@@ -336,6 +336,13 @@ public class TokenModel {
 		public final int offset;
 		
 		public Position(int line, int token, int offset) {
+			if (line < 0)
+				throw new IllegalArgumentException("line cannot be negative");
+			if (token < 0)
+				throw new IllegalArgumentException("token cannot be negative");
+			if (offset < 0)
+				throw new IllegalArgumentException("offset cannot be negative");
+			
 			this.line = line;
 			this.token = token;
 			this.offset = offset;