diff options
| author | Charlie Tsai <chartsai@google.com> | 2022-07-15 12:08:46 +0100 |
|---|---|---|
| committer | Charlie Tsai <chartsai@google.com> | 2022-07-18 23:59:48 +0000 |
| commit | ce4435fe5537282511d4312609fd410647f66d8f (patch) | |
| tree | 35c049b8fb5ac295b54cb2cee43079e4213d2589 /designer | |
| parent | 58a08842827e13f43ecaa92e71acf620bb8ec38c (diff) | |
| download | idea-ce4435fe5537282511d4312609fd410647f66d8f.tar.gz | |
Fix wrong suppress action description
Fixes: 239087272
Test: Add regression test
Change-Id: If318ef060639f5cfaec545731be6122fb69ce0c1
Diffstat (limited to 'designer')
3 files changed, 16 insertions, 2 deletions
diff --git a/designer/src/com/android/tools/idea/uibuilder/visual/visuallint/VisualLintErrorType.kt b/designer/src/com/android/tools/idea/uibuilder/visual/visuallint/VisualLintErrorType.kt index 4b780f764cd..edfccf699ec 100644 --- a/designer/src/com/android/tools/idea/uibuilder/visual/visuallint/VisualLintErrorType.kt +++ b/designer/src/com/android/tools/idea/uibuilder/visual/visuallint/VisualLintErrorType.kt @@ -36,7 +36,7 @@ enum class VisualLintErrorType(val shortName: String) { get() = ATTRIBUTE_PREFIX + shortName fun toSuppressActionDescription(): String { - return """Add ${SdkConstants.TOOLS_NS_NAME_PREFIX}${SdkConstants.ATTR_IGNORE}="$ignoredAttributeValue"""" + return """Add ${SdkConstants.TOOLS_NS_NAME_PREFIX}${SdkConstants.ATTR_IGNORE}="$ignoredAttributeValue attribute"""" } companion object { diff --git a/designer/src/com/android/tools/idea/uibuilder/visual/visuallint/VisualLintIssueProvider.kt b/designer/src/com/android/tools/idea/uibuilder/visual/visuallint/VisualLintIssueProvider.kt index 389252e6724..40a71d62398 100644 --- a/designer/src/com/android/tools/idea/uibuilder/visual/visuallint/VisualLintIssueProvider.kt +++ b/designer/src/com/android/tools/idea/uibuilder/visual/visuallint/VisualLintIssueProvider.kt @@ -88,7 +88,7 @@ class VisualLintRenderIssue private constructor(private val builder: Builder): I return Stream.empty() } return Stream.of(Suppress("Suppress", - "Suppress: Add " + type.toSuppressActionDescription() + " attribute", + "Suppress: ${type.toSuppressActionDescription()}", VisualLintSuppressTask(type, components))) } diff --git a/designer/testSrc/com/android/tools/idea/uibuilder/visual/visuallint/VisualLintSuppressTaskTest.kt b/designer/testSrc/com/android/tools/idea/uibuilder/visual/visuallint/VisualLintSuppressTaskTest.kt index 1a9f5d8712b..8d3d11dadf4 100644 --- a/designer/testSrc/com/android/tools/idea/uibuilder/visual/visuallint/VisualLintSuppressTaskTest.kt +++ b/designer/testSrc/com/android/tools/idea/uibuilder/visual/visuallint/VisualLintSuppressTaskTest.kt @@ -26,6 +26,8 @@ import com.android.tools.idea.testing.onEdt import com.android.tools.idea.uibuilder.NlModelBuilderUtil.model import com.android.tools.idea.uibuilder.visual.visuallint.analyzers.BoundsAnalyzer import com.android.tools.idea.uibuilder.visual.visuallint.analyzers.LongTextAnalyzer +import com.intellij.openapi.command.undo.UndoManager +import com.intellij.openapi.fileEditor.FileEditorManager import com.intellij.testFramework.RunsInEdt import junit.framework.Assert.assertEquals import org.jetbrains.kotlin.idea.util.application.executeCommand @@ -49,6 +51,18 @@ class VisualLintSuppressTaskTest { @RunsInEdt @Test + fun testSuppressionTaskDescriptionInUndoManager() { + val model = createModel("test.xml") + rule.fixture.openFileInEditor(model.virtualFile) + VisualLintSuppressTask(BoundsAnalyzer.type, model.components).run() + + val editor = FileEditorManager.getInstance(rule.project).selectedEditor + assertEquals("Undo Suppress: ${BoundsAnalyzer.type.toSuppressActionDescription()}", + UndoManager.getInstance(rule.project).getUndoActionNameAndDescription(editor).second) + } + + @RunsInEdt + @Test fun testSuppressSingeAnalyzerToMultipleModels() { val type = BoundsAnalyzer.type val model1 = createModel("test1.xml") |