intellij-rust · bors · Jul 20, 2021 · Jul 20, 2021
diff --git a/toml/src/main/kotlin/org/rust/toml/intentions/SimplifyDependencySpecificationIntention.kt b/toml/src/main/kotlin/org/rust/toml/intentions/SimplifyDependencySpecificationIntention.kt
@@ -0,0 +1,44 @@
+/*
+ * Use of this source code is governed by the MIT license that can be
+ * found in the LICENSE file.
+ */
+
+package org.rust.toml.intentions
+
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiElement
+import com.intellij.psi.util.parentsOfType
+import org.rust.lang.core.psi.ext.endOffset
+import org.rust.toml.isCargoToml
+import org.rust.toml.isDependencyListHeader
+import org.toml.lang.psi.TomlInlineTable
+import org.toml.lang.psi.TomlKeyValue
+import org.toml.lang.psi.TomlTable
+import org.toml.lang.psi.TomlValue
+
+class SimplifyDependencySpecificationIntention : TomlElementBaseIntentionAction<SimplifyDependencySpecificationIntention.Context>() {
+    override fun getText() = "Simplify dependency specification"
+    override fun getFamilyName(): String = text
+
+    override fun findApplicableContextInternal(project: Project, editor: Editor, element: PsiElement): Context? {
+        if (!element.containingFile.isCargoToml) return null
+
+        val dependency = element.parentsOfType<TomlKeyValue>()
+            .firstOrNull { (it.parent as? TomlTable)?.header?.isDependencyListHeader == true } ?: return null
+
+        val dependencyValue = dependency.value as? TomlInlineTable ?: return null
+        val version = dependencyValue.entries.singleOrNull().takeIf {
+            it?.key?.segments?.singleOrNull()?.text == "version"
+        }?.value ?: return null
+
+        return Context(dependencyValue, version)
+    }
+
+    override fun invoke(project: Project, editor: Editor, ctx: Context) {
+        val offset = ctx.value.replace(ctx.version.copy())?.endOffset ?: return
+        editor.caretModel.moveToOffset(offset)
+    }
+
+    class Context(val value: TomlInlineTable, val version: TomlValue)
+}
diff --git a/toml/src/main/resources/META-INF/toml-only.xml b/toml/src/main/resources/META-INF/toml-only.xml
@@ -62,6 +62,11 @@
             <category>Rust/Cargo.toml</category>
         </intentionAction>
 
+        <intentionAction>
+            <className>org.rust.toml.intentions.SimplifyDependencySpecificationIntention</className>
+            <category>Rust/Cargo.toml</category>
+        </intentionAction>
+
         <applicationService serviceInterface="org.rust.toml.crates.local.CratesLocalIndexService"
                             serviceImplementation="org.rust.toml.crates.local.CratesLocalIndexServiceImpl"
                             testServiceImplementation="org.rust.toml.crates.local.TestCratesLocalIndexServiceImpl"/>

diff --git a/...esources/intentionDescriptions/SimplifyDependencySpecificationIntention/after.rs.template b/...esources/intentionDescriptions/SimplifyDependencySpecificationIntention/after.rs.template
@@ -0,0 +1,2 @@
+[dependencies]
+foo = "1.0.0"
diff --git a/...sources/intentionDescriptions/SimplifyDependencySpecificationIntention/before.rs.template b/...sources/intentionDescriptions/SimplifyDependencySpecificationIntention/before.rs.template
@@ -0,0 +1,2 @@
+[dependencies]
+foo = { version = "1.0.0" }
diff --git a/...resources/intentionDescriptions/SimplifyDependencySpecificationIntention/description.html b/...resources/intentionDescriptions/SimplifyDependencySpecificationIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Simplifies inline table dependency specification.
+</body>
+</html>
diff --git a/.../src/test/kotlin/org/rust/toml/intentions/SimplifyDependencySpecificationIntentionTest.kt b/.../src/test/kotlin/org/rust/toml/intentions/SimplifyDependencySpecificationIntentionTest.kt
@@ -0,0 +1,49 @@
+/*
+ * Use of this source code is governed by the MIT license that can be
+ * found in the LICENSE file.
+ */
+
+package org.rust.toml.intentions
+
+class SimplifyDependencySpecificationIntentionTest : CargoTomlIntentionTestBase(SimplifyDependencySpecificationIntention::class) {
+    fun `test availability range`() = checkAvailableInSelectionOnly("""
+        [dependencies]
+        <selection>foo = { version = "0.1.0" }</selection>
+    """)
+
+    fun `test unavailable for deps with string value`() = doUnavailableTest("""
+        [dependencies]
+        foo = "0.1.0"<caret>
+    """)
+
+    fun `test unavailable with multiple properties`() = doUnavailableTest("""
+        [dependencies]
+        foo = { version = "0.1.0", features = [] }<caret>
+    """)
+
+    fun `test unavailable without version property`() = doUnavailableTest("""
+        [dependencies]
+        foo = { features = [] }<caret>
+    """)
+
+    fun `test unavailable in other tables`() = doUnavailableTest("""
+        [foo]
+        bar = { version = "0.1.0" }<caret>
+    """)
+
+    fun `test replace from key`() = doAvailableTest("""
+        [dependencies]
+        <caret>foo = { version = "0.1.0" }
+    """, """
+        [dependencies]
+        foo = "0.1.0"<caret>
+    """)
+
+    fun `test replace from inside value`() = doAvailableTest("""
+        [dependencies]
+        foo = { version<caret> = "0.1.0" }
+    """, """
+        [dependencies]
+        foo = "0.1.0"<caret>
+    """)
+}