Refactor TypecheckingService: move logic into Request

Straighten up the code organization by consolidating logic
implementing a request within the corresponding Request
instance.
This commit is contained in:
Fedor Isakov 2021-01-28 17:57:02 +01:00
parent ecf7eec55a
commit e06916b184
3 changed files with 2457 additions and 2458 deletions

View File

@ -393,14 +393,10 @@
<concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
<child id="1204796294226" name="closure" index="23t8la" />
</concept>
<concept id="1226516258405" name="jetbrains.mps.baseLanguage.collections.structure.HashSetCreator" flags="nn" index="2i4dXS" />
<concept id="1235573135402" name="jetbrains.mps.baseLanguage.collections.structure.SingletonSequenceCreator" flags="nn" index="2HTt$P">
<child id="1235573175711" name="elementType" index="2HTBi0" />
<child id="1235573187520" name="singletonValue" index="2HTEbv" />
</concept>
<concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
<child id="1237721435807" name="elementType" index="HW$YZ" />
</concept>
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
<concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
<child id="1205679832066" name="ascending" index="2S7zOq" />
@ -2834,19 +2830,7 @@
<ref role="3cqZAo" node="44XN1Jd6FWm" resolve="updatable" />
</node>
<node concept="liA8E" id="44XN1Jd6HUy" role="2OqNvi">
<ref role="37wK5l" to="tj24:44XN1Jd0LEF" resolve="update" />
<node concept="2ShNRf" id="3yEb0I3XyF_" role="37wK5m">
<node concept="2i4dXS" id="3yEb0I3XyZB" role="2ShVmc">
<node concept="3Tqbb2" id="3yEb0I3XzBT" role="HW$YZ" />
</node>
</node>
<node concept="2ShNRf" id="2yEnwshaWb4" role="37wK5m">
<node concept="2i4dXS" id="2yEnwshaXoy" role="2ShVmc">
<node concept="3uibUv" id="2yEnwshaYRK" role="HW$YZ">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
</node>
<ref role="37wK5l" to="tj24:5Qx6_65$vyG" resolve="update" />
<node concept="1bVj0M" id="6QH_LDtdXLP" role="37wK5m">
<node concept="3clFbS" id="6QH_LDtdXLQ" role="1bW5cS">
<node concept="3clFbH" id="6$gg4kAgPiE" role="3cqZAp" />

View File

