Merge pull request #38 from discipl/projectview-flintview

Projectview flintview
discipl · Nov 4, 2021 · fc94691 · fc94691
2 parents f57b638 + 16055c5
commit fc94691
Show file tree

Hide file tree

Showing 14 changed files with 1,516 additions and 40 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
       DISPLAY: :0
     strategy:
       matrix:
-        os: [ ubuntu-16.04, macos-latest, windows-latest ]
+        os: [ ubuntu-20.04, macos-latest, windows-latest ]
     name: Run Tests
     runs-on: ${{ matrix.os }}
     steps:
@@ -22,7 +22,7 @@ jobs:
       - name: Check java
         run: java --version
       - name: Setup xvfb (Linux)
-        if: ${{ matrix.os == 'ubuntu-16.04' }}
+        if: ${{ matrix.os == 'ubuntu-20.04' }}
         run: |
           sudo apt-get install -y xvfb
           sudo /usr/bin/Xvfb $DISPLAY -screen 0 1280x1024x24 &
@@ -33,7 +33,7 @@ jobs:
           arguments: --no-parallel initProject test
           gradle-version: wrapper
       - name: Tests failed
-        if: ${{ matrix.os == 'ubuntu-16.04' && failure() }}
+        if: ${{ matrix.os == 'ubuntu-20.04' && failure() }}
         run: sudo apt-get install lynx && if [ -f ./code/build/reports/html/junit-noframes.html ]; then lynx -dump ./code/build/reports/html/junit-noframes.html; fi && if [ -f ./code/java/FlintParser/build/reports/tests/test/index.html ]; then lynx -dump ./code/java/FlintParser/build/reports/tests/test/index.html; fi && if [ -f ./code/java/FlintParser/build/reports/tests/test/classes/org.discipl.flint.flintfiller.FlintFillerTest.html ]; then lynx -dump ./code/java/FlintParser/build/reports/tests/test/classes/org.discipl.flint.flintfiller.FlintFillerTest.html; fi
       - name: Upload Test Results
         if: ${{ always() }}

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     repositories {
         maven {
-            url = uri("https://projects.itemis.de/nexus/content/repositories/mbeddr")
+            url = uri("https://discplmirror.jfrog.io/artifactory/itemis")
         }
         mavenCentral()
     }
