Skip to content

Commit 1eecd98

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #371 from mbeddr/merge/master
Merge maintenance/MPS-2025.1 into master
2 parents bf4a89d + c6c0dd3 commit 1eecd98

File tree

17 files changed

+1797
-462
lines changed

17 files changed

+1797
-462
lines changed

‎build.gradle‎

Lines changed: 0 additions & 437 deletions
This file was deleted.

‎build.gradle.kts‎

Lines changed: 450 additions & 0 deletions
Large diffs are not rendered by default.

‎code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,9 @@
211211
<node concept="m$_yC" id="3PN66LDqBZ8" role="m$_yJ">
212212
<ref role="m$_y1" to="2tou:7C9PHv6FBIO" resolve="org.mpsqa.base" />
213213
</node>
214+
<node concept="m$_yC" id="22xRGj_xpyr" role="m$_yJ">
215+
<ref role="m$_y1" to="ffeo:4O0hKJpmtq1" resolve="jetbrains.mps.trove" />
216+
</node>
214217
<node concept="3_J27D" id="3PN66LDqBZ9" role="m_cZH">
215218
<node concept="3Mxwew" id="3PN66LDqBZl" role="3MwsjC">
216219
<property role="3MwjfP" value="org.mpsqa.mutant" />

‎code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,12 @@
211211
<node concept="m$_yC" id="1YSnQiVh0xn" role="m$_yJ">
212212
<ref role="m$_y1" to="2tou:7C9PHv6FBIO" resolve="org.mpsqa.base" />
213213
</node>
214+
<node concept="m$_yC" id="22xRGj_xpys" role="m$_yJ">
215+
<ref role="m$_y1" to="ffeo:6Hpa5co69BH" resolve="jetbrains.mps.editor.tooltips" />
216+
</node>
217+
<node concept="m$_yC" id="22xRGj_xujh" role="m$_yJ">
218+
<ref role="m$_y1" to="ffeo:4O0hKJpmtq1" resolve="jetbrains.mps.trove" />
219+
</node>
214220
<node concept="3_J27D" id="1YSnQiVh0xo" role="m_cZH">
215221
<node concept="3Mxwew" id="1YSnQiVh0xz" role="3MwsjC">
216222
<property role="3MwjfP" value="org.mpsqa.unused" />

‎code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,10 @@
249249
<node concept="m$_yC" id="7DAiGQdnG_C" role="m$_yJ">
250250
<ref role="m$_y1" to="ffeo:5HVSRHdVm9a" resolve="jetbrains.mps.build" />
251251
</node>
252-
<node concept="m$_yC" id="4UYQrPl1MZe" role="m$_yJ">
252+
<node concept="m$_yC" id="22xRGj_xpyE" role="m$_yJ">
253+
<ref role="m$_y1" to="ffeo:4O0hKJpmtq1" resolve="jetbrains.mps.trove" />
254+
</node>
255+
<node concept="m$_yC" id="22xRGj_xzB8" role="m$_yJ">
253256
<ref role="m$_y1" to="ffeo:6Hpa5co69BH" resolve="jetbrains.mps.editor.tooltips" />
254257
</node>
255258
</node>

‎code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._090_profile_build.mps‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,9 @@
228228
<node concept="m$_yC" id="6ueixcLDsQA" role="m$_yJ">
229229
<ref role="m$_y1" to="ffeo:4k71ibbLe59" resolve="com.intellij.modules.mps" />
230230
</node>
231+
<node concept="m$_yC" id="22xRGj_xEd9" role="m$_yJ">
232+
<ref role="m$_y1" to="ffeo:4O0hKJpmtq1" resolve="jetbrains.mps.trove" />
233+
</node>
231234
<node concept="3_J27D" id="6Z3QA_yyZNb" role="m_cZH">
232235
<node concept="3Mxwew" id="6Z3QA_yyZNm" role="3MwsjC">
233236
<property role="3MwjfP" value="org.mpsqa.profile" />

‎code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.meta.mps‎

Lines changed: 249 additions & 0 deletions
Large diffs are not rendered by default.

‎code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps‎

