1.0.0-SNAPSHOT

Author: cyaffle

pom.xml

@@ -13,21 +13,29 @@
     <description>Editor for Panda Language</description>
     <url>http://panda-lang.org/</url>
 
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
     <dependencies>
         <dependency>
             <groupId>org.panda_lang</groupId>
             <artifactId>panda</artifactId>
             <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
+    <repositories>
+        <repository>
+            <id>sonatype.org</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/org/panda_lang/editor/Editor.java

@@ -20,21 +20,20 @@ public void start(Stage stage) throws Exception {
         instance = this;
 
         Rectangle2D bounds = Screen.getPrimary().getVisualBounds();
+        Initializer.init();
 
         Parent root = FXMLLoader.load(getClass().getResource("/fxml/interface.fxml"));
+        Scene scene = new Scene(root, bounds.getWidth() * 0.6, bounds.getHeight() * 0.5);
         //root.getStylesheets().add("/css/dark.css");
-        Scene scene = new Scene(root, bounds.getWidth(), bounds.getHeight());
 
-        stage.setX(bounds.getMinX());
-        stage.setY(bounds.getMinY());
-        stage.setWidth(bounds.getWidth());
-        stage.setHeight(bounds.getHeight());
+        stage.setWidth(bounds.getWidth() * 0.7);
+        stage.setHeight(bounds.getHeight() * 0.6);
+        stage.setX((bounds.getWidth() - stage.getWidth()) / 2);
+        stage.setY((bounds.getHeight() - stage.getHeight()) / 2);
 
         stage.setTitle("Panda Editor");
         stage.setScene(scene);
 
-        stage.setMaximized(true);
-
         stage.show();
     }
 

src/main/java/org/panda_lang/editor/FilesTree.java renamed to src/main/java/org/panda_lang/editor/Explorer.java