@@ -92,7 +92,8 @@ dependencies {
 
     artifact "com.mbeddr:platform:$mbeddr_version"
     mps("com.jetbrains:mps:$mps_version")
-    antLib("org.apache.ant:ant-junit:1.10.10")
+    // antLib("org.apache.ant:ant-junit:1.10.10")
+    antLib("org.apache.ant:ant-junit:1.10.12")
 
     mpsGenLib "org.openjfx:javafx-base:$javafx_version:$current_platform"
     mpsGenLib "org.openjfx:javafx-controls:$javafx_version:$current_platform"

diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml
@@ -12,6 +12,7 @@
       <modulePath path="$PROJECT_DIR$/solutions/Flint.plugin/Flint.plugin.msd" folder="" />
       <modulePath path="$PROJECT_DIR$/solutions/Flint.runtime/Flint.runtime.msd" folder="" />
       <modulePath path="$PROJECT_DIR$/solutions/Flint.test/Flint.test.msd" folder="" />
+      <modulePath path="$PROJECT_DIR$/solutions/FlintView.plugin/FlintView.plugin.msd" folder="" />
     </projectModules>
   </component>
 </project>
diff --git a/code/java/FlintSources/build.gradle b/code/java/FlintSources/build.gradle
@@ -19,7 +19,8 @@ dependencies {
     implementation 'org.apache.commons:commons-exec:1.3'
 
     implementation('org.apache.jena:jena-arq:4.0.0')
-    implementation 'org.jsoup:jsoup:1.13.1'
+    // implementation 'org.jsoup:jsoup:1.13.1'
+    implementation 'org.jsoup:jsoup:1.14.3'
     implementation "org.koin:koin-core:$koin_version"
 
     testImplementation 'ch.qos.logback:logback-core:1.2.3'

diff --git a/.../java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/VersionClientImpl.kt b/.../java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/VersionClientImpl.kt
@@ -77,8 +77,8 @@ class VersionClientImpl(private val queryExecutor: QueryExecutor) : VersionClien
     private fun getFullyMappedBWBVersion(mappedBWBVersion: MappedBWBVersion): FullyMappedBWBVersion {
         val document = Jsoup.parse(URI(mappedBWBVersion.wettenNl).toURL(), 10000)
         val firstArticleHeader = document.getElementsByClass("article__header--law article__header--main").first()
-        val firstParagraph = firstArticleHeader.getElementsByTag("p").first()
-        val name = firstParagraph.text().substringAfter("Geldend van ")
+        val firstParagraph = firstArticleHeader?.getElementsByTag("p")?.first()
+        val name = firstParagraph?.text()?.substringAfter("Geldend van ") ?: ""
         // TODO end date can be heden
         val endDate = name.substringAfter("t/m ").split("-").reversed().joinToString("-")
         return FullyMappedBWBVersion(mappedBWBVersion, name, endDate)

diff --git a/code/languages/Flint/models/Flint.editor.mps b/code/languages/Flint/models/Flint.editor.mps
@@ -1632,7 +1632,7 @@
       </node>
       <node concept="3EZMnI" id="7PeSHTFdOih" role="3EZMnx">
         <node concept="VPM3Z" id="7PeSHTFdOii" role="3F10Kt" />
-        <node concept="3F0ifn" id="7PeSHTFdOij" role="3EZMnx">
+        <node concept="3F0ifn" id="3K$qkvdNRvh" role="3EZMnx">
           <property role="3F0ifm" value="recipient:" />
         </node>
         <node concept="3F1sOY" id="5osFsyVsxj8" role="3EZMnx">

diff --git a/code/solutions/Flint.build0/models/Flint.build.mps b/code/solutions/Flint.build0/models/Flint.build.mps
@@ -1332,7 +1332,7 @@
       <node concept="aVJcg" id="7ua6Tt2QOlx" role="aVJcv">
         <node concept="NbPM2" id="7ua6Tt2QOlw" role="aVJcq">
           <node concept="3Mxwew" id="7ua6Tt2QOlv" role="3MwsjC">
-            <property role="3MwjfP" value="4" />
+            <property role="3MwjfP" value="5" />
           </node>
         </node>
       </node>
@@ -1574,15 +1574,15 @@
         <node concept="3_I8Xc" id="2vSShtzy63A" role="39821P">
           <ref role="3_I8Xa" to="ffeo:RJsmGEig2V" resolve="mps-vcs" />
         </node>
-        <node concept="3_I8Xc" id="2WP7dhE1es5" role="39821P">
-          <ref role="3_I8Xa" to="ffeo:4EdAnGErOtx" resolve="mps-core" />
-        </node>
-        <node concept="3_I8Xc" id="5BmlQlqgqJf" role="39821P">
-          <ref role="3_I8Xa" to="ffeo:6Hpa5co69Cc" resolve="mps-tooltips" />
+        <node concept="3ygNvl" id="62tb3AVhpiO" role="39821P">
+          <ref role="3ygNvj" to="ffeo:1diLdO26H7E" resolve="plugins" />
         </node>
         <node concept="3_I8Xc" id="2WP7dhE1es6" role="39821P">
           <ref role="3_I8Xa" to="ffeo:1x6h9EwqP32" resolve="mps-make" />
         </node>
+        <node concept="3_I8Xc" id="5BmlQlqgqJf" role="39821P">
+          <ref role="3_I8Xa" to="ffeo:6Hpa5co69Cc" resolve="mps-tooltips" />
+        </node>
         <node concept="3_I8Xc" id="2WP7dhE4YoL" role="39821P">
           <ref role="3_I8Xa" to="ffeo:5xhjlkpPhA8" resolve="mps-httpsupport" />
         </node>
@@ -1787,6 +1787,18 @@
       <node concept="m$_yC" id="2WP7dhE2AhK" role="m$_yJ">
         <ref role="m$_y1" to="ffeo:5xhjlkpPhJu" resolve="jetbrains.mps.ide.httpsupport" />
       </node>
+      <node concept="m$_yC" id="64SK4bcO2rW" role="m$_yJ">
+        <ref role="m$_y1" to="90a9:2Xjt3l57iTJ" resolve="de.slisson.mps.hacks" />
+      </node>
+      <node concept="m$_yC" id="64SK4bcO2rX" role="m$_yJ">
+        <ref role="m$_y1" to="ffeo:4k71ibbLe59" resolve="com.intellij.modules.mps" />
+      </node>
+      <node concept="m$_yC" id="64SK4bcOfpl" role="m$_yJ">
+        <ref role="m$_y1" to="90a9:4p3FRivDLPy" resolve="org.apache.commons" />
+      </node>
+      <node concept="m$_yC" id="2a4ndrb$61Y" role="m$_yJ">
+        <ref role="m$_y1" to="90a9:64SK4bcO2rO" resolve="com.mbeddr.mpsutil.projectview" />
+      </node>
       <node concept="3_J27D" id="2WP7dhE1err" role="m_cZH">
         <node concept="3Mxwew" id="2WP7dhE1ers" role="3MwsjC">
           <property role="3MwjfP" value="Flint" />
@@ -2086,16 +2098,6 @@
             <ref role="3bR37D" to="90a9:64TsoMQT2qP" resolve="de.slisson.mps.hacks.editor" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6LSqBjYO77j" role="3bR37C">
-          <node concept="3bR9La" id="6LSqBjYO77k" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6L4X" resolve="jetbrains.mps.lang.editor" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="45WVu5_hmMv" role="3bR37C">
-          <node concept="3bR9La" id="45WVu5_hmMw" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:MUKpduCMlF" resolve="de.slisson.mps.richtext.customcell" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtA" id="QLMwktTkqF" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -2270,11 +2272,6 @@
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6LSqBjYO77V" role="3bR37C">
-          <node concept="3bR9La" id="6LSqBjYO77W" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:6Y0V2RJk2ll" resolve="de.itemis.mps.selection.runtime" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtA" id="2eNuKY4JD2" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -3070,6 +3067,114 @@
           </node>
         </node>
       </node>
+      <node concept="1E1JtA" id="2FAQ6X3GqIP" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="FlintView.plugin" />
+        <property role="3LESm3" value="e9baa0f1-ee41-4d97-925b-f64dd0d5904f" />
+        <node concept="55IIr" id="2FAQ6X3GqIS" role="3LF7KH">
+          <node concept="2Ry0Ak" id="2FAQ6X3Grfq" role="iGT6I">
+            <property role="2Ry0Am" value="solutions" />
+            <node concept="2Ry0Ak" id="2FAQ6X3GrCD" role="2Ry0An">
+              <property role="2Ry0Am" value="FlintView.plugin" />
+              <node concept="2Ry0Ak" id="2FAQ6X3Gs1S" role="2Ry0An">
+                <property role="2Ry0Am" value="FlintView.plugin.msd" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2FAQ6X3Gsto" role="3bR37C">
+          <node concept="3bR9La" id="2FAQ6X3Gstp" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2FAQ6X3Gstq" role="3bR37C">
+          <node concept="3bR9La" id="2FAQ6X3Gstr" role="1SiIV1">
+            <ref role="3bR37D" node="2WP7dhE1eri" resolve="Flint" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2FAQ6X3Gsts" role="3bR37C">
+          <node concept="3bR9La" id="2FAQ6X3Gstt" role="1SiIV1">
+            <ref role="3bR37D" to="90a9:3jVbLyZDuHs" resolve="com.mbeddr.mpsutil.projectview.views" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2FAQ6X3Gstu" role="3bR37C">
+          <node concept="3bR9La" id="2FAQ6X3Gstv" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2FAQ6X3Gstw" role="3bR37C">
+          <node concept="3bR9La" id="2FAQ6X3Gstx" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2FAQ6X3Gsty" role="3bR37C">
+          <node concept="3bR9La" id="2FAQ6X3Gstz" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2FAQ6X3Gst$" role="3bR37C">
+          <node concept="3bR9La" id="2FAQ6X3Gst_" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2FAQ6X3GstA" role="3bR37C">
+          <node concept="3bR9La" id="2FAQ6X3GstB" role="1SiIV1">
+            <ref role="3bR37D" to="90a9:PE3B26QCrP" resolve="org.apache.commons" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2FAQ6X3GstC" role="3bR37C">
+          <node concept="3bR9La" id="2FAQ6X3GstD" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:2eDSGe9d1q1" resolve="MPS.Workbench" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2FAQ6X3GstE" role="3bR37C">
+          <node concept="3bR9La" id="2FAQ6X3GstF" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2FAQ6X3GstG" role="3bR37C">
+          <node concept="3bR9La" id="2FAQ6X3GstH" role="1SiIV1">
+            <ref role="3bR37D" to="90a9:FniR$Cj0b1" resolve="com.mbeddr.mpsutil.projectview.runtime" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="2FAQ6X3GstZ" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="2FAQ6X3Gsu0" role="1HemKq">
+            <node concept="398BVA" id="2FAQ6X3GstI" role="3LXTmr">
+              <ref role="398BVh" node="6rq68Pz$0RZ" resolve="project_home" />
+              <node concept="2Ry0Ak" id="2FAQ6X3GstJ" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="2FAQ6X3GstK" role="2Ry0An">
+                  <property role="2Ry0Am" value="FlintView.plugin" />
+                  <node concept="2Ry0Ak" id="2FAQ6X3GstL" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="2FAQ6X3Gsu1" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="2FAQ6X3GsG6" role="3bR31x">
+          <node concept="3LXTmp" id="2FAQ6X3GsG7" role="3rtmxm">
+            <node concept="55IIr" id="2FAQ6X3GsG8" role="3LXTmr">
+              <node concept="2Ry0Ak" id="2FAQ6X3GsG9" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="2FAQ6X3GsGa" role="2Ry0An">
+                  <property role="2Ry0Am" value="FlintView.plugin" />
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="2FAQ6X3GsGc" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="m$_wf" id="6rq68PztqEB" role="3989C9">
       <property role="m$_wk" value="FlintTestPlugin" />