Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/maintenance/MPS-2021.3' into mai…
Browse files Browse the repository at this point in the history 
…ntenance/MPS-2021.3
  • Loading branch information
@danielratiu
danielratiu committed Oct 4, 2023
2 parents 4409ea3 + a153d77 commit 620e7f9
Show file tree
Hide file tree
Showing 7 changed files with 688 additions and 528 deletions.
2 changes: 1 addition & 1 deletion code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.intentions.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@
</node>
</node>
<node concept="2YIFZM" id="5enppyYD8xa" role="2GsD0m">
<ref role="37wK5l" to="u41u:5enppyYCuMW" resolve="getProjectLanguagesNotPartOfArchitectureDescription" />
<ref role="37wK5l" to="u41u:5enppyYCuMW" resolve="getProjectModulesNotPartOfArchitectureDescription" />
<ref role="1Pybhc" to="u41u:5enppyYCuym" resolve="ArchitectureUtils" />
<node concept="37vLTw" id="5enppyYD8xb" role="37wK5m">
<ref role="3cqZAo" node="72dZnKNhsj6" resolve="project" />
Expand Down
2 changes: 1 addition & 1 deletion ...rg.mpsqa.deprecated.sandbox/models/org.mpsqa.deprecated.sandbox._010_deprecated_nodes.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<node concept="51Wdy" id="3dqUbgQqrOG">
<property role="TrG5h" value="_040_node with deprecated reference link" />
<property role="3GE5qa" value="examples" />
<ref role="51WiC" node="3dqUbgQnkTl" resolve="target-link-1" />
<ref role="51WiC" node="3dqUbgQnkTl" />
</node>
<node concept="5cojB" id="3dqUbgQsWGc">
<property role="3GE5qa" value="examples" />
Expand Down
7 changes: 0 additions & 7 deletions ...tions/org.mpsqa.lint.mps_lang.linters_library/org.mpsqa.lint.mps_lang.linters_library.msd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,15 @@
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:de1ad86d-6e50-4a02-b306-d4d17f64c375:jetbrains.mps.console.base" version="0" />
<language slang="l:f26691d2-0def-4c06-aec6-2cb90c4af0a4:jetbrains.mps.console.scripts" version="0" />
<language slang="l:73c1a490-99fa-4d0d-8292-b8985697c74b:jetbrains.mps.execution.common" version="0" />
<language slang="l:22e72e4c-0f69-46ce-8403-6750153aa615:jetbrains.mps.execution.configurations" version="2" />
<language slang="l:756e911c-3f1f-4a48-bdf5-a2ceb91b723c:jetbrains.mps.execution.settings" version="0" />
<language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
<language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:40ab19e9-751a-4433-b645-0e65160e58a0:org.mpsqa.lint.generic" version="0" />
Expand Down
36 changes: 18 additions & 18 deletions ...nerator/templates/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.generator.util.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1490,7 +1490,7 @@
<node concept="2ShNRf" id="4EqSY0IG7bH" role="3clFbG">
<node concept="1pGfFk" id="4EqSY0IG9zq" role="2ShVmc">
<property role="373rjd" value="true" />
<ref role="37wK5l" node="4EqSY0IG8TV" resolve="Pattern" />
<ref role="37wK5l" node="4EqSY0IG8TV" resolve="GithubCodeownersRepository.Pattern" />
<node concept="2OqwBi" id="4EqSY0IGffT" role="37wK5m">
<node concept="37vLTw" id="4EqSY0IGf5T" role="2Oq$k0">
<ref role="3cqZAo" node="4EqSY0IG6p_" resolve="text" />
Expand Down Expand Up @@ -1522,7 +1522,7 @@
</node>
<node concept="3Tm6S6" id="2KsA7NZmqd5" role="1B3o_S" />
<node concept="3uibUv" id="4EqSY0IG6eT" role="3clF45">
<ref role="3uigEE" node="4EqSY0IG42S" resolve="Pattern" />
<ref role="3uigEE" node="4EqSY0IG42S" resolve="GithubCodeownersRepository.Pattern" />
</node>
<node concept="37vLTG" id="4EqSY0IG6p_" role="3clF46">
<property role="TrG5h" value="text" />
Expand Down Expand Up @@ -1566,7 +1566,7 @@
</node>
</node>
<node concept="37vLTw" id="4EqSY0IGfSp" role="3clFbw">
<ref role="3cqZAo" node="4EqSY0IGeoo" resolve="rooted" />
<ref role="3cqZAo" node="4EqSY0IGeoo" resolve="anchoredToRoot" />
</node>
</node>
<node concept="3clFbH" id="4EqSY0IG5M2" role="3cqZAp" />
Expand Down Expand Up @@ -1663,7 +1663,7 @@
<property role="TrG5h" value="pattern" />
<property role="3TUv4t" value="true" />
<node concept="3uibUv" id="4EqSY0IGj35" role="1tU5fm">
<ref role="3uigEE" node="4EqSY0IG42S" resolve="Pattern" />
<ref role="3uigEE" node="4EqSY0IG42S" resolve="GithubCodeownersRepository.Pattern" />
</node>
<node concept="3Tm6S6" id="4EqSY0IGBXT" role="1B3o_S" />
</node>
Expand Down Expand Up @@ -1711,7 +1711,7 @@
<node concept="37vLTG" id="4EqSY0Hth_9" role="3clF46">
<property role="TrG5h" value="pattern" />
<node concept="3uibUv" id="4EqSY0IGhNZ" role="1tU5fm">
<ref role="3uigEE" node="4EqSY0IG42S" resolve="Pattern" />
<ref role="3uigEE" node="4EqSY0IG42S" resolve="GithubCodeownersRepository.Pattern" />
</node>
</node>
<node concept="37vLTG" id="4EqSY0Hth_m" role="3clF46">
Expand Down Expand Up @@ -1776,7 +1776,7 @@
<node concept="3Tm1VV" id="4EqSY0IvKAF" role="1B3o_S" />
<node concept="17QB3L" id="4EqSY0IvL8p" role="3clF45" />
<node concept="2AHcQZ" id="4EqSY0IvMJf" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" />
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
</node>
Expand All @@ -1787,7 +1787,7 @@
<node concept="3Tm6S6" id="2KsA7NZmv4u" role="1B3o_S" />
<node concept="_YKpA" id="4EqSY0HthTX" role="1tU5fm">
<node concept="3uibUv" id="4EqSY0HthV9" role="_ZDj9">
<ref role="3uigEE" node="4EqSY0Htg7$" resolve="Entry" />
<ref role="3uigEE" node="4EqSY0Htg7$" resolve="GithubCodeownersRepository.Entry" />
</node>
</node>
</node>
Expand All @@ -1814,7 +1814,7 @@
<property role="TrG5h" value="entries" />
<node concept="_YKpA" id="4EqSY0HvFo6" role="1tU5fm">
<node concept="3uibUv" id="4EqSY0HvFo7" role="_ZDj9">
<ref role="3uigEE" node="4EqSY0Htg7$" resolve="Entry" />
<ref role="3uigEE" node="4EqSY0Htg7$" resolve="GithubCodeownersRepository.Entry" />
</node>
</node>
</node>
Expand Down Expand Up @@ -1855,11 +1855,11 @@
<node concept="3cpWsn" id="4EqSY0Hy1SQ" role="3cpWs9">
<property role="TrG5h" value="matching" />
<node concept="3uibUv" id="4EqSY0Hy1IL" role="1tU5fm">
<ref role="3uigEE" node="4EqSY0Htg7$" resolve="Entry" />
<ref role="3uigEE" node="4EqSY0Htg7$" resolve="GithubCodeownersRepository.Entry" />
</node>
<node concept="2OqwBi" id="4EqSY0Hy1SR" role="33vP2m">
<node concept="37vLTw" id="4EqSY0Hy1SS" role="2Oq$k0">
<ref role="3cqZAo" node="4EqSY0HsPn2" resolve="reverseEntries" />
<ref role="3cqZAo" node="4EqSY0HsPn2" resolve="entries" />
</node>
<node concept="1zesIP" id="4EqSY0Hy1ST" role="2OqNvi">
<node concept="1bVj0M" id="4EqSY0Hy1SU" role="23t8la">
Expand Down Expand Up @@ -1950,13 +1950,13 @@
<property role="TrG5h" value="entries" />
<node concept="_YKpA" id="4EqSY0HwoWs" role="1tU5fm">
<node concept="3uibUv" id="4EqSY0HwpdL" role="_ZDj9">
<ref role="3uigEE" node="4EqSY0Htg7$" resolve="Entry" />
<ref role="3uigEE" node="4EqSY0Htg7$" resolve="GithubCodeownersRepository.Entry" />
</node>
</node>
<node concept="2ShNRf" id="4EqSY0Hwq1u" role="33vP2m">
<node concept="Tc6Ow" id="4EqSY0HwrB8" role="2ShVmc">
<node concept="3uibUv" id="4EqSY0HwrJX" role="HW$YZ">
<ref role="3uigEE" node="4EqSY0Htg7$" resolve="Entry" />
<ref role="3uigEE" node="4EqSY0Htg7$" resolve="GithubCodeownersRepository.Entry" />
</node>
</node>
</node>
Expand Down Expand Up @@ -2080,10 +2080,10 @@
<node concept="2ShNRf" id="4EqSY0HwvRc" role="25WWJ7">
<node concept="1pGfFk" id="4EqSY0HwwNf" role="2ShVmc">
<property role="373rjd" value="true" />
<ref role="37wK5l" node="4EqSY0Hth_2" resolve="Entry" />
<ref role="37wK5l" node="4EqSY0Hth_2" resolve="GithubCodeownersRepository.Entry" />
<node concept="2YIFZM" id="4EqSY0IGEGr" role="37wK5m">
<ref role="37wK5l" node="4EqSY0IG6fY" resolve="fromString" />
<ref role="1Pybhc" node="4EqSY0IG42S" resolve="Pattern" />
<ref role="1Pybhc" node="4EqSY0IG42S" resolve="GithubCodeownersRepository.Pattern" />
<node concept="AH0OO" id="4EqSY0IGJK9" role="37wK5m">
<node concept="3cmrfG" id="4EqSY0IGKiX" role="AHEQo">
<property role="3cmrfH" value="0" />
Expand Down Expand Up @@ -2149,7 +2149,7 @@
<node concept="2ShNRf" id="4EqSY0HwSsN" role="3cqZAk">
<node concept="1pGfFk" id="4EqSY0HwU8M" role="2ShVmc">
<property role="373rjd" value="true" />
<ref role="37wK5l" node="4EqSY0HvFo0" resolve="PathOwners" />
<ref role="37wK5l" node="4EqSY0HvFo0" resolve="GithubCodeownersRepository" />
<node concept="37vLTw" id="4EqSY0HwUpn" role="37wK5m">
<ref role="3cqZAo" node="4EqSY0HwoWz" resolve="entries" />
</node>
Expand Down Expand Up @@ -2446,7 +2446,7 @@
<node concept="3clFbH" id="2KsA7NZnLTO" role="3cqZAp" />
<node concept="3cpWs6" id="2KsA7NZnLTP" role="3cqZAp">
<node concept="1rXfSq" id="2KsA7NZnLTQ" role="3cqZAk">
<ref role="37wK5l" node="2KsA7NZnLTV" />
<ref role="37wK5l" node="2KsA7NZnLTV" resolve="toRepoRelativePath" />
<node concept="2YIFZM" id="2KsA7NZnLTR" role="37wK5m">
<ref role="1Pybhc" to="eoo2:~Paths" resolve="Paths" />
<ref role="37wK5l" to="eoo2:~Paths.get(java.lang.String,java.lang.String...)" resolve="get" />
Expand Down Expand Up @@ -2603,7 +2603,7 @@
</node>
</node>
<node concept="37vLTw" id="4EqSY0IU6TA" role="37vLTJ">
<ref role="3cqZAo" node="4EqSY0IU6Du" resolve="readFrom" />
<ref role="3cqZAo" node="4EqSY0IU6Du" resolve="pathOwners" />
</node>
</node>
</node>
Expand Down Expand Up @@ -2670,7 +2670,7 @@
<ref role="1Pybhc" to="eoo2:~Paths" resolve="Paths" />
<node concept="2OqwBi" id="2KsA7NZnV0T" role="37wK5m">
<node concept="37vLTw" id="2KsA7NZnV0Y" role="2Oq$k0">
<ref role="3cqZAo" node="2KsA7NZnV0W" resolve="repoRoot" />
<ref role="3cqZAo" node="2KsA7NZnV0W" resolve="file" />
</node>
<node concept="liA8E" id="2KsA7NZnV0V" role="2OqNvi">
<ref role="37wK5l" to="3ju5:~IFile.getPath()" resolve="getPath" />
Expand Down
Loading

0 comments on commit 620e7f9

Please sign in to comment.