Lines changed: 182 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1867,6 +1867,165 @@
18671867
</node>
18681868
</node>
18691869
<node concept="3clFbS" id="3jiJ$OUE9Dt" role="3clFbx">
1870+
<node concept="3cpWs8" id="2Wh5DQ1xT1n" role="3cqZAp">
1871+
<node concept="3cpWsn" id="2Wh5DQ1xT1o" role="3cpWs9">
1872+
<property role="TrG5h" value="path1" />
1873+
<node concept="17QB3L" id="2Wh5DQ1xU$1" role="1tU5fm" />
1874+
<node concept="3cpWs3" id="2Wh5DQ1yRp1" role="33vP2m">
1875+
<node concept="Xl_RD" id="2Wh5DQ1yS$$" role="3uHU7B">
1876+
<property role="Xl_RC" value="PROJECT_DIR" />
1877+
</node>
1878+
<node concept="2OqwBi" id="2Wh5DQ1y67i" role="3uHU7w">
1879+
<node concept="2OqwBi" id="2Wh5DQ1y1qr" role="2Oq$k0">
1880+
<node concept="2GrUjf" id="2Wh5DQ1xT1p" role="2Oq$k0">
1881+
<ref role="2Gs0qQ" node="61xqYhG05ur" resolve="modelFile" />
1882+
</node>
1883+
<node concept="liA8E" id="2Wh5DQ1y4qy" role="2OqNvi">
1884+
<ref role="37wK5l" to="guwi:~File.getAbsolutePath()" resolve="getAbsolutePath" />
1885+
</node>
1886+
</node>
1887+
<node concept="liA8E" id="2Wh5DQ1y9yD" role="2OqNvi">
1888+
<ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
1889+
<node concept="2OqwBi" id="2Wh5DQ1yi40" role="37wK5m">
1890+
<node concept="2OqwBi" id="2Wh5DQ1ydpC" role="2Oq$k0">
1891+
<node concept="37vLTw" id="2Wh5DQ1ybb7" role="2Oq$k0">
1892+
<ref role="3cqZAo" node="3$9W3co3cMq" resolve="projectDir" />
1893+
</node>
1894+
<node concept="liA8E" id="2Wh5DQ1yfvC" role="2OqNvi">
1895+
<ref role="37wK5l" to="guwi:~File.getAbsolutePath()" resolve="getAbsolutePath" />
1896+
</node>
1897+
</node>
1898+
<node concept="liA8E" id="2Wh5DQ1yjCb" role="2OqNvi">
1899+
<ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
1900+
</node>
1901+
</node>
1902+
</node>
1903+
</node>
1904+
</node>
1905+
</node>
1906+
</node>
1907+
<node concept="3cpWs8" id="2Wh5DQ1yl7W" role="3cqZAp">
1908+
<node concept="3cpWsn" id="2Wh5DQ1yl7X" role="3cpWs9">
1909+
<property role="TrG5h" value="path2" />
1910+
<node concept="17QB3L" id="2Wh5DQ1yl7Y" role="1tU5fm" />
1911+
<node concept="3cpWs3" id="2Wh5DQ1yXSO" role="33vP2m">
1912+
<node concept="2OqwBi" id="2Wh5DQ1yl7Z" role="3uHU7w">
1913+
<node concept="2OqwBi" id="2Wh5DQ1yl80" role="2Oq$k0">
1914+
<node concept="liA8E" id="2Wh5DQ1yl82" role="2OqNvi">
1915+
<ref role="37wK5l" to="guwi:~File.getAbsolutePath()" resolve="getAbsolutePath" />
1916+
</node>
1917+
<node concept="3EllGN" id="2Wh5DQ1ynZo" role="2Oq$k0">
1918+
<node concept="37vLTw" id="2Wh5DQ1ynZp" role="3ElVtu">
1919+
<ref role="3cqZAo" node="3jiJ$OUEe4u" resolve="currentModelId" />
1920+
</node>
1921+
<node concept="37vLTw" id="2Wh5DQ1ynZq" role="3ElQJh">
1922+
<ref role="3cqZAo" node="3jiJ$OUBO$F" resolve="alreadyCollectedIDs2ModelFiles" />
1923+
</node>
1924+
</node>
1925+
</node>
1926+
<node concept="liA8E" id="2Wh5DQ1yl83" role="2OqNvi">
1927+
<ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
1928+
<node concept="2OqwBi" id="2Wh5DQ1yl84" role="37wK5m">
1929+
<node concept="2OqwBi" id="2Wh5DQ1yl85" role="2Oq$k0">
1930+
<node concept="37vLTw" id="2Wh5DQ1yl86" role="2Oq$k0">
1931+
<ref role="3cqZAo" node="3$9W3co3cMq" resolve="projectDir" />
1932+
</node>
1933+
<node concept="liA8E" id="2Wh5DQ1yl87" role="2OqNvi">
1934+
<ref role="37wK5l" to="guwi:~File.getAbsolutePath()" resolve="getAbsolutePath" />
1935+
</node>
1936+
</node>
1937+
<node concept="liA8E" id="2Wh5DQ1yl88" role="2OqNvi">
1938+
<ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
1939+
</node>
1940+
</node>
1941+
</node>
1942+
</node>
1943+
<node concept="Xl_RD" id="2Wh5DQ1yZ59" role="3uHU7B">
1944+
<property role="Xl_RC" value="PROJECT_DIR" />
1945+
</node>
1946+
</node>
1947+
</node>
1948+
</node>
1949+
<node concept="3clFbJ" id="4otXw3$lnXn" role="3cqZAp">
1950+
<node concept="3clFbS" id="4otXw3$lnXp" role="3clFbx">
1951+
<node concept="3SKdUt" id="4otXw3$m2Yh" role="3cqZAp">
1952+
<node concept="1PaTwC" id="4otXw3$m2Yi" role="1aUNEU">
1953+
<node concept="3oM_SD" id="4otXw3$m2Yj" role="1PaTwD">
1954+
<property role="3oM_SC" value="stable" />
1955+
</node>
1956+
<node concept="3oM_SD" id="4otXw3$m4I3" role="1PaTwD">
1957+
<property role="3oM_SC" value="linter" />
1958+
</node>
1959+
<node concept="3oM_SD" id="4otXw3$m4Mg" role="1PaTwD">
1960+
<property role="3oM_SC" value="message" />
1961+
</node>
1962+
<node concept="3oM_SD" id="4otXw3$m4RZ" role="1PaTwD">
1963+
<property role="3oM_SC" value="independent" />
1964+
</node>
1965+
<node concept="3oM_SD" id="4otXw3$m4WY" role="1PaTwD">
1966+
<property role="3oM_SC" value="on" />
1967+
</node>
1968+
<node concept="3oM_SD" id="4otXw3$m4Z0" role="1PaTwD">
1969+
<property role="3oM_SC" value="the" />
1970+
</node>
1971+
<node concept="3oM_SD" id="4otXw3$m51n" role="1PaTwD">
1972+
<property role="3oM_SC" value="directory" />
1973+
</node>
1974+
<node concept="3oM_SD" id="4otXw3$m5bz" role="1PaTwD">
1975+
<property role="3oM_SC" value="traversal" />
1976+
</node>
1977+
<node concept="3oM_SD" id="4otXw3$m5cV" role="1PaTwD">
1978+
<property role="3oM_SC" value="strategy" />
1979+
</node>
1980+
</node>
1981+
</node>
1982+
<node concept="3cpWs8" id="4otXw3$lBQ1" role="3cqZAp">
1983+
<node concept="3cpWsn" id="4otXw3$lBQ4" role="3cpWs9">
1984+
<property role="TrG5h" value="tmp" />
1985+
<node concept="17QB3L" id="4otXw3$lBPZ" role="1tU5fm" />
1986+
<node concept="37vLTw" id="4otXw3$lEGq" role="33vP2m">
1987+
<ref role="3cqZAo" node="2Wh5DQ1xT1o" resolve="path1" />
1988+
</node>
1989+
</node>
1990+
</node>
1991+
<node concept="3clFbF" id="4otXw3$lGXI" role="3cqZAp">
1992+
<node concept="37vLTI" id="4otXw3$lJcv" role="3clFbG">
1993+
<node concept="37vLTw" id="4otXw3$lL4f" role="37vLTx">
1994+
<ref role="3cqZAo" node="2Wh5DQ1yl7X" resolve="path2" />
1995+
</node>
1996+
<node concept="37vLTw" id="4otXw3$lGXG" role="37vLTJ">
1997+
<ref role="3cqZAo" node="2Wh5DQ1xT1o" resolve="path1" />
1998+
</node>
1999+
</node>
2000+
</node>
2001+
<node concept="3clFbF" id="4otXw3$lNUA" role="3cqZAp">
2002+
<node concept="37vLTI" id="4otXw3$lQ9z" role="3clFbG">
2003+
<node concept="37vLTw" id="4otXw3$lR3s" role="37vLTx">
2004+
<ref role="3cqZAo" node="4otXw3$lBQ4" resolve="tmp" />
2005+
</node>
2006+
<node concept="37vLTw" id="4otXw3$lNU$" role="37vLTJ">
2007+
<ref role="3cqZAo" node="2Wh5DQ1yl7X" resolve="path2" />
2008+
</node>
2009+
</node>
2010+
</node>
2011+
</node>
2012+
<node concept="3eOSWO" id="4otXw3$my4O" role="3clFbw">
2013+
<node concept="2OqwBi" id="4otXw3$lrEI" role="3uHU7B">
2014+
<node concept="37vLTw" id="4otXw3$lpzA" role="2Oq$k0">
2015+
<ref role="3cqZAo" node="2Wh5DQ1xT1o" resolve="path1" />
2016+
</node>
2017+
<node concept="liA8E" id="4otXw3$lw8$" role="2OqNvi">
2018+
<ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String)" resolve="compareTo" />
2019+
<node concept="37vLTw" id="4otXw3$lxCE" role="37wK5m">
2020+
<ref role="3cqZAo" node="2Wh5DQ1yl7X" resolve="path2" />
2021+
</node>
2022+
</node>
2023+
</node>
2024+
<node concept="3cmrfG" id="4otXw3$lAcX" role="3uHU7w">
2025+
<property role="3cmrfH" value="0" />
2026+
</node>
2027+
</node>
2028+
</node>
18702029
<node concept="3clFbF" id="3jiJ$OUDXw4" role="3cqZAp">
18712030
<node concept="2OqwBi" id="3jiJ$OUDXw5" role="3clFbG">
18722031
<node concept="37vLTw" id="3jiJ$OUDXw6" role="2Oq$k0">
@@ -1888,8 +2047,19 @@
18882047
<node concept="Xl_RD" id="3jiJ$OUDXwc" role="3uHU7B">
18892048
<property role="Xl_RC" value="Model from file '" />
18902049
</node>
1891-
<node concept="2GrUjf" id="61xqYhG0YAi" role="3uHU7w">
1892-
<ref role="2Gs0qQ" node="61xqYhG05ur" resolve="modelFile" />
2050+
<node concept="2OqwBi" id="1EJX3sM71SW" role="3uHU7w">
2051+
<node concept="37vLTw" id="2Wh5DQ1xT1q" role="2Oq$k0">
2052+
<ref role="3cqZAo" node="2Wh5DQ1xT1o" resolve="path1" />
2053+
</node>
2054+
<node concept="liA8E" id="1EJX3sM75YW" role="2OqNvi">
2055+
<ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
2056+
<node concept="Xl_RD" id="1EJX3sM77uW" role="37wK5m">
2057+
<property role="Xl_RC" value="\\\\" />
2058+
</node>
2059+
<node concept="Xl_RD" id="1EJX3sM7bbQ" role="37wK5m">
2060+
<property role="Xl_RC" value="/" />
2061+
</node>
2062+
</node>
18932063
</node>
18942064
</node>
18952065
<node concept="Xl_RD" id="3jiJ$OUDXwg" role="3uHU7w">
@@ -1901,18 +2071,19 @@
19012071
</node>
19022072
</node>
19032073
</node>
1904-
<node concept="2OqwBi" id="3jiJ$OUFZeC" role="3uHU7w">
1905-
<node concept="3EllGN" id="3jiJ$OUE_R8" role="2Oq$k0">
1906-
<node concept="37vLTw" id="3jiJ$OUEA1j" role="3ElVtu">
1907-
<ref role="3cqZAo" node="3jiJ$OUEe4u" resolve="currentModelId" />
2074+
<node concept="2OqwBi" id="1EJX3sM7eyJ" role="3uHU7w">
2075+
<node concept="37vLTw" id="2Wh5DQ1yqA1" role="2Oq$k0">
2076+
<ref role="3cqZAo" node="2Wh5DQ1yl7X" resolve="path2" />
2077+
</node>
2078+
<node concept="liA8E" id="1EJX3sM7g39" role="2OqNvi">
2079+
<ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
2080+
<node concept="Xl_RD" id="1EJX3sM7g3a" role="37wK5m">
2081+
<property role="Xl_RC" value="\\\\" />
19082082
</node>
1909-
<node concept="37vLTw" id="3jiJ$OUDXw9" role="3ElQJh">
1910-
<ref role="3cqZAo" node="3jiJ$OUBO$F" resolve="alreadyCollectedIDs2ModelFiles" />
2083+
<node concept="Xl_RD" id="1EJX3sM7g3b" role="37wK5m">
2084+
<property role="Xl_RC" value="/" />
19112085
</node>
19122086
</node>
1913-
<node concept="liA8E" id="61xqYhG1dpa" role="2OqNvi">
1914-
<ref role="37wK5l" to="guwi:~File.getAbsolutePath()" resolve="getAbsolutePath" />
1915-
</node>
19162087
</node>
19172088
</node>
19182089
</node>

0 commit comments

Comments
 (0)