Skip to content

Commit 6fa25c1

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1627 from JetBrains/merge/master
Merge maintenance/mps20251 into master
2 parents c1746a4 + d0e5685 commit 6fa25c1

File tree

19 files changed

+9903
-102
lines changed

19 files changed

+9903
-102
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
1212

1313
## September 2025
1414

15+
### Added
16+
17+
- *de.slisson.mps.tables* Tables now support copying & pasting, cutting and deleting when multiple cells are selected with the mouse. Implement the extension point *TableCopyPaste* to support these features for a specific table.
18+
- *de.slisson.mps.tables* Two new intention are available for tables that implement the extension point *DataTransformation.* *It* allows to parse table data in textual form (comma- or tab-separated) and paste it into the table (e.g. 10 as a number literal).
19+
1520
### Fixed
1621

1722
- *de.itemis.mps.spellcheck* An exception coming from the WordsToDictionaryIntention was fixed.

‎build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,6 @@ tasks.register<Exec>("deployDocs") {
368368
commandLine("python3", "-", "mkdocs", "gh-deploy", "--clean", "-r", "gh-pages", "--force")
369369
}
370370

371-
defaultTasks("build_languages")
372371

373372
var releaseNotes: String? = null
374373
var releaseName: String? = null

‎code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4155,6 +4155,11 @@
41554155
<ref role="3bR37D" to="ffeo:rD7wKO6k$" resolve="MPS.Generator" />
41564156
</node>
41574157
</node>
4158+
<node concept="1SiIV0" id="1vOmbReDN0i" role="3bR37C">
4159+
<node concept="Rbm2T" id="1vOmbReDN0j" role="1SiIV1">
4160+
<ref role="1E1Vl2" to="ffeo:7Kfy9QB6L2F" resolve="jetbrains.mps.baseLanguage.tuples" />
4161+
</node>
4162+
</node>
41584163
</node>
41594164
</node>
41604165
<node concept="m$_wf" id="6Y0V2RJk3uw" role="3989C9">
@@ -18876,6 +18881,11 @@
1887618881
</node>
1887718882
</node>
1887818883
</node>
18884+
<node concept="1SiIV0" id="7NamNJXoLvU" role="3bR37C">
18885+
<node concept="3bR9La" id="7NamNJXoLvV" role="1SiIV1">
18886+
<ref role="3bR37D" to="ffeo:3MI1gu0QouH" resolve="jetbrains.mps.editor.runtime" />
18887+
</node>
18888+
</node>
1887918889
</node>
1888018890
<node concept="1E1JtA" id="2f7xPXzHwm6" role="2G$12L">
1888118891
<property role="BnDLt" value="true" />
@@ -19028,6 +19038,11 @@
1902819038
</node>
1902919039
</node>
1903019040
</node>
19041+
<node concept="1SiIV0" id="2P8zLSglyLQ" role="3bR37C">
19042+
<node concept="3bR9La" id="2P8zLSglyLR" role="1SiIV1">
19043+
<ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
19044+
</node>
19045+
</node>
1903119046
</node>
1903219047
</node>
1903319048
<node concept="2G$12M" id="2NyZxKpX5XT" role="3989C9">

‎code/compare/solutions/de.itemis.mps.comparator.diff.tests/models/[email protected]‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<model ref="r:7e1cdbc4-24e4-458b-b337-9e688e689139(de.itemis.mps.comparator.diff.tests.diffs@tests)">
2+
<model ref="r:7e1cdbc4-24e4-458b-b337-9e688e689139(com.mbeddr.demo.comparator.diff.tests.diffs@tests)">
33
<persistence version="9" />
4-
<attribute name="doNotGenerate" value="false" />
54
<languages>
65
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
76
<use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
@@ -16345,12 +16344,12 @@
1634516344
</node>
1634616345
</node>
1634716346
<node concept="3GXo0L" id="7IJcaFREGZc" role="3cqZAp">
16348-
<node concept="37vLTw" id="7IJcaFREGZd" role="3tpDZC">
16349-
<ref role="3cqZAo" node="7IJcaFREGYZ" resolve="cls" />
16350-
</node>
1635116347
<node concept="37vLTw" id="7IJcaFREGZe" role="3tpDZA">
1635216348
<ref role="3cqZAo" node="7IJcaFREIRW" resolve="cls2" />
1635316349
</node>
16350+
<node concept="37vLTw" id="7IJcaFREGZd" role="3tpDZC">
16351+
<ref role="3cqZAo" node="7IJcaFREGYZ" resolve="cls" />
16352+
</node>
1635416353
</node>
1635516354
</node>
1635616355
</node>

‎code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps‎

