Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge maintenance/MPS-2022.3 into master #32

Merged
merged 131 commits into from
Jan 31, 2024
Merged

Conversation

github-actions[bot]
Copy link
Contributor

Merge changes from maintenance/MPS-2022.3 to master.

danielratiu and others added 30 commits April 30, 2023 21:35
…h do not exist (a module was added to rpoject and in the meanwhile its directory was deleted)
* mpsqa.lint: add support for quickfixes

* mpsqa.lint: added information about availability of quickfixes in the editor of ReuseCheckableScript

* mpsqa.lint: remove invokation of quickfix if not available

---------

Co-authored-by: Daniel Ratiu <[email protected]>
* Check allows to cast to node<>, or cast null to node<SomeConcept>.
* Tests for the check added, not running as part of the build yet.
danielratiu and others added 21 commits November 20, 2023 10:44
# Conflicts:
#	code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/models/org.mpsqa.build.allScripts.mps
Update to MPS 2022.2.2 and fix JBR version
Update PlantUML to version 2023.13 (ASL license)
…t BUT are still referenced from other noeds which are NOT commented out
…or root concepts which do not implement INamedConcept
…running of linters inside ApplicationManager.getApplication().runReadAction(...)

    + changed the use of deprecated "ClassLoaderManager.getClass(moduleContainingChecks, ...)" with ((ReloadableModule) moduleContainingChecks).getClass()
Merge maintenance/MPS-2021.3 into maintenance/MPS-2022.2
…ge/MPS-2022.2

# Conflicts:
#	build.gradle
#	code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps
#	code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/generator/templates/[email protected]
#	code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.typesystem.mps
#	code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.util.mps
#	code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/org.mpsqa.lint.generic.mpl
#	code/languages/org.mpsqa.testing/.mps/migration.xml
Merge maintenance/MPS-2022.2 into maintenance/MPS-2022.3
# Conflicts:
#	build/scripts/build_all_scripts.xml
#	code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd
#	code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps
#	code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.behavior.mps
#	code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.util.mps
#	code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/org.mpsqa.lint.generic.mpl
#	code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps
#	code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/org.mpsqa.lint.generic.linters_library.msd
#	code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd
#	code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/org.mpsqa.lint.mps_lang.linters_library.msd
#	code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps
#	code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/org.mpsqa.lancov.mpl
#	code/languages/org.mpsqa.unused/solutions/org.mpsqa.lancov.sandbox/org.mpsqa.lancov.sandbox.msd
@alexanderpann alexanderpann merged commit 90a9dcb into master Jan 31, 2024
2 checks passed
@sergej-koscejev sergej-koscejev deleted the merge/MPS-2022.3 branch February 1, 2024 21:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants