more renames and cleanups

pontem-network · Aug 30, 2023 · 14689ef · 14689ef
1 parent b8fb497
commit 14689ef
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 44 deletions.
diff --git a/...main/kotlin/org/move/ide/MoveCommenter.kt → src/main/kotlin/org/move/ide/MvCommenter.kt b/...main/kotlin/org/move/ide/MoveCommenter.kt → src/main/kotlin/org/move/ide/MvCommenter.kt
diff --git a/...in/kotlin/org/move/ide/MoveHighlighter.kt → ...main/kotlin/org/move/ide/MvHighlighter.kt b/...in/kotlin/org/move/ide/MoveHighlighter.kt → ...main/kotlin/org/move/ide/MvHighlighter.kt
diff --git a/src/main/kotlin/org/move/ide/intentions/InlineAddressBlockIntention.kt b/src/main/kotlin/org/move/ide/intentions/InlineAddressBlockIntention.kt
@@ -32,16 +32,7 @@ class InlineAddressBlockIntention : MvElementBaseIntentionAction<InlineAddressBl
         val moduleNameElement = module.nameElement ?: return
         val blockText = module.moduleBlock?.text ?: return
 
-//        val nameOffset = moduleNameElement.startOffset
-//        var caretOffset = editor.caretModel.offset
-//        if (caretOffset > nameOffset) {
-//            // focused on identifier
-//           caretOffset += addressText.length + 2
-//        }
-
         val inlineModule = project.psiFactory.inlineModule(addressText, moduleNameElement.text, blockText)
         address.replace(inlineModule)
-
-//        editor.caretModel.moveToOffset(caretOffset)
     }
 }
diff --git a/src/main/kotlin/org/move/ide/lineMarkers/RsLineMarkerInfoUtils.kt b/src/main/kotlin/org/move/ide/lineMarkers/RsLineMarkerInfoUtils.kt
diff --git a/.../move/ide/live_templates/MvContextType.kt → ...g/move/ide/liveTemplates/MvContextType.kt b/.../move/ide/live_templates/MvContextType.kt → ...g/move/ide/liveTemplates/MvContextType.kt
@@ -1,4 +1,4 @@
-package org.move.ide.live_templates
+package org.move.ide.liveTemplates
 
 import com.intellij.codeInsight.template.EverywhereContextType
 import com.intellij.codeInsight.template.TemplateActionContext

diff --git a/...de/navigation/MoveNamedElementsVisitor.kt → .../ide/navigation/MvNamedElementsVisitor.kt b/...de/navigation/MoveNamedElementsVisitor.kt → .../ide/navigation/MvNamedElementsVisitor.kt
diff --git a/...gation/MoveStructNavigationContributor.kt → ...vigation/MvStructNavigationContributor.kt b/...gation/MoveStructNavigationContributor.kt → ...vigation/MvStructNavigationContributor.kt
diff --git a/...gation/MoveSymbolNavigationContributor.kt → ...vigation/MvSymbolNavigationContributor.kt b/...gation/MoveSymbolNavigationContributor.kt → ...vigation/MvSymbolNavigationContributor.kt
diff --git a/...move/ide/search/MoveFindUsagesProvider.kt → ...g/move/ide/search/MvFindUsagesProvider.kt b/...move/ide/search/MoveFindUsagesProvider.kt → ...g/move/ide/search/MvFindUsagesProvider.kt
diff --git a/.../move/ide/search/MoveUsageTypeProvider.kt → ...rg/move/ide/search/MvUsageTypeProvider.kt b/.../move/ide/search/MoveUsageTypeProvider.kt → ...rg/move/ide/search/MvUsageTypeProvider.kt
@@ -15,10 +15,7 @@ import org.move.lang.core.psi.MvFQModuleRef
 
 object MvUsageTypeProvider : UsageTypeProviderEx {
     // Instantiate each UsageType only once, so that the equality check in UsageTypeGroup.equals() works correctly
-//    private val IMPL = UsageType { "impl" }
-
 //    private val TYPE_REFERENCE = UsageType { "type reference" }
-//    private val TRAIT_REFERENCE = UsageType { "trait reference" }
 
     private val EXPR = UsageType { "expr" }
     private val DOT_EXPR = UsageType { "dot expr" }

diff --git a/...n/org/move/ide/search/MoveWordsScanner.kt → ...lin/org/move/ide/search/MvWordsScanner.kt b/...n/org/move/ide/search/MoveWordsScanner.kt → ...lin/org/move/ide/search/MvWordsScanner.kt
diff --git a/src/main/kotlin/org/move/lang/core/lexer/MoveLexer.kt b/src/main/kotlin/org/move/lang/core/lexer/MoveLexer.kt
@@ -7,5 +7,4 @@ fun createMoveLexer(): MoveLexer {
     return MoveLexer()
 }
 
-@Suppress("UnstableApiUsage")
 class MoveLexer : FlexAdapter(_MoveLexer(null))
diff --git a/src/main/resources/META-INF/intellij-move-core.xml b/src/main/resources/META-INF/intellij-move-core.xml
@@ -153,9 +153,9 @@
                                    implementationClass="org.move.ide.hints.type.MvInlayTypeHintsProvider"/>
 
         <defaultLiveTemplates file="liveTemplates/Move.xml"/>
-        <liveTemplateContext implementation="org.move.ide.live_templates.MvContextType$Generic"/>
-        <liveTemplateContext implementation="org.move.ide.live_templates.MvContextType$Module"/>
-        <liveTemplateContext implementation="org.move.ide.live_templates.MvContextType$Block"/>
+        <liveTemplateContext implementation="org.move.ide.liveTemplates.MvContextType$Generic"/>
+        <liveTemplateContext implementation="org.move.ide.liveTemplates.MvContextType$Module"/>
+        <liveTemplateContext implementation="org.move.ide.liveTemplates.MvContextType$Block"/>
 
         <renamePsiElementProcessor implementation="org.move.ide.refactoring.MvRenameProcessor"
                                    order="first"