@ -341,9 +341,6 @@
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
</concept>
<concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
<concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
<child id="3648723375513868575" name="repositoryArg" index="Vysub" />
</concept>
<concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@ -352,7 +349,6 @@
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
</concept>
<concept id="3648723375513868532" name="jetbrains.mps.lang.smodel.structure.NodePointer_ResolveOperation" flags="ng" index="Vyspw" />
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
</concept>
@ -430,7 +426,6 @@
<concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
<concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
<concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
<concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
<concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
<concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
<concept id="31378964227347002" name="jetbrains.mps.baseLanguage.collections.structure.SelectNotNullOperation" flags="ng" index="1KnU$U" />
@ -2520,6 +2515,26 @@
</node>
</node>
</node>
<node concept="3clFbJ" id="1RYTbd7GRQZ" role="3cqZAp">
<node concept="3clFbS" id="1RYTbd7GRR1" role="3clFbx">
<node concept="YS8fn" id="1RYTbd7GVqj" role="3cqZAp">
<node concept="2ShNRf" id="1RYTbd7GWP_" role="YScLw">
<node concept="1pGfFk" id="1RYTbd7GZ3Y" role="2ShVmc">
<ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
<node concept="Xl_RD" id="1RYTbd7H00P" role="37wK5m">
<property role="Xl_RC" value="invariant violation" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbC" id="1RYTbd7GTHg" role="3clFbw">
<node concept="10Nm6u" id="1RYTbd7GU_c" role="3uHU7w" />
<node concept="37vLTw" id="1RYTbd7GSLt" role="3uHU7B">
<ref role="3cqZAo" node="3VwM5b5$OSd" resolve="newSessionToken" />
</node>
</node>
</node>
</node>
<node concept="3clFbC" id="3VwM5b6fct$" role="3clFbw">
<node concept="10Nm6u" id="3VwM5b6fdm3" role="3uHU7w" />
@ -2708,12 +2723,12 @@
</node>
<node concept="3cpWs8" id="2EG5v$dFmTU" role="3cqZAp">
<node concept="3cpWsn" id="2EG5v$dFmTX" role="3cpWs9">
<property role="TrG5h" value="invalidNodes" />
<property role="TrG5h" value="invalidated" />
<node concept="3vKaQO" id="2EG5v$dFmTR" role="1tU5fm">
<node concept="3Tqbb2" id="2EG5v$dFo3T" role="3O5elw" />
<node concept="2sp9CU" id="1RYTbd8hrEg" role="3O5elw" />
</node>
<node concept="1rXfSq" id="2EG5v$dG07H" role="33vP2m">
<ref role="37wK5l" node="2EG5v$dDKbh" resolve="getInvalidatedNodes" />
<ref role="37wK5l" node="2EG5v$dDKbh" resolve="getInvalidated" />
<node concept="2OqwBi" id="6KCGZaSxuGM" role="37wK5m">
<node concept="37vLTw" id="6KCGZaSxtQH" role="2Oq$k0">
<ref role="3cqZAo" node="4J__M6Mw24" resolve="evaluationResult" />
@ -2774,7 +2789,7 @@
<node concept="liA8E" id="2EG5v$dFkOS" role="2OqNvi">
<ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
<node concept="37vLTw" id="2EG5v$dGPCg" role="37wK5m">
<ref role="3cqZAo" node="2EG5v$dFmTX" resolve="invalidNodes" />
<ref role="3cqZAo" node="2EG5v$dFmTX" resolve="invalidated" />
</node>
</node>
</node>
@ -2886,7 +2901,7 @@
</node>
<node concept="2tJIrI" id="2EG5v$dDC27" role="jymVt" />
<node concept="3clFb_" id="2EG5v$dDKbh" role="jymVt">
<property role="TrG5h" value="getInvalidatedNodes" />
<property role="TrG5h" value="getInvalidated" />
<node concept="3clFbS" id="2EG5v$dDKbk" role="3clF47">
<node concept="3cpWs8" id="2EG5v$dFx$H" role="3cqZAp">
<node concept="3cpWsn" id="2EG5v$dFx$K" role="3cpWs9">
@ -2981,32 +2996,8 @@
<node concept="3cpWs6" id="2EG5v$dE0Ey" role="3cqZAp">
<node concept="2OqwBi" id="2EG5v$dGi5x" role="3cqZAk">
<node concept="2OqwBi" id="2EG5v$dGe0Z" role="2Oq$k0">
<node concept="2OqwBi" id="2EG5v$dG1G9" role="2Oq$k0">
<node concept="37vLTw" id="2EG5v$dFNJn" role="2Oq$k0">
<ref role="3cqZAo" node="2EG5v$dFx$K" resolve="invalidOrigins" />
</node>
<node concept="3$u5V9" id="2EG5v$dG4f3" role="2OqNvi">
<node concept="1bVj0M" id="2EG5v$dG4f5" role="23t8la">
<node concept="3clFbS" id="2EG5v$dG4f6" role="1bW5cS">
<node concept="3clFbF" id="2EG5v$dG6mu" role="3cqZAp">
<node concept="2OqwBi" id="2EG5v$dG7xt" role="3clFbG">
<node concept="37vLTw" id="2EG5v$dG6mt" role="2Oq$k0">
<ref role="3cqZAo" node="2EG5v$dG4f7" resolve="it" />
</node>
<node concept="Vyspw" id="2EG5v$dG9I2" role="2OqNvi">
<node concept="37vLTw" id="2EG5v$dGbz9" role="Vysub">
<ref role="3cqZAo" node="443LGHBSt7P" resolve="repository" />
</node>
</node>
</node>
</node>
</node>
<node concept="Rh6nW" id="2EG5v$dG4f7" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="2EG5v$dG4f8" role="1tU5fm" />
</node>
</node>
</node>
<node concept="37vLTw" id="2EG5v$dFNJn" role="2Oq$k0">
<ref role="3cqZAo" node="2EG5v$dFx$K" resolve="invalidOrigins" />
</node>
<node concept="1KnU$U" id="2EG5v$dGfNn" role="2OqNvi" />
</node>
@ -3030,7 +3021,7 @@
</node>
</node>
<node concept="3vKaQO" id="2EG5v$dFtoQ" role="3clF45">
<node concept="3Tqbb2" id="2EG5v$dGnJi" role="3O5elw" />
<node concept="2sp9CU" id="1RYTbd8hoku" role="3O5elw" />
</node>
<node concept="P$JXv" id="2EG5v$dFT$I" role="lGtFl">
<node concept="TZ5HA" id="2EG5v$dFT$J" role="TZ5H$">