Lines changed: 228 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,234 @@
329329
<property role="15ShDY" value="Po4Z58IgB0/September" />
330330
<property role="15ShDw" value="2025" />
331331
</node>
332+
<node concept="15bAme" id="1vOmbReLlX0" role="15bAlL">
333+
<property role="15bAli" value="Po4Z58tnOE/added" />
334+
<node concept="2DRihI" id="1vOmbReLlX1" role="15bAlk">
335+
<node concept="15Ami3" id="1vOmbReLlX2" role="1PaTwD">
336+
<node concept="37shsh" id="1vOmbReLlX3" role="15Aodc">
337+
<node concept="1dCxOk" id="1vOmbReLlX8" role="37shsm">
338+
<property role="1XweGW" value="7e450f4e-1ac3-41ef-a851-4598161bdb94" />
339+
<property role="1XxBO9" value="de.slisson.mps.tables" />
340+
</node>
341+
</node>
342+
</node>
343+
<node concept="3oM_SD" id="1vOmbReLlXd" role="1PaTwD">
344+
<property role="3oM_SC" value="Tables" />
345+
</node>
346+
<node concept="3oM_SD" id="1vOmbReLlXe" role="1PaTwD">
347+
<property role="3oM_SC" value="now" />
348+
</node>
349+
<node concept="3oM_SD" id="1vOmbReLlXf" role="1PaTwD">
350+
<property role="3oM_SC" value="support" />
351+
</node>
352+
<node concept="3oM_SD" id="1vOmbReLlXg" role="1PaTwD">
353+
<property role="3oM_SC" value="copying" />
354+
</node>
355+
<node concept="3oM_SD" id="6hm_9jqmTl0" role="1PaTwD">
356+
<property role="3oM_SC" value="&amp;" />
357+
</node>
358+
<node concept="3oM_SD" id="6hm_9jqmTl1" role="1PaTwD">
359+
<property role="3oM_SC" value="pasting," />
360+
</node>
361+
<node concept="3oM_SD" id="1vOmbReLlXj" role="1PaTwD">
362+
<property role="3oM_SC" value="cutting" />
363+
</node>
364+
<node concept="3oM_SD" id="1vOmbReLlXk" role="1PaTwD">
365+
<property role="3oM_SC" value="and" />
366+
</node>
367+
<node concept="3oM_SD" id="1vOmbReLlXl" role="1PaTwD">
368+
<property role="3oM_SC" value="deleting" />
369+
</node>
370+
<node concept="3oM_SD" id="1vOmbReLlXm" role="1PaTwD">
371+
<property role="3oM_SC" value="when" />
372+
</node>
373+
<node concept="3oM_SD" id="1vOmbReLlXn" role="1PaTwD">
374+
<property role="3oM_SC" value="multiple" />
375+
</node>
376+
<node concept="3oM_SD" id="1vOmbReLlXo" role="1PaTwD">
377+
<property role="3oM_SC" value="cells" />
378+
</node>
379+
<node concept="3oM_SD" id="1vOmbReLlXp" role="1PaTwD">
380+
<property role="3oM_SC" value="are" />
381+
</node>
382+
<node concept="3oM_SD" id="1vOmbReLlXq" role="1PaTwD">
383+
<property role="3oM_SC" value="selected" />
384+
</node>
385+
<node concept="3oM_SD" id="1vOmbReLlXr" role="1PaTwD">
386+
<property role="3oM_SC" value="with" />
387+
</node>
388+
<node concept="3oM_SD" id="1vOmbReLlXs" role="1PaTwD">
389+
<property role="3oM_SC" value="the" />
390+
</node>
391+
<node concept="3oM_SD" id="1vOmbReLlXt" role="1PaTwD">
392+
<property role="3oM_SC" value="mouse." />
393+
</node>
394+
<node concept="3oM_SD" id="419sLI2Je7V" role="1PaTwD">
395+
<property role="3oM_SC" value="Implement" />
396+
</node>
397+
<node concept="3oM_SD" id="1vOmbReLlYZ" role="1PaTwD">
398+
<property role="3oM_SC" value="the" />
399+
</node>
400+
<node concept="3oM_SD" id="1vOmbReLlZ0" role="1PaTwD">
401+
<property role="3oM_SC" value="extension" />
402+
</node>
403+
<node concept="3oM_SD" id="1vOmbReLlZ1" role="1PaTwD">
404+
<property role="3oM_SC" value="point" />
405+
</node>
406+
<node concept="3oM_SD" id="1vOmbReLm0m" role="1PaTwD">
407+
<property role="3oM_SC" value="TableCopyPaste" />
408+
<property role="1X82VY" value="true" />
409+
</node>
410+
<node concept="3oM_SD" id="1vOmbReLm0p" role="1PaTwD">
411+
<property role="3oM_SC" value="to" />
412+
</node>
413+
<node concept="3oM_SD" id="1vOmbReLm0q" role="1PaTwD">
414+
<property role="3oM_SC" value="support" />
415+
</node>
416+
<node concept="3oM_SD" id="1vOmbReLm0r" role="1PaTwD">
417+
<property role="3oM_SC" value="these" />
418+
</node>
419+
<node concept="3oM_SD" id="1vOmbReLm0s" role="1PaTwD">
420+
<property role="3oM_SC" value="features" />
421+
</node>
422+
<node concept="3oM_SD" id="1vOmbReLm5l" role="1PaTwD">
423+
<property role="3oM_SC" value="for" />
424+
</node>
425+
<node concept="3oM_SD" id="1vOmbReLm5m" role="1PaTwD">
426+
<property role="3oM_SC" value="a" />
427+
</node>
428+
<node concept="3oM_SD" id="1vOmbReLm5n" role="1PaTwD">
429+
<property role="3oM_SC" value="specific" />
430+
</node>
431+
<node concept="3oM_SD" id="419sLI2Je2Z" role="1PaTwD">
432+
<property role="3oM_SC" value="table." />
433+
</node>
434+
</node>
435+
<node concept="2DRihI" id="6hm_9jqmTf_" role="15bAlk">
436+
<property role="2RT3bR" value="0" />
437+
<node concept="15Ami3" id="6hm_9jqmTkO" role="1PaTwD">
438+
<node concept="37shsh" id="6hm_9jqmTkQ" role="15Aodc">
439+
<node concept="1dCxOk" id="6hm_9jqmTkW" role="37shsm">
440+
<property role="1XweGW" value="7e450f4e-1ac3-41ef-a851-4598161bdb94" />
441+
<property role="1XxBO9" value="de.slisson.mps.tables" />
442+
</node>
443+
</node>
444+
</node>
445+
<node concept="3oM_SD" id="6hm_9jqmTkN" role="1PaTwD">
446+
<property role="3oM_SC" value="Two" />
447+
</node>
448+
<node concept="3oM_SD" id="6hm_9jqmTjD" role="1PaTwD">
449+
<property role="3oM_SC" value="new" />
450+
</node>
451+
<node concept="3oM_SD" id="6hm_9jqmTjE" role="1PaTwD">
452+
<property role="3oM_SC" value="intention" />
453+
</node>
454+
<node concept="3oM_SD" id="6hm_9jqmTjF" role="1PaTwD">
455+
<property role="3oM_SC" value="are" />
456+
</node>
457+
<node concept="3oM_SD" id="6hm_9jqmTjG" role="1PaTwD">
458+
<property role="3oM_SC" value="available" />
459+
</node>
460+
<node concept="3oM_SD" id="6hm_9jqmTjH" role="1PaTwD">
461+
<property role="3oM_SC" value="for" />
462+
</node>
463+
<node concept="3oM_SD" id="6hm_9jqmTjI" role="1PaTwD">
464+
<property role="3oM_SC" value="tables" />
465+
</node>
466+
<node concept="3oM_SD" id="6hm_9jqmTjJ" role="1PaTwD">
467+
<property role="3oM_SC" value="that" />
468+
</node>
469+
<node concept="3oM_SD" id="6hm_9jqmTjK" role="1PaTwD">
470+
<property role="3oM_SC" value="implement" />
471+
</node>
472+
<node concept="3oM_SD" id="6hm_9jqmTjL" role="1PaTwD">
473+
<property role="3oM_SC" value="the" />
474+
</node>
475+
<node concept="3oM_SD" id="6hm_9jqmTjM" role="1PaTwD">
476+
<property role="3oM_SC" value="extension" />
477+
</node>
478+
<node concept="3oM_SD" id="6hm_9jqmTjN" role="1PaTwD">
479+
<property role="3oM_SC" value="point" />
480+
</node>
481+
<node concept="3oM_SD" id="6hm_9jqmTl2" role="1PaTwD">
482+
<property role="3oM_SC" value="DataTransformation." />
483+
<property role="1X82VY" value="true" />
484+
</node>
485+
<node concept="3oM_SD" id="6hm_9jqmTl3" role="1PaTwD">
486+
<property role="3oM_SC" value="It" />
487+
<property role="1X82VY" value="true" />
488+
</node>
489+
<node concept="3oM_SD" id="6hm_9jqmTjQ" role="1PaTwD">
490+
<property role="3oM_SC" value="allows" />
491+
</node>
492+
<node concept="3oM_SD" id="6hm_9jqmTjR" role="1PaTwD">
493+
<property role="3oM_SC" value="to" />
494+
</node>
495+
<node concept="3oM_SD" id="6hm_9jqmTjS" role="1PaTwD">
496+
<property role="3oM_SC" value="parse" />
497+
</node>
498+
<node concept="3oM_SD" id="6hm_9jqmTjT" role="1PaTwD">
499+
<property role="3oM_SC" value="table" />
500+
</node>
501+
<node concept="3oM_SD" id="6hm_9jqmTjU" role="1PaTwD">
502+
<property role="3oM_SC" value="data" />
503+
</node>
504+
<node concept="3oM_SD" id="6hm_9jqmTjV" role="1PaTwD">
505+
<property role="3oM_SC" value="in" />
506+
</node>
507+
<node concept="3oM_SD" id="6hm_9jqmTjW" role="1PaTwD">
508+
<property role="3oM_SC" value="textual" />
509+
</node>
510+
<node concept="3oM_SD" id="6hm_9jqmTjX" role="1PaTwD">
511+
<property role="3oM_SC" value="form" />
512+
</node>
513+
<node concept="3oM_SD" id="6hm_9jqmTjY" role="1PaTwD">
514+
<property role="3oM_SC" value="(comma-" />
515+
</node>
516+
<node concept="3oM_SD" id="6hm_9jqmTjZ" role="1PaTwD">
517+
<property role="3oM_SC" value="or" />
518+
</node>
519+
<node concept="3oM_SD" id="6hm_9jqmTk0" role="1PaTwD">
520+
<property role="3oM_SC" value="tab-separated)" />
521+
</node>
522+
<node concept="3oM_SD" id="6hm_9jqmTk1" role="1PaTwD">
523+
<property role="3oM_SC" value="and" />
524+
</node>
525+
<node concept="3oM_SD" id="6hm_9jqmTk2" role="1PaTwD">
526+
<property role="3oM_SC" value="paste" />
527+
</node>
528+
<node concept="3oM_SD" id="6hm_9jqmTk3" role="1PaTwD">
529+
<property role="3oM_SC" value="it" />
530+
</node>
531+
<node concept="3oM_SD" id="6hm_9jqmTl4" role="1PaTwD">
532+
<property role="3oM_SC" value="into" />
533+
</node>
534+
<node concept="3oM_SD" id="6hm_9jqmTl5" role="1PaTwD">
535+
<property role="3oM_SC" value="the" />
536+
</node>
537+
<node concept="3oM_SD" id="6hm_9jqmTk4" role="1PaTwD">
538+
<property role="3oM_SC" value="table" />
539+
</node>
540+
<node concept="3oM_SD" id="6hm_9jqmTk5" role="1PaTwD">
541+
<property role="3oM_SC" value="(e.g." />
542+
</node>
543+
<node concept="3oM_SD" id="6hm_9jqmTk6" role="1PaTwD">
544+
<property role="3oM_SC" value="10" />
545+
</node>
546+
<node concept="3oM_SD" id="6hm_9jqmTk7" role="1PaTwD">
547+
<property role="3oM_SC" value="as" />
548+
</node>
549+
<node concept="3oM_SD" id="6hm_9jqmTk8" role="1PaTwD">
550+
<property role="3oM_SC" value="a" />
551+
</node>
552+
<node concept="3oM_SD" id="6hm_9jqmTk9" role="1PaTwD">
553+
<property role="3oM_SC" value="number" />
554+
</node>
555+
<node concept="3oM_SD" id="6hm_9jqmTka" role="1PaTwD">
556+
<property role="3oM_SC" value="literal)." />
557+
</node>
558+
</node>
559+
</node>
332560
<node concept="15bAme" id="4xFP9J_Gj2r" role="15bAlL">
333561
<node concept="2DRihI" id="4xFP9J_Gj2s" role="15bAlk">
334562
<node concept="15Ami3" id="4xFP9J_Gj2v" role="1PaTwD">

‎code/tables/languages/de.slisson.mps.tables.demolang/de.slisson.mps.tables.demolang.mpl‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<dependency reexport="false">da21218f-a674-474d-8b4e-d59e33007003(de.slisson.mps.tables.runtime)</dependency>
1717
<dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
1818
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
19+
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
1920
</dependencies>
2021
<languageVersions>
2122
<language slang="l:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />
@@ -29,7 +30,9 @@
2930
<language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
3031
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
3132
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
33+
<language slang="l:515552c7-fcc0-4ab4-9789-2f3c49344e85:jetbrains.mps.baseLanguage.varVariable" version="0" />
3234
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
35+
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
3336
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
3437
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
3538
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
@@ -41,9 +44,11 @@
4144
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
4245
<language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
4346
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="15" />
47+
<language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
4448
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
4549
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
4650
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
51+
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
4752
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
4853
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="4" />
4954
<language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
@@ -53,6 +58,8 @@
5358
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
5459
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
5560
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
61+
<language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util.order" version="0" />
62+
<language slang="l:696c1165-4a59-463b-bc5d-902caab85dd0:jetbrains.mps.make.facet" version="0" />
5663
</languageVersions>
5764
<dependencyVersions>
5865
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

0 commit comments

Comments
 (0)