Tagging (#32)

* Tagging

* Added basics for tagging

* Added factreference references and added tagging to facts and duties

* Added square cell and switched to textpart for modelparser

* Added tag imports to model parser

* Added test for singletag and singleuntag

* Added test for group tag

* Added group untag and group untag test

* Made json import more testable

* Added docs on tagging

* Fixed highlighting issue

* Fixed failing test

* Removed duplicate code

* Added plugin updated docs

* Fixed act precondition editor layout

* Did some tagging work

* started work on linking with triply dataset

* Added triply sources

* Removed favorite view dependency

* Removed timeout for flintfiller

* Added docs and udated version to 0.5.3

* Added audit

* Fixed issues with test

* test/build pipeline changes

* Added jbr download

* Implemented node from text actions & intetentions

* Implemented adding artikel text to existing node

* Fixed issue with paramertierized range selection showing false error

* Implemented single multi tag / untag

* Implemented multi role GroupTag / GroupUnTag

* Fixed selection issues and fixed autofill

* Added multi tagging migration

* Migrated

* Fixed existing tests

* Added multitagging tests

* Bump

* Added caching

* Fixed test result artifact

* Updated Docs and Migrated Project

* Bumped flintfiller to v0.0.5

* Bumped versions to 0.5.4

* Added mpsTooltips plugin to ideBuild

* Added JBR to ide builds

* Removed unused color tag/role color boxes, fixed a bug with nodefromarticle selecting the wrong article

* Added cash to release.yml

* Removed os check from release.yml

Co-authored-by: Daron Brison <[email protected]>

.github/workflows/release.yml

@@ -8,6 +8,8 @@ on:
 
 jobs:
   build:
+    env:
+      DISPLAY: :0
     name: Create Release
     runs-on: ubuntu-latest
     steps:
@@ -18,22 +20,22 @@ jobs:
       - uses: actions/setup-java@v1
         with:
           java-version: 11
-      - name: Build Plugin
-        run: ./gradlew initProject buildFlintPlugin
-        env:
-          GRADLE_OPTS: -Dorg.gradle.daemon=false
-      - name: Build IDE
-        uses: GabrielBB/[email protected]
+      - name: Setup xvfb (Linux)
+        run: |
+          sudo apt-get install -y xvfb
+          sudo /usr/bin/Xvfb $DISPLAY -screen 0 1280x1024x24 &
+      - uses: burrunan/gradle-cache-action@v1
+        name: Build Plugin & IDE
         with:
-          run: ./gradlew buildFlintIde
-        env:
-          GRADLE_OPTS: -Dorg.gradle.daemon=false
+          job-id: jdk11
+          arguments: --no-parallel initProject buildFlintPlugin buildFlintIde
+          gradle-version: wrapper
       - name: Upload Test Results
-        if: ${{ failure() }}
+        if: ${{ always() }}
         uses: actions/upload-artifact@v2
         with:
-          name: test-results
-          path: code/java/FlintParser/build/reports/tests/test
+          name: test-results-${{ matrix.os }}
+          path: code/build/reports/html
       - name: Get Release Logs
         id: get_release_logs
         run: |

.github/workflows/test.yml

@@ -6,6 +6,8 @@ on:
 
 jobs:
   build:
+    env:
+      DISPLAY: :0
     strategy:
       matrix:
         os: [ ubuntu-16.04, macos-latest, windows-latest ]
@@ -19,12 +21,17 @@ jobs:
           java-version: 11
       - name: Check java
         run: java --version
-      - name: Test
-        uses: GabrielBB/xvfb-action@v1
+      - name: Setup xvfb (Linux)
+        if: ${{ matrix.os == 'ubuntu-16.04' }}
+        run: |
+          sudo apt-get install -y xvfb
+          sudo /usr/bin/Xvfb $DISPLAY -screen 0 1280x1024x24 &
+      - uses: burrunan/gradle-cache-action@v1
+        name: Test
         with:
-          run: ./gradlew initProject test
-        env:
-          GRADLE_OPTS: -Dorg.gradle.daemon=false
+          job-id: jdk11
+          arguments: --no-parallel initProject test
+          gradle-version: wrapper
       - name: Tests failed
         if: ${{ matrix.os == 'ubuntu-16.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
@@ -33,4 +40,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: test-results-${{ matrix.os }}
-          path: code/java/FlintParser/build/reports/tests/test
+          path: code/build/reports/html

.gitignore

@@ -100,3 +100,7 @@ node_modules
 
 .scripts/
 code/build-*.xml
+**.iml
+tests/reports
+.dockerignore
+.idea/jarRepositories.xml

README.md

@@ -23,13 +23,13 @@ MPS IDE, FlintPlugin and dependant plugins must be manually installed.
 To build the FlintIDE run `gradlew buildFlintPlugin`. This will generate a zip in `code/build/artifacts/FlintPluginDistribution/`.
 
 ### Install
-1. Download and install mps 2019.3.4 from [here](https://www.jetbrains.com/mps/download/previous.html)
-2. Download the [mbeddr platform distribution plugins zip](https://projects.itemis.de/nexus/content/repositories/mbeddr/com/mbeddr/platform/2019.3.22227.6f9f955/platform-2019.3.22227.6f9f955.zip)	
+1. Download and install mps 2020.3 from [here](https://www.jetbrains.com/mps/download/previous.html)
+2. Download the [mbeddr platform distribution plugins zip](https://projects.itemis.de/nexus/content/repositories/mbeddr/com/mbeddr/platform/2020.3.22810.b4ed033/platform-2020.3.22810.b4ed033.zip)	
 3. Extract the files and folders from the com.mbeddr.platform directory in mbeddr platform-distribution.zip file to the plugins folder in your mps installation.
-   - On linux  (`~/.MPS2019.3/config/plugins`)
-   - On macos  (`~/Library/Application Support/IntelliJIDEA60/`)
-   - On windows  (`C:\Users\%USER%\.MPS2019.3\config\plugins`)
-4. Extract the Flint plugin from Flint.zip to the plugins folder in your mps installation.
+   - On linux  (`~/.MPS2020.3/config/plugins`)
+   - On macos  (`~/Library/Application Support/MPS2020.3/` or `$MPS_HOME/plugins`)
+   - On windows  (`C:\Users\%USER%\.MPS2020.3\config\plugins`)
+4. To install or update your flint plugin follow [this guide](docs/PLUGIN_UPDATE_GUIDE.md). 
 
 ## Using Flint-mps
 A user guide is available [here](docs/USER_GUIDE.md)