Merge branch 'maintenance/mps20213' into bugfix/typesystem-improvement-(#668)

Author: arimer

.github/workflows/PR-into-next-version.yml

@@ -0,0 +1,12 @@
+name: PR to merge into the next version
+
+on:
+  push:
+    branches:
+      - 'maintenance/mps*'
+
+jobs:
+  create-pr:
+    uses: specificlanguages/cascading-merge/.github/workflows/workflow.yml@v1
+    with:
+      exclude_branch_prefix: maintenance/mps3

CHANGELOG.md

@@ -0,0 +1,136 @@
+# Changelog
+
+All notable changes to this project are documented in this file.
+
+Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). 
+The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
+
+## April 2024
+
+### Removed
+
+- The unnecessary super types of the tuple type were removed and are not necessary anymore.
+
+### Added
+
+- RecordValues can have a customized string representation.
+
+### Fixed
+
+- Empty-like nodes now automatically select the first code completion entry if there is only one entry.
+- Enum literals now can be compared for equality in the generator.
+- String representation of RecordValues is improved.
+
+## March 2024
+
+### Added
+
+- *MessageDefiniton* uses *extensionPoint/IdentifierConfigurator/* that allows the user to decide to use german umlauts and paragraphs in it.
+- This extensionPoint got a new method to select which implementation will be chosen. 
+
+### Fixed
+
+- The type calculation of field setters now works.
+- `NumberType#containsZero` now correctly deals with infinite values.
+
+## February 2024
+
+### Added
+
+- updated gradle build. Build will now fail in case tests were failing.
+- Enumerations can have an order by declaration, by literal or by value ascociated with the literal 
+
+## January 2024
+
+### Changed
+
+- The PCollections library was updated to version 4.0.1.
+
+### Fixed
+
+- Uncatched `DateTimeException` during check DateLiteral.
+- IntHelper.equals now correctly deals with the combination of 0.0,-0.0,0 and -0.
+
+### Added
+
+- `NumberLiteral` can now be converted to a `BigDecimal` with the method `toBigDecimal`.
+-  Named based access of result columns of multi decision tables were added. Columns can be referenced by name and coexist with the index based access.
+
+## December 2023
+
+### Fixed
+
+- The `index` expression in collections operations now works correctly in nested expressions in the interpreter and generator.
+- Generation of nested short lambda expression now use the correct type for "it" as a variable.
+- Collections: The index expression now works with collection types in the generator.
+
+### Added
+
+- The `all` and `any` operation of collections now also support the `index` expression. The concepts `AllWithIndexOp` and `AnyWithIndexOp` are therefore deprecated.
+
+### Changed
+
+- The class `IETS3ExprEvalHelper` was deprecated and a new class `IETS3ExprEvaluator` was introduced that can also influence the creation of the computation trace.
+
+## November 2023
+
+### Added
+
+- The `sort` method of collections now supports more types: all primitive types, the option type, all datetime types, the temporal type and the record type
+   - Records: The sorting order can be added through the intention `Add a Comparison Order`, otherwise, the records are sorted based on the declaration order of the members
+   - Option: Sorting removes all `none` values since the underlying data structure of collections doesn't support null values.
+
+### Changed
+
+- The comparison helper in org.iets3.core.expr.simpleTypes.runtime and the equals helper in the test language where merged into a new class EqualsHelper inside the first runtime solution to return the same values.
+
+### Fixed
+
+- String validation: A bug in the number detection logic was fixed
+- String validation: A bug in the successor execution logic was fixed
+- 
+## October 2023
+
+### Fixed
+
+- Generation of nested short lambda expression now use the correct type for "it" as a variable.
+
+## September 2023
+
+### Added
+
+- Temporal Literal shows an error if two slices use the same point in time. The check can handle date literals and (nested) references to constants with a date literal. (See [PR 707](https://github.com/IETS3/iets3.opensource/pull/707))
+- Temporal Literal shows a warning if the point in time of a slice cannot be unwrapped to a date literal, rendering the duplicates-check mentioned above ineffective. (See [PR 707](https://github.com/IETS3/iets3.opensource/pull/707))
+
+### New language org.iets3.core.expr.typetags.bindingtime
+
+The language extends typetags with support for different binding times of values. Consistency checks ensure that information is passed on at appropriate levels.
+
+### Fixed
+
+- Unit comparisons for the **same** unit defined in **different** packages now lead to an error message for compatibility
+- `SliceValue` can now correctly be checked for equality: `SliceValue.equals()` and `SliceValue.hashCode()` are overwritten.
+- `TemporalValue.hashCode()` was overwritten, thus `equals` and `hashCode()` are in sync now.
+- Generation of nested short lambda expression now use the correct type for "it" as a variable.
+
+### Removed
+
+- the MetaUnit node was removed since it was not actively used 
+
+## July 2023
+
+### Fixed
+
+- Computation of the least-common-supertype for expressions with different return types has been fixed. The typesystem now correctly infers a join type (c.f. [original issue](https://github.com/IETS3/iets3.opensource/issues/505))
+- Naming constraint of IValidNamedConcept is customizable [original request](https://github.com/IETS3/iets3.opensource/pull/631)
+- Made transformation action [applyCommentsToIDocumentable](http://127.0.0.1:63320/node?ref=r%3A80fb0853-eb3b-4e84-aebd-cc7fdb011d97%28org.iets3.core.base.editor%29%2F5981628904839421072) only applicable if documentation is allowed [original request](https://github.com/IETS3/iets3.opensource/pull/626)
+
+### Added
+
+- Tuples are now handled within the typesystem.
+   Instead of allowing JoinTypes within tuples we merge different tuple types by JoinTypes.
+- Each subconcept of IValidNamedConcept can now contribute and customize naming constraints
+
+### Changed
+
+- `IETS3ExprEvalHelper` methods no longer log exceptions that they re-throw. Some callers may ignore exceptions thrown by the interpreter, and having them logged unnecessarily clutters the logs. It is now the caller's responsibility to log exceptions where needed.

README.md

@@ -21,10 +21,10 @@ We take care of porting changes done in older supported MPS versions to the newe
 For details see [wiki](https://github.com/IETS3/iets3.opensource/wiki/Supported-MPS-Versions).
 
 ### What MPS versions are currently supported? 
-- MPS 2021.1 (branch: [master](https://github.com/IETS3/iets3.opensource/tree/master)) 
+- MPS 2021.3 (branch: [master](https://github.com/IETS3/iets3.opensource/tree/master)) 
+- MPS 2021.2 (branch: [maintenance/mps20212](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20212)) 
+- MPS 2021.1 (branch: [maintenance/mps20211](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20211)) 
 - MPS 2020.3 (branch: [maintenance/mps20203](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20203)) 
-- MPS 2020.2 (branch: [maintenance/mps20202](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20202)) 
-- MPS 2020.1 (branch: [maintenance/mps20201](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20201)) 
 
 ## Community
 

build.gradle

@@ -1,5 +1,5 @@
 import de.itemis.mps.gradle.*
-
+import groovy.xml.XmlSlurper
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
@@ -10,7 +10,7 @@ buildscript {
         maven { url 'https://artifacts.itemis.cloud/repository/maven-mps/' }
     }
     dependencies {
-        classpath 'de.itemis.mps:mps-gradle-plugin:1.7.288.4ea765f'
+        classpath 'de.itemis.mps:mps-gradle-plugin:1.23.1.412.a54f29f'
     }
 }
 
@@ -39,7 +39,7 @@ apply plugin: 'download-jbr'
 
 // configure jbr download
 downloadJbr {
-    jbrVersion = '11_0_11-b1341.60'
+    jbrVersion = '11_0_14_1-b1751.46'
 }
 
 // detect if we are in a CI build
@@ -53,12 +53,12 @@ if (project.hasProperty("forceCI")) {
 def forceLocal = project.hasProperty("forceLocalDependencies")
 
 def major = "2021"
-def minor = "1"
+def minor = "3"
 
 // Dependency versions
-ext.mpsVersion = '2021.1.4'
+ext.mpsVersion = '2021.3.5'
 
-def mbeddrVersion = "2021.1+"
+def mbeddrVersion = "2021.3+"
 
 // if building a against a special branch from mbeddr is required add the name here
 // the name is enough no trailing "." is required, also the plain name from git can
@@ -81,12 +81,13 @@ if (project.hasProperty('iets3OpenSourceVersion')) {
     if (ciBuild) {
         currentBranch = GitBasedVersioning.gitBranch
 
-        def buildNumber = System.env.BUILD_NUMBER.toInteger()
-        if (currentBranch.startsWith("maintenance") || currentBranch.startsWith("mps")) {
+        def buildNumber = System.env.BUILD_COUNTER.toInteger()
+        if (currentBranch.startsWith("maintenance-")) {
             version = "$major.$minor.$buildNumber.${GitBasedVersioning.gitShortCommitHash}"
         } else {
-            version = GitBasedVersioning.getVersionWithCount(major, minor, buildNumber)
-        }
+            def isSnapshot = !(currentBranch.equals("master") || currentBranch.startsWith("datev-loon-staging-") || currentBranch.startsWith("datev-steuer-staging-"))
+            version = GitBasedVersioning.getVersionWithCount(major, minor, buildNumber) + (isSnapshot ? "-SNAPSHOT" : "")
+        } 
         println "##teamcity[buildNumber '${version}']"
     } else {
         version = "$major.$minor-SNAPSHOT"
@@ -110,13 +111,14 @@ ext.snapshotRepository = 'https://artifacts.itemis.cloud/repository/maven-mps-sn
 ext.publishingRepository = version.toString().endsWith("-SNAPSHOT") ? snapshotRepository : releaseRepository
 
 
+
 // 'artifacts' is used in the generated ant scripts as build output directory
 ext.artifactsDir = new File(buildDir, 'artifacts')
 ext.incrementalBuild = !project.hasProperty("disableIncrementalBuild")
 
 
 wrapper {
-    gradleVersion '5.5.1'
+    gradleVersion '8.5'
     distributionType Wrapper.DistributionType.ALL
 }
 
@@ -131,7 +133,7 @@ dependencies {
     mps "com.jetbrains:mps:$mpsVersion"
     languageLibs "com.mbeddr:platform:$mbeddrVersionSelector"
     junitAnt 'org.apache.ant:ant-junit:1.10.6'
-    pcollections 'org.pcollections:pcollections:3.1.4'
+    pcollections 'org.pcollections:pcollections:4.0.1'
 }
 
 
@@ -215,6 +217,24 @@ task buildAndRunTests(type: TestLanguages, dependsOn: buildLanguages) {
     }
 }
 
+task failOnTestError() {
+    description 'evaluate junit result and fail on error'
+    doLast {
+        
+        def juniXml = file('TESTS-TestSuites.xml')
+        if(juniXml.exists()){
+            def junitResult = new XmlSlurper().parse(juniXml)
+            def failures = junitResult.'**'.findAll { it.name() == 'failure' }
+            def errors = junitResult.'**'.findAll { it.name() == 'error' }
+
+            if (failures || errors) {
+                def amount = failures.size() + errors.size()
+                throw new GradleException(amount + " JUnit tests failed. Check the test report for details.")
+            }
+        }
+    }
+}
+buildAndRunTests.configure { finalizedBy failOnTestError }
 check.dependsOn buildAndRunTests
 
 task packageLanguages(type: Zip, dependsOn: buildLanguages) {
@@ -274,7 +294,7 @@ publishing {
                 }
             }
         }
-        if (currentBranch == "master" || currentBranch.startsWith("maintenance") || currentBranch.startsWith("mps")) {
+        if (currentBranch == "master" || currentBranch.startsWith("maintenance") ) {
             maven {
                 name = "GitHubPackages"
                 url = uri("https://maven.pkg.github.com/IETS3/iets3.opensource")