⁠
joseph burton: Add support for MixinExtras expressions (#2274 )
* Start on MixinExtras Expression language
* MEExpression color settings page
* MEExpression annotator
* MEExpression brace matcher and quote handler
* Switch LHS of MEExpression assignmentExpression to themselves be certain types of expression
* MEExpression language injection inside @Expression
* Fix formatting and licenses
* Add MIXINEXTRAS:EXPRESSION injection point and add @Expression annotation on completion
* Fix licenser errors
* Add new ME expression features
* Implement MixinExtras expression collect visitor
* Fix cast expressions
* Simple best-effort source matching for ME expressions
* Fix name expression source matching
* Fix MEName.isWildcard
* Fix MELitExpression source matching
* operationSign - operationTokenType
* Add built-in definitions
* Update MixinExtras
* Start with ME definition references
* Attempt to overhaul ME expression injection
* Some fixes to the new injection + navigation
* MixinExtras: Add handler signature support for expressions. (#2244 )
* Partially fix ME definition renaming
* Attempt to get inplace rename refactoring to work (it doesn't)
* MixinExtras: Use expression-suggested parameter names if they're present. (#2257 )
* Fix MEExpressionInjector. Rename refactoring works!
* Suppress deprecation warning
* ME expression `@Definition` find usages
* Fix/expressions int like types (#2261 )
* Mixin: Combine parameter and return type inspections.
* MixinExtras: Offer a choice between all valid int-like types.
* Mixin: Fix tests for handler signature inspection.
* Add simple keyword completion to ME expressions
* Why didn't my local ktlint tell me about these
* Store whether a declaration is a type in the ME PSI
* Add completions for items that already have a definition
* Extract some ME expression matching into its own class, and cache some more things
* Remove some debug...
* Start on MixinExtras Expression language
* MEExpression color settings page
* MEExpression annotator
* MEExpression brace matcher and quote handler
* Switch LHS of MEExpression assignmentExpression to themselves be certain types of expression
* MEExpression language injection inside @Expression
* Fix formatting and licenses
* Add MIXINEXTRAS:EXPRESSION injection point and add @Expression annotation on completion
* Fix licenser errors
* Add new ME expression features
* Implement MixinExtras expression collect visitor
* Fix cast expressions
* Simple best-effort source matching for ME expressions
* Fix name expression source matching
* Fix MEName.isWildcard
* Fix MELitExpression source matching
* operationSign - operationTokenType
* Add built-in definitions
* Update MixinExtras
* Start with ME definition references
* Attempt to overhaul ME expression injection
* Some fixes to the new injection + navigation
* MixinExtras: Add handler signature support for expressions. (#2244 )
* Partially fix ME definition renaming
* Attempt to get inplace rename refactoring to work (it doesn't)
* MixinExtras: Use expression-suggested parameter names if they're present. (#2257 )
* Fix MEExpressionInjector. Rename refactoring works!
* Suppress deprecation warning
* ME expression `@Definition` find usages
* Fix/expressions int like types (#2261 )
* Mixin: Combine parameter and return type inspections.
* MixinExtras: Offer a choice between all valid int-like types.
* Mixin: Fix tests for handler signature inspection.
* Add simple keyword completion to ME expressions
* Why didn't my local ktlint tell me about these
* Store whether a declaration is a type in the ME PSI
* Add completions for items that already have a definition
* Extract some ME expression matching into its own class, and cache some more things
* Remove some debug...
- /*
- * Minecraft Development for IntelliJ
- *
- * https://mcdev.io/
- *
- * Copyright (C) 2024 minecraft-dev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation, version 3.0 only.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
- package com.demonwav.mcdev.platform.mixin
- import com.demonwav.mcdev.framework.BaseMinecraftTest
- import com.demonwav.mcdev.framework.createLibrary
- import com.demonwav.mcdev.platform.PlatformType
- import com.demonwav.mcdev.util.rotate
- import com.demonwav.mcdev.util.runWriteTask
- import com.intellij.openapi.roots.ModuleRootModificationUtil
- import com.intellij.openapi.roots.libraries.Library
- import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar
- import org.junit.jupiter.api.AfterEach
- import org.junit.jupiter.api.BeforeEach
- abstract class BaseMixinTest : BaseMinecraftTest(PlatformType.MIXIN) {
- private var mixinLibrary: Library? = null
- private var testDataLibrary: Library? = null
- @BeforeEach
- fun initMixin() {
- runWriteTask {
- mixinLibrary = createLibrary(project, "mixin")
- testDataLibrary = createLibrary(project, "mixin-test-data")
- }
- ModuleRootModificationUtil.updateModel(module) { model ->
- model.addLibraryEntry(mixinLibrary ?: throw IllegalStateException("Mixin library not created"))
- model.addLibraryEntry(testDataLibrary ?: throw IllegalStateException("Test data library not created"))
- val orderEntries = model.orderEntries
- orderEntries.rotate(2)
- model.rearrangeOrderEntries(orderEntries)
- }
- }
- @AfterEach
- fun cleanupMixin() {
- for (l in listOfNotNull(mixinLibrary, testDataLibrary)) {
- ModuleRootModificationUtil.updateModel(module) { model ->
- model.removeOrderEntry(
- model.findLibraryOrderEntry(l) ?: throw IllegalStateException("Library not found"),
- )
- }
- runWriteTask {
- val table = LibraryTablesRegistrar.getInstance().getLibraryTable(project)
- table.modifiableModel.let { model ->
- model.removeLibrary(l)
- model.commit()
- }
- }
- }
- }
- }
- /*
- * Minecraft Development for IntelliJ
- *
- * https://mcdev.io/
- *
- * Copyright (C) 2024 minecraft-dev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation, version 3.0 only.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
- package com.demonwav.mcdev.platform.mixin
- import com.demonwav.mcdev.framework.BaseMinecraftTest
- import com.demonwav.mcdev.framework.createLibrary
- import com.demonwav.mcdev.platform.PlatformType
- import com.demonwav.mcdev.util.rotate
- import com.demonwav.mcdev.util.runWriteTask
- import com.intellij.openapi.roots.ModuleRootModificationUtil
- import com.intellij.openapi.roots.libraries.Library
- import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar
- import org.junit.jupiter.api.AfterEach
- import org.junit.jupiter.api.BeforeEach
- abstract class BaseMixinTest : BaseMinecraftTest(PlatformType.MIXIN) {
- private var mixinLibrary: Library? = null
- private var mixinExtrasLibrary: Library? = null
- private var testDataLibrary: Library? = null
- @BeforeEach
- fun initMixin() {
- runWriteTask {
- mixinLibrary = createLibrary(project, "mixin")
- mixinExtrasLibrary = createLibrary(project, "mixinextras-common")
- testDataLibrary = createLibrary(project, "mixin-test-data")
- }
- ModuleRootModificationUtil.updateModel(module) { model ->
- model.addLibraryEntry(mixinLibrary ?: throw IllegalStateException("Mixin library not created"))
- model.addLibraryEntry(mixinExtrasLibrary ?: throw IllegalStateException("MixinExtras library not created"))
- model.addLibraryEntry(testDataLibrary ?: throw IllegalStateException("Test data library not created"))
- val orderEntries = model.orderEntries
- orderEntries.rotate(3)
- model.rearrangeOrderEntries(orderEntries)
- }
- }
- @AfterEach
- fun cleanupMixin() {
- for (l in listOfNotNull(mixinLibrary, testDataLibrary)) {
- ModuleRootModificationUtil.updateModel(module) { model ->
- model.removeOrderEntry(
- model.findLibraryOrderEntry(l) ?: throw IllegalStateException("Library not found"),
- )
- }
- runWriteTask {
- val table = LibraryTablesRegistrar.getInstance().getLibraryTable(project)
- table.modifiableModel.let { model ->
- model.removeLibrary(l)
- model.commit()
- }
- }
- }
- }
- }