Added cut/copy/paste support.

Constructor/libraries/stdlib/src/Arrays.zs

@@ -19,6 +19,7 @@ export expand <T> T[] {
 	
 	public get first as T?;
 	public get last as T?;
+	public get reversed as T[];
 	
 	public map<U>(projection as function(value as T) as U) as U[] {
 		val result as U[] = new U[](this.length);
@@ -79,6 +80,38 @@ export expand <T> T[] {
 		return true;
 	}
 	
+	public first(predicate as function(value as T) as bool) as T? {
+		for value in this
+			if predicate(value)
+				return value;
+		
+		return null;
+	}
+	
+	public first(predicate as function(i as int, value as T) as bool) as T? {
+		for i, value in this
+			if predicate(i, value)
+				return value;
+		
+		return null;
+	}
+	
+	public last(predicate as function(value as T) as bool) as T? {
+		for i, value in this.reversed
+			if predicate(value)
+				return value;
+		
+		return null;
+	}
+	
+	public last(predicate as function(value as T) as bool) as T? {
+		for i, value in this.reversed
+			if predicate(value)
+				return value
+		
+		return null;
+	}
+	
 	public count(predicate as function(value as T) as bool) as int {
 		var result = 0;
 		for value in this

DrawableGui/src/main/java/org/openzen/drawablegui/DClipboard.java

@@ -0,0 +1,16 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface DClipboard {
+	void copyAsString(String value);
+	
+	String getAsString();
+}

DrawableGui/src/main/java/org/openzen/drawablegui/DDrawingContext.java

@@ -22,6 +22,8 @@ public interface DDrawingContext {
 	
 	DTimerHandle setTimer(int millis, Runnable target);
 	
+	DClipboard getClipboard();
+	
 	DFontMetrics getFontMetrics(DFont font);
 	
 	enum Cursor {

DrawableGui/src/main/java/org/openzen/drawablegui/scroll/DScrollPane.java

@@ -7,6 +7,7 @@ package org.openzen.drawablegui.scroll;
 
 import org.openzen.drawablegui.DRectangle;
 import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DClipboard;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDimensionPreferences;
 import org.openzen.drawablegui.DDrawingContext;
@@ -254,6 +255,11 @@ public class DScrollPane implements DComponent {
 		public DTimerHandle setTimer(int millis, Runnable target) {
 			return context.setTimer(millis, target);
 		}
+
+		@Override
+		public DClipboard getClipboard() {
+			return context.getClipboard();
+		}
 	}
 	
 	private class ScrollListener implements LiveInt.Listener {

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

@@ -0,0 +1,46 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.swing;
+
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.IOException;
+import org.openzen.drawablegui.DClipboard;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class JavaClipboard implements DClipboard {
+	private final Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+
+	@Override
+	public void copyAsString(String value) {
+		StringSelection stringSelection = new StringSelection(value);
+		clipboard.setContents(stringSelection, null);
+	}
+
+	@Override
+	public String getAsString() {
+		Transferable contents = clipboard.getContents(null);
+		if (contents == null)
+			return null;
+		
+		if (!contents.isDataFlavorSupported(DataFlavor.stringFlavor))
+			return null;
+		
+		try {
+			return (String)contents.getTransferData(DataFlavor.stringFlavor);
+		} catch (UnsupportedFlavorException | IOException ex) {
+			ex.printStackTrace();
+			return null;
+		}
+	}
+}

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

@@ -10,6 +10,7 @@ import java.awt.Graphics;
 import java.awt.geom.GeneralPath;
 import java.util.WeakHashMap;
 import javax.swing.Timer;
+import org.openzen.drawablegui.DClipboard;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DDrawingContext;
@@ -26,6 +27,7 @@ public class SwingGraphicsContext implements DDrawingContext {
 	public final float scale;
 	private final WeakHashMap<DPath, GeneralPath> preparedPaths = new WeakHashMap<>();
 	private final SwingRoot root;
+	private final JavaClipboard clipboard = new JavaClipboard();
 	private Graphics graphics;
 	
 	public SwingGraphicsContext(float scale, SwingRoot root) {
@@ -110,6 +112,11 @@ public class SwingGraphicsContext implements DDrawingContext {
 		timer.start();
 		return () -> timer.stop();
 	}
+
+	@Override
+	public DClipboard getClipboard() {
+		return clipboard;
+	}
 	
 	private class PathTracer implements DPathTracer {
 		private final GeneralPath path;

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

@@ -314,12 +314,50 @@ public class SourceEditor implements DComponent {
 	
 	private void handleShortcut(DKeyEvent e) {
 		if (e.has(DKeyEvent.CTRL)) {
-			if (e.keyCode == KeyCode.S) {
-				save();
+			switch (e.keyCode) {
+				case S:
+					save();
+					break;
+				case C:
+					copy();
+					break;
+				case X:
+					cut();
+					break;
+				case V:
+					paste();
+					break;
 			}
 		}
 	}
 	
+	private void copy() {
+		String extract = tokens.extract(
+				SourcePosition.min(cursorStart, cursorEnd),
+				SourcePosition.max(cursorStart, cursorEnd));
+		context.getClipboard().copyAsString(extract);
+	}
+	
+	private void cut() {
+		copy();
+		tokens.delete(cursorStart, cursorEnd);
+		
+		SourcePosition cursor = SourcePosition.min(cursorStart, cursorEnd);
+		setCursor(cursor, cursor);
+	}
+	
+	private void paste() {
+		String text = context.getClipboard().getAsString();
+		if (text == null)
+			return;
+		
+		deleteSelection();
+		tokens.insert(cursorEnd, text);
+		
+		SourcePosition cursor = cursorEnd.advance(text.length());
+		setCursor(cursor, cursor);
+	}
+	
 	private void save() {
 		String content = tokens.toString();
 		sourceFile.update(content);
@@ -339,15 +377,26 @@ public class SourceEditor implements DComponent {
 		tokens.deleteCharacter(cursorEnd.line, cursorEnd.offset);
 	}
 	
-	private void backspace() {
-		if (!cursorEnd.equals(cursorStart)) {
+	private boolean hasSelection() {
+		return !cursorEnd.equals(cursorStart);
+	}
+	
+	private boolean deleteSelection() {
+		if (hasSelection()) {
 			SourcePosition min = SourcePosition.min(cursorStart, cursorEnd);
 			SourcePosition max = SourcePosition.max(cursorStart, cursorEnd);
-			tokens.delete(min.line, min.offset, max.line, max.offset);
+			tokens.delete(min, max);
 			setCursor(min, min);
-			return;
+			return true;
 		}
 		
+		return false;
+	}
+	
+	private void backspace() {
+		if (deleteSelection())
+			return;
+		
 		if (cursorEnd.offset == 0) {
 			if (cursorEnd.line == 0)
 				return;
@@ -370,14 +419,18 @@ public class SourceEditor implements DComponent {
 	}
 	
 	private void type(String value) {
-		tokens.insert(cursorEnd.line, cursorEnd.offset, value);
+		deleteSelection();
+		
+		tokens.insert(cursorEnd, value);
 		SourcePosition position = new SourcePosition(tokens, cursorEnd.line, cursorEnd.offset + value.length());
 		setCursor(position, position);
 	}
 	
 	private void newline() {
+		deleteSelection();
+		
 		String indent = tokens.getLine(cursorEnd.line).getIndent();
-		tokens.insert(cursorEnd.line, cursorEnd.offset, "\n" + indent);
+		tokens.insert(cursorEnd, "\n" + indent);
 		SourcePosition position = new SourcePosition(tokens, cursorEnd.line + 1, indent.length());
 		setCursor(position, position);
 	}

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

@@ -23,6 +23,26 @@ public class SourcePosition {
 		this.offset = offset;
 	}
 	
+	public SourcePosition advance(int characters) {
+		if (characters <= 0) {
+			throw new IllegalArgumentException("Characters must be >= 0");
+		} else if (characters == 0) {
+			return this;
+		} else {
+			int line = this.line;
+			int offset = this.offset;
+			while (offset + characters > tokens.getLineLength(line) && line < tokens.getLineCount() - 1) {
+				characters -= tokens.getLineLength(line) - offset + 1; // make sure to include the newline
+				offset = 0;
+				line++;
+			}
+			if (line >= tokens.getLineCount() -1)
+				return new SourcePosition(tokens, tokens.getLineCount() - 1, tokens.getLineLength(tokens.getLineCount() - 1));
+			
+			return new SourcePosition(tokens, line, offset + characters);
+		}
+	}
+	
 	public static SourcePosition min(SourcePosition a, SourcePosition b) {
 		if (a.line < b.line)
 			return a;

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

@@ -89,6 +89,55 @@ public class TokenModel {
 		return new Position(line, tokenLine.getTokenCount(), 0);
 	}
 	
+	public String extract(SourcePosition from, SourcePosition to) {
+		Position fromT = from.asTokenPosition();
+		Position toT = to.asTokenPosition();
+		if (from.line == to.line) {
+			StringBuilder result = new StringBuilder();
+			ZSToken fromToken = getTokenAt(fromT);
+			if (fromToken != null)
+				result.append(fromToken.getContent().substring(fromT.offset));
+			
+			TokenLine line = getLine(from.line);
+			for (int i = fromT.token + 1; i < toT.token; i++)
+				result.append(line.getToken(i).content);
+			
+			ZSToken toToken = getTokenAt(toT);
+			if (toToken != null)
+				result.append(toToken.content.substring(0, toT.offset));
+			
+			return result.toString();
+		} else {
+			StringBuilder result = new StringBuilder();
+			ZSToken fromToken = getTokenAt(fromT);
+			if (fromToken != null)
+				result.append(fromToken.getContent().substring(fromT.offset));
+			
+			TokenLine fromLine = getLine(from.line);
+			for (int i = fromT.token + 1; i < fromLine.getTokenCount(); i++)
+				result.append(fromLine.getToken(i).content);
+			
+			for (int i = fromT.line + 1; i < toT.line; i++) {
+				result.append("\n");
+				for (ZSToken t : fromLine.getTokens()) {
+					result.append(t.content);
+				}
+			}
+			
+			result.append("\n");
+			
+			TokenLine toLine = getLine(to.line);
+			for (int i = 0; i < toT.token; i++)
+				result.append(toLine.getToken(i).content);
+			
+			ZSToken toToken = getTokenAt(toT);
+			if (toToken != null)
+				result.append(toToken.content.substring(0, toT.offset));
+			
+			return result.toString();
+		}
+	}
+	
 	public void set(Iterator<ZSToken> tokens) {
 		lines.clear();
 		lines.add(new TokenLine());
@@ -127,48 +176,37 @@ public class TokenModel {
 		}
 	}
 	
-	public void delete(int fromLineIndex, int fromOffset, int toLineIndex, int toOffset) {
-		Position from = getPosition(fromLineIndex, fromOffset);
-		Position to = getPosition(toLineIndex, toOffset);
+	public void delete(SourcePosition from, SourcePosition to) {
+		Position fromT = from.asTokenPosition();
+		Position toT = to.asTokenPosition();
 		
-		ZSToken fromToken = getTokenAt(from);
-		ZSToken toToken = getTokenAt(to);
+		ZSToken fromToken = getTokenAt(fromT);
+		ZSToken toToken = getTokenAt(toT);
 		
 		String remainder = "";
 		if (fromToken != null)
-			remainder = fromToken.content.substring(0, from.offset);
-		if (toToken != null && to.offset > 0)
-			remainder += toToken.content.substring(to.offset);
+			remainder = fromToken.content.substring(0, fromT.offset);
+		if (toToken != null && toT.offset > 0)
+			remainder += toToken.content.substring(toT.offset);
 		
-		removeTokens(from.line, from.token, to.line, to.offset > 0 ? to.token + 1 : to.token);
-		if (!remainder.isEmpty()) {
-			getLine(from.line).insert(from.token, new ZSToken(ZSTokenType.INVALID, remainder));
-			relex(from.line, Math.max(0, from.token - 1), from.line, from.token + 1);
-		}
+		removeTokens(fromT.line, fromT.token, toT.line, toT.offset > 0 ? toT.token + 1 : toT.token);
+		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);
 	}
 	
-	public void insert(int lineIndex, int offset, String value) {
-		TokenLine line = lines.get(lineIndex);
-		int tokenOffset = 0;
-		for (int i = 0; i < line.getTokenCount(); i++) {
-			ZSToken token = line.getToken(i);
-			if (tokenOffset + token.content.length() > offset) {
-				token = token.insert(offset - tokenOffset, value);
-				line.replace(i, token);
-				relex(lineIndex, i, lineIndex, i + 1);
-				return;
-			}
-			tokenOffset += token.content.length();
-		}
-
-		ZSToken token = line.getLastToken();
+	public void insert(SourcePosition position, String value) {
+		TokenLine line = lines.get(position.line);
+		Position tokenPosition = position.asTokenPosition();
+		ZSToken token = getTokenAt(tokenPosition);
 		if (token == null) {
 			line.add(new ZSToken(ZSTokenType.INVALID, value));
 		} else {
-			token = new ZSToken(token.type, token.content + value);
-			line.replace(line.getTokenCount() - 1, token);
+			token = token.insert(tokenPosition.offset, value);
+			line.replace(tokenPosition.token, token);
 		}
-		relex(lineIndex, line.getTokenCount() - 1, lineIndex, line.getTokenCount());
+		relex(tokenPosition.line, Math.max(0, tokenPosition.token - 1), tokenPosition.line, tokenPosition.token + 1);
 	}
 	
 	private void relex(int fromLine, int fromToken, int toLine, int toToken) {