Skip to content

Commit

Permalink
rework editors based on Jos suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
coolya committed Sep 28, 2019
1 parent a1eec20 commit af68864
Show file tree
Hide file tree
Showing 7 changed files with 470 additions and 498 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Release to Github

on:
push:
branches:
- release

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Build with Gradle
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CI_COMMIT_SHA: $GITHUB_SHA
run: ./gradlew build
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### New in 0.3
* Support for MPS 2019.2
* Redesigned editors based on Jos suggestions

### New in 0.2
* Support for MPS 2018.2

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,4 @@ github {
}

build.dependsOn build_languages
//githubRelease.dependsOn build
githubRelease.dependsOn build

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,21 @@
<import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
</imports>
<registry>
<language id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml">
<concept id="6666499814681541919" name="jetbrains.mps.core.xml.structure.XmlTextValue" flags="ng" index="2pMdtt">
<property id="6666499814681541920" name="text" index="2pMdty" />
</concept>
<concept id="6666499814681415858" name="jetbrains.mps.core.xml.structure.XmlElement" flags="ng" index="2pNNFK">
<property id="6666499814681415862" name="tagName" index="2pNNFO" />
<child id="6666499814681415861" name="attributes" index="2pNNFR" />
<child id="1622293396948928802" name="content" index="3o6s8t" />
</concept>
<concept id="6666499814681447923" name="jetbrains.mps.core.xml.structure.XmlAttribute" flags="ng" index="2pNUuL">
<property id="6666499814681447926" name="attrName" index="2pNUuO" />
<child id="6666499814681541918" name="value" index="2pMdts" />
</concept>
<concept id="1622293396948952339" name="jetbrains.mps.core.xml.structure.XmlText" flags="nn" index="3o6iSG" />
</language>
<language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">
<concept id="5481553824944787378" name="jetbrains.mps.build.structure.BuildSourceProjectRelativePath" flags="ng" index="55IIr" />
<concept id="2755237150521975431" name="jetbrains.mps.build.structure.BuildVariableMacroInitWithString" flags="ng" index="aVJcg">
Expand Down Expand Up @@ -72,13 +87,20 @@
</concept>
</language>
<language id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps">
<concept id="7832771629084799699" name="jetbrains.mps.build.mps.structure.BuildMps_IdeaPluginVendor" flags="ng" index="2iUeEo">
<property id="7832771629084799702" name="name" index="2iUeEt" />
<property id="7832771629084799701" name="url" index="2iUeEu" />
</concept>
<concept id="6592112598314498932" name="jetbrains.mps.build.mps.structure.BuildMps_IdeaPlugin" flags="ng" index="m$_wf">
<property id="6592112598314498927" name="id" index="m$_wk" />
<child id="1359186315025500371" name="xml" index="20twgj" />
<child id="7832771629084912518" name="vendor" index="2iVFfd" />
<child id="6592112598314498931" name="version" index="m$_w8" />
<child id="6592112598314499050" name="content" index="m$_yh" />
<child id="6592112598314499028" name="dependencies" index="m$_yJ" />
<child id="6592112598314499021" name="name" index="m$_yQ" />
<child id="6592112598314855574" name="containerName" index="m_cZH" />
<child id="2172791612906637490" name="description" index="3s6cr7" />
</concept>
<concept id="6592112598314498926" name="jetbrains.mps.build.mps.structure.BuildMpsLayout_Plugin" flags="ng" index="m$_wl">
<reference id="6592112598314801433" name="plugin" index="m_rDy" />
Expand Down Expand Up @@ -115,7 +137,7 @@
</registry>
<node concept="1l3spW" id="fPAH2mYvQj">
<property role="2DA0ip" value="../../build/generated" />
<property role="TrG5h" value="de.itemis.mps.generator.editors" />
<property role="TrG5h" value="ws.logv.mps.generator.editors" />
<property role="turDy" value="build-all.xml" />
<node concept="55IIr" id="fPAH2mYvQk" role="auvoZ" />
<node concept="1l3spV" id="fPAH2mYvQl" role="1l3spN">
Expand Down Expand Up @@ -233,6 +255,11 @@
<ref role="3bR37D" node="fPAH2mYvZ2" resolve="ws.logv.mps.generator.editors" />
</node>
</node>
<node concept="1SiIV0" id="6ftRp$XgqRW" role="3bR37C">
<node concept="3bR9La" id="6ftRp$XgqRX" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
</node>
</node>
</node>
<node concept="1E1JtD" id="fPAH2mYvZ2" role="3989C9">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -292,6 +319,25 @@
<node concept="m$_yC" id="4MACRVwuJER" role="m$_yJ">
<ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />
</node>
<node concept="2pNNFK" id="6ftRp$XgqRM" role="20twgj">
<property role="2pNNFO" value="idea-version" />
<node concept="2pNUuL" id="6ftRp$XgqRS" role="2pNNFR">
<property role="2pNUuO" value="since-build" />
<node concept="2pMdtt" id="6ftRp$XgqRT" role="2pMdts">
<property role="2pMdty" value="192.1" />
</node>
</node>
<node concept="3o6iSG" id="6ftRp$XgqRO" role="3o6s8t" />
</node>
<node concept="2iUeEo" id="6ftRp$XgqSe" role="2iVFfd">
<property role="2iUeEt" value="Kolja Dummann" />
<property role="2iUeEu" value="https://logv.ws" />
</node>
<node concept="3_J27D" id="6ftRp$XgqSg" role="3s6cr7">
<node concept="3Mxwew" id="6ftRp$XgqSi" role="3MwsjC">
<property role="3MwjfP" value="A new projection for generator macros to make them more readable." />
</node>
</node>
</node>
<node concept="2sgV4H" id="fPAH2mYzoo" role="1l3spa">
<ref role="1l3spb" to="ffeo:3IKDaVZmzS6" resolve="mps" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
<import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
<import index="pmtf" ref="r:f7936663-dbe5-4690-bf1f-845021925960(de.itemis.mps.generator.editors.editor)" />
<import index="btn2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide.impl(MPS.IDEA/)" />
<import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
<import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
</imports>
Expand Down Expand Up @@ -79,6 +82,7 @@
<concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
<reference id="1144433057691" name="classifier" index="1PxDUh" />
</concept>
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
<concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
<child id="1165602531693" name="superclass" index="1zkMxy" />
Expand Down Expand Up @@ -138,6 +142,11 @@
<reference id="1107535924139" name="classifier" index="3uigEE" />
<child id="1109201940907" name="parameter" index="11_B2D" />
</concept>
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
</concept>
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
<child id="1178549979242" name="visibility" index="1B3o_S" />
</concept>
Expand All @@ -155,6 +164,12 @@
<language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
<concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
</language>
<language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
<concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
<property id="2034914114981261751" name="severity" index="RRSoG" />
<child id="2034914114981261753" name="message" index="RRSoy" />
</concept>
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
Expand Down Expand Up @@ -414,58 +429,73 @@
</node>
</node>
</node>
<node concept="3clFbF" id="3C$MSDkzsPa" role="3cqZAp">
<node concept="2OqwBi" id="3C$MSDkztgW" role="3clFbG">
<node concept="2YIFZM" id="3C$MSDkzt9n" role="2Oq$k0">
<ref role="1Pybhc" to="w1kc:~ModelAccess" resolve="ModelAccess" />
<ref role="37wK5l" to="w1kc:~ModelAccess.instance()" resolve="instance" />
<node concept="3cpWs8" id="6ftRp$XbRjt" role="3cqZAp">
<node concept="3cpWsn" id="6ftRp$XbRju" role="3cpWs9">
<property role="TrG5h" value="modelAccess" />
<node concept="3uibUv" id="6ftRp$XbPZK" role="1tU5fm">
<ref role="3uigEE" to="lui2:~ModelAccess" resolve="ModelAccess" />
</node>
<node concept="2YIFZM" id="6ftRp$XbRjv" role="33vP2m">
<ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
<ref role="37wK5l" to="alof:~ProjectHelper.getModelAccess(com.intellij.openapi.project.Project)" resolve="getModelAccess" />
<node concept="37vLTw" id="6ftRp$XbRjw" role="37wK5m">
<ref role="3cqZAo" node="3C$MSDk$deF" resolve="project" />
</node>
</node>
<node concept="liA8E" id="3C$MSDkztWZ" role="2OqNvi">
<ref role="37wK5l" to="w1kc:~ModelCommandExecutor.runReadAction(java.lang.Runnable)" resolve="runReadAction" />
<node concept="2ShNRf" id="3C$MSDkzu0o" role="37wK5m">
<node concept="YeOm9" id="3C$MSDkzBrM" role="2ShVmc">
<node concept="1Y3b0j" id="3C$MSDkzBrP" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
<ref role="1Y3XeK" to="wyt6:~Runnable" resolve="Runnable" />
<node concept="3Tm1VV" id="3C$MSDkzBrQ" role="1B3o_S" />
<node concept="3clFb_" id="3C$MSDkzBrR" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="run" />
<property role="DiZV1" value="false" />
<node concept="3Tm1VV" id="3C$MSDkzBrS" role="1B3o_S" />
<node concept="3cqZAl" id="3C$MSDkzBrU" role="3clF45" />
<node concept="3clFbS" id="3C$MSDkzBrV" role="3clF47">
<node concept="1DcWWT" id="3C$MSDkzno6" role="3cqZAp">
<node concept="2YIFZM" id="3C$MSDkzE3e" role="1DdaDG">
<ref role="37wK5l" to="7lvn:3TltS6fENwY" resolve="getAllEditorComponents" />
<ref role="1Pybhc" to="7lvn:3TltS6fENti" resolve="EditorComponentUtil" />
<node concept="2YIFZM" id="3C$MSDk$2oV" role="37wK5m">
<ref role="1Pybhc" to="iwsx:~FileEditorManager" resolve="FileEditorManager" />
<ref role="37wK5l" to="iwsx:~FileEditorManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
<node concept="37vLTw" id="3C$MSDk$d$I" role="37wK5m">
<ref role="3cqZAo" node="3C$MSDk$deF" resolve="project" />
</node>
</node>
<node concept="3clFbJ" id="6ftRp$XbTaK" role="3cqZAp">
<node concept="3clFbS" id="6ftRp$XbTaM" role="3clFbx">
<node concept="3clFbF" id="3C$MSDkzsPa" role="3cqZAp">
<node concept="2OqwBi" id="3C$MSDkztgW" role="3clFbG">
<node concept="liA8E" id="3C$MSDkztWZ" role="2OqNvi">
<ref role="37wK5l" to="lui2:~ModelAccess.runReadAction(java.lang.Runnable)" resolve="runReadAction" />
<node concept="2ShNRf" id="3C$MSDkzu0o" role="37wK5m">
<node concept="YeOm9" id="3C$MSDkzBrM" role="2ShVmc">
<node concept="1Y3b0j" id="3C$MSDkzBrP" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
<ref role="1Y3XeK" to="wyt6:~Runnable" resolve="Runnable" />
<node concept="3Tm1VV" id="3C$MSDkzBrQ" role="1B3o_S" />
<node concept="3clFb_" id="3C$MSDkzBrR" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="run" />
<property role="DiZV1" value="false" />
<node concept="3Tm1VV" id="3C$MSDkzBrS" role="1B3o_S" />
<node concept="3cqZAl" id="3C$MSDkzBrU" role="3clF45" />
<node concept="3clFbS" id="3C$MSDkzBrV" role="3clF47">
<node concept="1DcWWT" id="3C$MSDkzno6" role="3cqZAp">
<node concept="2YIFZM" id="3C$MSDkzE3e" role="1DdaDG">
<ref role="37wK5l" to="7lvn:3TltS6fENwY" resolve="getAllEditorComponents" />
<ref role="1Pybhc" to="7lvn:3TltS6fENti" resolve="EditorComponentUtil" />
<node concept="2YIFZM" id="3C$MSDk$2oV" role="37wK5m">
<ref role="1Pybhc" to="iwsx:~FileEditorManager" resolve="FileEditorManager" />
<ref role="37wK5l" to="iwsx:~FileEditorManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
<node concept="37vLTw" id="3C$MSDk$d$I" role="37wK5m">
<ref role="3cqZAo" node="3C$MSDk$deF" resolve="project" />
</node>
</node>
<node concept="3clFbT" id="3C$MSDkzE3j" role="37wK5m">
<property role="3clFbU" value="true" />
</node>
</node>
</node>
<node concept="3clFbT" id="3C$MSDkzE3j" role="37wK5m">
<property role="3clFbU" value="true" />
</node>
</node>
<node concept="3cpWsn" id="3C$MSDkznob" role="1Duv9x">
<property role="3TUv4t" value="false" />
<property role="TrG5h" value="component" />
<node concept="3uibUv" id="3C$MSDk$24B" role="1tU5fm">
<ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
</node>
</node>
<node concept="3clFbS" id="3C$MSDkzno8" role="2LFqv$">
<node concept="3clFbF" id="3C$MSDkzno9" role="3cqZAp">
<node concept="2OqwBi" id="3C$MSDkznDP" role="3clFbG">
<node concept="37vLTw" id="3C$MSDkznDO" role="2Oq$k0">
<ref role="3cqZAo" node="3C$MSDkznob" resolve="component" />
<node concept="3cpWsn" id="3C$MSDkznob" role="1Duv9x">
<property role="3TUv4t" value="false" />
<property role="TrG5h" value="component" />
<node concept="3uibUv" id="3C$MSDk$24B" role="1tU5fm">
<ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
</node>
<node concept="liA8E" id="3C$MSDkznDQ" role="2OqNvi">
<ref role="37wK5l" to="exr9:~EditorComponent.rebuildEditorContent()" resolve="rebuildEditorContent" />
</node>
<node concept="3clFbS" id="3C$MSDkzno8" role="2LFqv$">
<node concept="3clFbF" id="3C$MSDkzno9" role="3cqZAp">
<node concept="2OqwBi" id="3C$MSDkznDP" role="3clFbG">
<node concept="37vLTw" id="3C$MSDkznDO" role="2Oq$k0">
<ref role="3cqZAo" node="3C$MSDkznob" resolve="component" />
</node>
<node concept="liA8E" id="3C$MSDkznDQ" role="2OqNvi">
<ref role="37wK5l" to="exr9:~EditorComponent.rebuildEditorContent()" resolve="rebuildEditorContent" />
</node>
</node>
</node>
</node>
</node>
Expand All @@ -475,6 +505,25 @@
</node>
</node>
</node>
<node concept="37vLTw" id="6ftRp$XbRjx" role="2Oq$k0">
<ref role="3cqZAo" node="6ftRp$XbRju" resolve="modelAccess" />
</node>
</node>
</node>
</node>
<node concept="3y3z36" id="6ftRp$XbUeQ" role="3clFbw">
<node concept="10Nm6u" id="6ftRp$XbUff" role="3uHU7w" />
<node concept="37vLTw" id="6ftRp$XbTVz" role="3uHU7B">
<ref role="3cqZAo" node="6ftRp$XbRju" resolve="modelAccess" />
</node>
</node>
<node concept="9aQIb" id="6ftRp$XbVrQ" role="9aQIa">
<node concept="3clFbS" id="6ftRp$XbVrR" role="9aQI4">
<node concept="RRSsy" id="6ftRp$XbVJ6" role="3cqZAp">
<property role="RRSoG" value="gZ5fh_4/error" />
<node concept="Xl_RD" id="6ftRp$XbVJ8" role="RRSoy">
<property role="Xl_RC" value="can't get model access for project" />
</node>
</node>
</node>
</node>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
<dependency reexport="false">1efe7888-a4e7-4af3-9dab-f5bcc36b0199(ws.logv.mps.generator.editors)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="9" />
Expand Down

0 comments on commit af68864

Please sign in to comment.