Updated a bunch of stuff around the intellij plugin

jmeaster30 · Aug 5, 2024 · 0e2f45d · 0e2f45d
1 parent 9653075
commit 0e2f45d
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 31 deletions.
diff --git a/documentation/Hydro.md b/documentation/Hydro.md
@@ -12,7 +12,10 @@
    7. [Multi Byte Instruction Layout](#multi-byte-instruction-layout)
       1. [Push](#push)
       2. [Jump](#jump)
-      3. []
+      3. [Branch](#branch)
+      4. [AllocArray](#allocarray)
+      5. [AllocLayout](#alloclayout)
+      6. [LayoutIndex](#layoutindex)
 
 ## Instructions and What They Do
 

diff --git a/examples/hydro/fibonacci.h2o b/examples/hydro/fibonacci.h2o
@@ -30,5 +30,4 @@ main body
     call
     cast string
     push funcp std.io.print println
-    call
-    return
+    call
diff --git a/ocean-language-support/intellij/ocean/.run/Build Plugin.run.xml b/ocean-language-support/intellij/ocean/.run/Build Plugin.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Build Plugin" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ocean-language-support/intellij/ocean" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="build" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/ocean-language-support/intellij/ocean/.run/Clean Plugin.run.xml b/ocean-language-support/intellij/ocean/.run/Clean Plugin.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Clean Plugin" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ocean-language-support/intellij/ocean" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="clean" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/ocean-language-support/intellij/ocean/.run/Run IDE with Plugin.run.xml b/ocean-language-support/intellij/ocean/.run/Run IDE with Plugin.run.xml
diff --git a/ocean-language-support/intellij/ocean/.run/Run Plugin.run.xml b/ocean-language-support/intellij/ocean/.run/Run Plugin.run.xml
@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run Plugin" type="GradleRunConfiguration" factoryName="Gradle">
+    <log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ocean-language-support/intellij/ocean" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="runIde" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/ocean-language-support/intellij/ocean/build.gradle.kts b/ocean-language-support/intellij/ocean/build.gradle.kts
@@ -23,7 +23,7 @@ sourceSets {
 // Configure Gradle IntelliJ Plugin
 // Read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html
 intellij {
-  version.set("2023.3.2")
+  version.set("2022.2.5")
   type.set("IC") // Target IDE Platform
 
   plugins.set(listOf(/* Plugin Dependencies */))
@@ -55,7 +55,7 @@ tasks {
 
   patchPluginXml {
     sinceBuild.set("222")
-    untilBuild.set("233.*")
+    untilBuild.set("")
   }
 
   signPlugin {

diff --git a/ocean-language-support/intellij/ocean/gradlew b/ocean-language-support/intellij/ocean/gradlew
diff --git a/ocean-language-support/intellij/ocean/src/main/java/com/syrency/ocean/language/Hydro.flex b/ocean-language-support/intellij/ocean/src/main/java/com/syrency/ocean/language/Hydro.flex
@@ -22,7 +22,6 @@ import static com.syrency.ocean.language.psi.HydroTypes.*;
 %type IElementType
 %unicode
 
-EOL=\R
 WHITE_SPACE=\s+
 
 NUMBER=-?(([0-9]+)|([0-9]*\.[0-9]+))

diff --git a/...-language-support/intellij/ocean/src/main/java/com/syrency/ocean/language/HydroIcons.java b/...-language-support/intellij/ocean/src/main/java/com/syrency/ocean/language/HydroIcons.java
@@ -5,5 +5,5 @@
 import javax.swing.Icon;
 
 public class HydroIcons {
-    public static final Icon BASE = IconLoader.getIcon("/icons/hydro.svg");
+    public static final Icon BASE = IconLoader.getIcon("/icons/hydro.svg", HydroIcons.class);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,5 +30,4 @@ main body @@
         call
         cast string
         push funcp std.io.print println
-        call
-        return
+        call