@@ -10,14 +10,14 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class FilesTree {
+public class Explorer {
 
     private final TreeView<String> tree;
     private final Image defaultFileIcon;
     private final Image defaultFolderIcon;
     private final Map<TreeItem<String>, File> files;
 
-    public FilesTree(TreeView<String> tree) {
+    public Explorer(TreeView<String> tree) {
         this.tree = tree;
         this.files = new HashMap<>();
         this.defaultFileIcon = new Image(getClass().getResourceAsStream("/icons/defaultFileIcon.png"));

src/main/java/org/panda_lang/editor/Initializer.java

@@ -0,0 +1,21 @@
+package org.panda_lang.editor;
+
+import javafx.scene.web.WebView;
+import org.panda_lang.panda.util.IOUtils;
+
+public class Initializer {
+
+    public static void init() {
+        WebView wv = new WebView();
+        ResourcesBuilder resourcesBuilder = new ResourcesBuilder(Editor.class);
+        resourcesBuilder.importCss("/html/cm/codemirror.min.css");
+        resourcesBuilder.importCss("/html/cm/default.min.css");
+        resourcesBuilder.importCss("/html/cm/dracula.min.css");
+        resourcesBuilder.importScript("/html/cm/codemirror.min.js");
+        resourcesBuilder.importScript("/html/cm/clike.min.js");
+        String template = IOUtils.convertStreamToString(Editor.class.getResourceAsStream("/html/tab.html"))
+                .replace("${imports}", resourcesBuilder.toString());
+        wv.getEngine().loadContent(template);
+    }
+
+}

src/main/java/org/panda_lang/editor/Interface.java

@@ -1,15 +1,11 @@
 package org.panda_lang.editor;
 
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
 import javafx.scene.control.*;
-import javafx.scene.input.KeyEvent;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.FileChooser;
-import org.panda_lang.panda.util.IOUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,7 +20,7 @@ public class Interface implements Initializable {
     @FXML private TreeView<String> filesTree;
     @FXML private TabPane tabPane;
 
-    private FilesTree tree;
+    private Explorer tree;
 
     @Override
     public void initialize(URL url, ResourceBundle rb) {
@@ -46,7 +42,7 @@ public void initialize(URL url, ResourceBundle rb) {
         });
         menuFileExit.setOnAction(event -> System.exit(-1));
 
-        this.tree = new FilesTree(filesTree);
+        this.tree = new Explorer(filesTree);
         this.tree.open(new File("./"));
     }
 

src/main/java/org/panda_lang/editor/ResourcesBuilder.java

@@ -0,0 +1,30 @@
+package org.panda_lang.editor;
+
+public class ResourcesBuilder {
+
+    private final Class clazz;
+    private final StringBuilder stringBuilder;
+
+    public ResourcesBuilder(Class clazz) {
+        this.clazz = clazz;
+        this.stringBuilder = new StringBuilder();
+    }
+
+    public void importCss(String file) {
+        stringBuilder.append("<link rel=\"stylesheet\" href=\"");
+        stringBuilder.append(Editor.class.getResource(file).toExternalForm());
+        stringBuilder.append("\">");
+    }
+
+    public void importScript(String file) {
+        stringBuilder.append("<script src=\"");
+        stringBuilder.append(Editor.class.getResource(file).toExternalForm());
+        stringBuilder.append("\"></script>");
+    }
+
+    @Override
+    public String toString() {
+        return this.stringBuilder.toString();
+    }
+
+}

src/main/java/org/panda_lang/editor/TabInterface.java

@@ -1,16 +1,12 @@
 package org.panda_lang.editor;
 
-import javafx.concurrent.Worker;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
-import javafx.scene.control.TextArea;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCodeCombination;
 import javafx.scene.input.KeyCombination;
-import javafx.scene.input.KeyEvent;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import org.panda_lang.panda.util.IOUtils;
@@ -21,13 +17,27 @@
 
 public class TabInterface implements Initializable {
 
+    private static final String template;
+
     @FXML private Tab tab;
     @FXML private WebView webView;
 
     private String title;
     private WebEngine engine;
     private boolean changes;
 
+    static {
+        ResourcesBuilder resourcesBuilder = new ResourcesBuilder(Editor.class);
+        resourcesBuilder.importCss("/html/cm/codemirror.min.css");
+        resourcesBuilder.importCss("/html/cm/default.min.css");
+        resourcesBuilder.importCss("/html/cm/dracula.min.css");
+        resourcesBuilder.importScript("/html/cm/codemirror.min.js");
+        resourcesBuilder.importScript("/html/cm/clike.min.js");
+
+        template = IOUtils.convertStreamToString(Editor.class.getResourceAsStream("/html/tab.html"))
+                .replace("${imports}", resourcesBuilder.toString());
+    }
+
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         engine = webView.getEngine();
@@ -51,10 +61,8 @@ public void run(TabPane pane, File file) {
         content = content.replace("\n", "\\n");
         content = content.replace("\r", "\\n");
 
-        String url = getClass().getResource("/html/area.html").toExternalForm();
-
         // {initData}
-        engine.load(url);
+        engine.loadContent(template);
         webView.setUserData(file);
 
         // {tab.anem}
@@ -64,11 +72,12 @@ public void run(TabPane pane, File file) {
         // {add}
         pane.getTabs().add(tab);
         pane.getSelectionModel().select(tab);
+        int selected = pane.getSelectionModel().getSelectedIndex();
 
         // {accelerators}
         webView.getScene().getAccelerators().put(new KeyCodeCombination(KeyCode.S, KeyCombination.CONTROL_ANY), () -> {
             File f = (File) webView.getUserData();
-            IOUtils.overrideFile(f, (String) engine.executeScript("getSource();"));
+            IOUtils.overrideFile(f, (String) engine.executeScript("editor.getValue()"));
             tab.setText(title);
             changes = false;
         });
@@ -78,7 +87,9 @@ public void run(TabPane pane, File file) {
         engine.getLoadWorker().stateProperty().addListener((ov, oldState, newState) -> {
             switch (newState) {
                 case SUCCEEDED:
-                    engine.executeScript("editor.setValue('" + source + "');");
+                    if (!pane.getSelectionModel().isSelected(selected)) return;
+                    webView.setVisible(true);
+                    engine.executeScript("editor.setValue('" + source + "')");
                     break;
             }
         });