Skip to content

Commit

Permalink
Merge pull request #17 from Workday/bugfixes
Browse files Browse the repository at this point in the history 
Misc UI related bugfixes
  • Loading branch information
@szabta89
szabta89 authored Apr 25, 2018
2 parents d816158 + 04eca5c commit 280f1b9
Show file tree
Hide file tree
Showing 30 changed files with 1,658 additions and 823 deletions.
120 changes: 91 additions & 29 deletions languages/com.workday.mps.review.lang/models/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
<import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
<import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
<import index="czez" ref="r:31cec7e7-dd44-4ba6-ae3f-ee48ddd83b42(com.workday.mps.review.store)" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
</imports>
<registry>
Expand Down Expand Up @@ -95,7 +96,10 @@
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
<child id="1068580123156" name="expression" index="3clFbG" />
</concept>
<concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
<concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
<child id="1068580123160" name="condition" index="3clFbw" />
<child id="1068580123161" name="ifTrue" index="3clFbx" />
</concept>
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
<child id="1068581517665" name="statement" index="3cqZAp" />
</concept>
Expand Down Expand Up @@ -123,6 +127,12 @@
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
<reference id="1107535924139" name="classifier" index="3uigEE" />
</concept>
<concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
<property id="6329021646629104958" name="text" index="3SKdUp" />
</concept>
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
<child id="6329021646629175155" name="commentPart" index="3SKWNk" />
</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">
Expand Down Expand Up @@ -182,37 +192,76 @@
</node>
</node>
</node>
<node concept="3clFbH" id="3okjBs8jG3B" role="3cqZAp" />
<node concept="3cpWs8" id="3okjBs8jFJR" role="3cqZAp">
<node concept="3cpWsn" id="3okjBs8jFJS" role="3cpWs9">
<property role="TrG5h" value="inlineCommentManager" />
<node concept="3cpWs8" id="4jyU69OmdJB" role="3cqZAp">
<node concept="3cpWsn" id="4jyU69OmdJC" role="3cpWs9">
<property role="TrG5h" value="plugin" />
<property role="3TUv4t" value="true" />
<node concept="3uibUv" id="3okjBs8jFJT" role="1tU5fm">
<ref role="3uigEE" to="ii13:3okjBs8glGa" resolve="InlineCommentManager" />
<node concept="3uibUv" id="4jyU69OmdJA" role="1tU5fm">
<ref role="3uigEE" to="ii13:168JFiagldf" resolve="ReviewPlugin" />
</node>
<node concept="2OqwBi" id="3okjBs8jFJU" role="33vP2m">
<node concept="2YIFZM" id="3okjBs8jFJV" role="2Oq$k0">
<ref role="37wK5l" to="ii13:3okjBs8jl9E" resolve="getPlugin" />
<ref role="1Pybhc" to="ii13:2DOSxD2O3Px" resolve="ReviewToolUtil" />
<node concept="37vLTw" id="3okjBs8jGfr" role="37wK5m">
<ref role="3cqZAo" node="3REobdwQF8J" resolve="ideaProject" />
</node>
<node concept="2YIFZM" id="4jyU69OmdJD" role="33vP2m">
<ref role="37wK5l" to="ii13:3okjBs8jl9E" resolve="getPlugin" />
<ref role="1Pybhc" to="ii13:2DOSxD2O3Px" resolve="ReviewToolUtil" />
<node concept="37vLTw" id="4jyU69OmdJE" role="37wK5m">
<ref role="3cqZAo" node="3REobdwQF8J" resolve="ideaProject" />
</node>
<node concept="liA8E" id="3okjBs8jFJX" role="2OqNvi">
<ref role="37wK5l" to="ii13:3okjBs8juuP" resolve="getInlineCommentManager" />
</node>
</node>
</node>
<node concept="3cpWs8" id="4jyU69Omf_3" role="3cqZAp">
<node concept="3cpWsn" id="4jyU69Omf_4" role="3cpWs9">
<property role="TrG5h" value="stire" />
<property role="3TUv4t" value="true" />
<node concept="3uibUv" id="4jyU69Omf$W" role="1tU5fm">
<ref role="3uigEE" to="czez:4Ew7qBDg_9q" resolve="SettingsStore" />
</node>
<node concept="2OqwBi" id="4jyU69Omf_5" role="33vP2m">
<node concept="37vLTw" id="4jyU69Omf_6" role="2Oq$k0">
<ref role="3cqZAo" node="4jyU69OmdJC" resolve="plugin" />
</node>
<node concept="liA8E" id="4jyU69Omf_7" role="2OqNvi">
<ref role="37wK5l" to="ii13:4jyU69Om7iC" resolve="getSettingsStore" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="3okjBs8jF$M" role="3cqZAp" />
<node concept="3cpWs6" id="3REobdwQGbP" role="3cqZAp">
<node concept="2OqwBi" id="3okjBs8jHDd" role="3cqZAk">
<node concept="37vLTw" id="3okjBs8jHnh" role="2Oq$k0">
<ref role="3cqZAo" node="3okjBs8jFJS" resolve="inlineCommentManager" />
<node concept="3clFbJ" id="4jyU69Omel1" role="3cqZAp">
<node concept="3clFbS" id="4jyU69Omel3" role="3clFbx">
<node concept="3cpWs8" id="3okjBs8jFJR" role="3cqZAp">
<node concept="3cpWsn" id="3okjBs8jFJS" role="3cpWs9">
<property role="TrG5h" value="manager" />
<property role="3TUv4t" value="true" />
<node concept="3uibUv" id="3okjBs8jFJT" role="1tU5fm">
<ref role="3uigEE" to="ii13:3okjBs8glGa" resolve="InlineCommentManager" />
</node>
<node concept="2OqwBi" id="3okjBs8jFJU" role="33vP2m">
<node concept="37vLTw" id="4jyU69OmdJF" role="2Oq$k0">
<ref role="3cqZAo" node="4jyU69OmdJC" resolve="plugin" />
</node>
<node concept="liA8E" id="3okjBs8jFJX" role="2OqNvi">
<ref role="37wK5l" to="ii13:3okjBs8juuP" resolve="getInlineCommentManager" />
</node>
</node>
</node>
</node>
<node concept="liA8E" id="3okjBs8jHVl" role="2OqNvi">
<ref role="37wK5l" to="ii13:3okjBs8gtUY" resolve="hasComment" />
<node concept="pncrf" id="3okjBs8jI8x" role="37wK5m" />
<node concept="3cpWs6" id="3REobdwQGbP" role="3cqZAp">
<node concept="2OqwBi" id="3okjBs8jHDd" role="3cqZAk">
<node concept="37vLTw" id="3okjBs8jHnh" role="2Oq$k0">
<ref role="3cqZAo" node="3okjBs8jFJS" resolve="manager" />
</node>
<node concept="liA8E" id="3okjBs8jHVl" role="2OqNvi">
<ref role="37wK5l" to="ii13:3okjBs8gtUY" resolve="hasComment" />
<node concept="pncrf" id="3okjBs8jI8x" role="37wK5m" />
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="4jyU69Omgba" role="3clFbw">
<node concept="37vLTw" id="4jyU69Omf_8" role="2Oq$k0">
<ref role="3cqZAo" node="4jyU69Omf_4" resolve="stire" />
</node>
<node concept="liA8E" id="4jyU69Omgys" role="2OqNvi">
<ref role="37wK5l" to="czez:4Ew7qBDgA00" resolve="getShowInlineComments" />
</node>
</node>
</node>
Expand All @@ -226,14 +275,19 @@
</node>
</node>
<node concept="3clFbS" id="6Xz2okKF8eF" role="TDEfX">
<node concept="3cpWs6" id="3REobdwQIiQ" role="3cqZAp">
<node concept="3clFbT" id="3REobdwQIBo" role="3cqZAk">
<property role="3clFbU" value="false" />
<node concept="3SKdUt" id="4jyU69OmhDP" role="3cqZAp">
<node concept="3SKdUq" id="4jyU69OmhDQ" role="3SKWNk">
<property role="3SKdUp" value="ignore" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs6" id="3REobdwQIiQ" role="3cqZAp">
<node concept="3clFbT" id="3REobdwQIBo" role="3cqZAk">
<property role="3clFbU" value="false" />
</node>
</node>
</node>
</node>
<node concept="3EZMnI" id="4TXYzdeTGA9" role="2wV5jI">
Expand Down Expand Up @@ -287,7 +341,6 @@
</node>
</node>
</node>
<node concept="3clFbH" id="3okjBs8j_yp" role="3cqZAp" />
<node concept="3cpWs8" id="3okjBs8jCER" role="3cqZAp">
<node concept="3cpWsn" id="3okjBs8jCES" role="3cpWs9">
<property role="TrG5h" value="inlineCommentManager" />
Expand All @@ -309,7 +362,6 @@
</node>
</node>
</node>
<node concept="3clFbH" id="3okjBs8jCWa" role="3cqZAp" />
<node concept="3cpWs8" id="3okjBs8mbaA" role="3cqZAp">
<node concept="3cpWsn" id="3okjBs8mbaB" role="3cpWs9">
<property role="TrG5h" value="inlineComponent" />
Expand Down Expand Up @@ -364,6 +416,16 @@
</node>
</node>
<node concept="3clFbS" id="3okjBs8klEd" role="TDEfX">
<node concept="3clFbF" id="4jyU69OkZrd" role="3cqZAp">
<node concept="2OqwBi" id="4jyU69OkZG2" role="3clFbG">
<node concept="37vLTw" id="4jyU69OkZrb" role="2Oq$k0">
<ref role="3cqZAo" node="3okjBs8klEb" resolve="t" />
</node>
<node concept="liA8E" id="4jyU69Ol0jv" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Throwable.printStackTrace():void" resolve="printStackTrace" />
</node>
</node>
</node>
<node concept="3cpWs6" id="3okjBs8kwaU" role="3cqZAp">
<node concept="2ShNRf" id="3okjBs8kwb6" role="3cqZAk">
<node concept="1pGfFk" id="3okjBs8kxBi" role="2ShVmc">
Expand Down
19 changes: 6 additions & 13 deletions solutions/com.workday.mps.flux/models/core/Dispatcher.mpsr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<model ref="r:76b35c96-0206-4f74-890e-e39504808bf8(com.workday.mps.flux.core)" content="root">
<persistence version="9" />
<imports>
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
<import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" implicit="true" />
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" implicit="true" />
</imports>
<registry>
Expand Down Expand Up @@ -71,6 +71,7 @@
</concept>
<concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
<concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
<child id="5680397130376446158" name="type" index="1tU5fm" />
</concept>
Expand Down Expand Up @@ -179,9 +180,7 @@
<property role="TrG5h" value="name" />
<property role="3TUv4t" value="true" />
<node concept="3Tm6S6" id="6j8xKyArRZC" role="1B3o_S" />
<node concept="3uibUv" id="pXx3scX2y0" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
</node>
<node concept="17QB3L" id="5ihn07CcGwd" role="1tU5fm" />
</node>
<node concept="312cEg" id="6j8xKyArtlZ" role="jymVt">
<property role="34CwA1" value="false" />
Expand Down Expand Up @@ -284,9 +283,7 @@
<node concept="37vLTG" id="6j8xKyArRBp" role="3clF46">
<property role="TrG5h" value="name" />
<property role="3TUv4t" value="true" />
<node concept="3uibUv" id="pXx3scX3n9" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
</node>
<node concept="17QB3L" id="5ihn07CcEBT" role="1tU5fm" />
</node>
<node concept="P$JXv" id="6j8xKyAsfAA" role="lGtFl">
<node concept="TZ5HA" id="6j8xKyAsfAB" role="TZ5H$">
Expand Down Expand Up @@ -331,9 +328,7 @@
<node concept="37vLTG" id="6j8xKyArRIh" role="3clF46">
<property role="TrG5h" value="name" />
<property role="3TUv4t" value="true" />
<node concept="3uibUv" id="pXx3scX3t6" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
</node>
<node concept="17QB3L" id="5ihn07CcEDU" role="1tU5fm" />
</node>
<node concept="37vLTG" id="6j8xKyArwJr" role="3clF46">
<property role="TrG5h" value="enableDebugLogging" />
Expand Down Expand Up @@ -738,9 +733,7 @@
</node>
</node>
<node concept="3Tm1VV" id="6j8xKyAs1BP" role="1B3o_S" />
<node concept="3uibUv" id="pXx3scX3$S" role="3clF45">
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
</node>
<node concept="17QB3L" id="5ihn07CcELA" role="3clF45" />
<node concept="2AHcQZ" id="6j8xKyAs3xY" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
Expand Down
3 changes: 2 additions & 1 deletion solutions/com.workday.mps.flux/models/core/Store.mpsr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
</concept>
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
<concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
<concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
</language>
<language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
<concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
Expand Down Expand Up @@ -150,7 +151,7 @@
<property role="eg7rD" value="false" />
<property role="TrG5h" value="dispatcher" />
<property role="3TUv4t" value="true" />
<node concept="3Tm6S6" id="4Ew7qBDhC9d" role="1B3o_S" />
<node concept="3Tmbuc" id="5ihn07CiCRp" role="1B3o_S" />
<node concept="3uibUv" id="4Ew7qBDhCA$" role="1tU5fm">
<ref role="3uigEE" node="3c3vDUkV4xB" resolve="Dispatcher" />
</node>
Expand Down
1 change: 1 addition & 0 deletions solutions/com.workday.mps.review/com.workday.mps.review.msd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:817e4e70-961e-4a95-98a1-15e9f32231f1:jetbrains.mps.ide.httpsupport" version="0" />
<language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
<language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
Expand Down
Loading

0 comments on commit 280f1b9

Please sign in to comment.