MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[markdown] IJPL-251351 Don't enforce Markdown table cells to be aligned in the editor

Browse Source 
Merge-request: IJ-MR-217378
Merged-by: Ilia Permiashkin <ilia.permiashkin@jetbrains.com>


Merge-request: IJ-MR-217525
Merged-by: Ilia Permiashkin <ilia.permiashkin@jetbrains.com>

GitOrigin-RevId: 3cb54a5034822f4cdfd65a6c780b977796ee975c
This commit is contained in:
Ilia Permiashkin
2026-08-12 22:58:00 +00:00
committed by intellij-monorepo-bot
parent 5a13054237
commit 7f0322abb8
13 changed files with 543 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/markdown/core/resources/META-INF/plugin.xml
+13
View File
@@ -129,6 +129,19 @@
level="WARNING"
implementationClass="org.intellij.plugins.markdown.editor.tables.inspections.MarkdownTablePipeInCodeSpanInspection"/>
<intentionAction>
<language>Markdown</language>
<className>org.intellij.plugins.markdown.editor.tables.intentions.ReformatTableIntention</className>
<bundleName>messages.MarkdownBundle</bundleName>
<categoryKey>markdown.intention.category</categoryKey>
</intentionAction>
<intentionAction>
<language>Markdown</language>
<className>org.intellij.plugins.markdown.editor.tables.intentions.FixCellAlignmentIntention</className>
<bundleName>messages.MarkdownBundle</bundleName>
<categoryKey>markdown.intention.category</categoryKey>
</intentionAction>
<intentionAction>
<language>Markdown</language>
<className>org.intellij.plugins.markdown.editor.tables.intentions.MarkdownInsertTableColumnIntention$InsertBefore</className>
plugins/markdown/core/resources/intentionDescriptions/FixCellAlignmentIntention/after.md.template
+3
View File
@@ -0,0 +1,3 @@
| Value |
|------:|
|<spot> 1 </spot>|
plugins/markdown/core/resources/intentionDescriptions/FixCellAlignmentIntention/before.md.template
+3
View File
@@ -0,0 +1,3 @@
| Value |
|------:|
|<spot> 1 </spot>|
plugins/markdown/core/resources/intentionDescriptions/FixCellAlignmentIntention/description.html
+5
View File
@@ -0,0 +1,5 @@
<html>
<body>
Adjusts the current table cell to match its column alignment.
</body>
</html>
plugins/markdown/core/resources/intentionDescriptions/ReformatTableIntention/after.md.template
+3
View File
@@ -0,0 +1,3 @@
| Name | Value |
|-------|-------|
|<spot> first | 1 |</spot>
plugins/markdown/core/resources/intentionDescriptions/ReformatTableIntention/before.md.template
+3
View File
@@ -0,0 +1,3 @@
| Name | Value |
|---|---|
|<spot> first | 1 |</spot>
plugins/markdown/core/resources/intentionDescriptions/ReformatTableIntention/description.html
+5
View File
@@ -0,0 +1,5 @@
<html>
<body>
Formats all columns in the current Markdown table.
</body>
</html>
plugins/markdown/core/src/org/intellij/plugins/markdown/settings/MarkdownCodeInsightSettings.kt
+2 -2
View File
@@ -16,14 +16,14 @@ import org.jetbrains.annotations.Nls
storages = [(Storage("markdown.xml"))])
class MarkdownCodeInsightSettings: SimplePersistentStateComponent<MarkdownCodeInsightSettings.State>(State()) {
class State: BaseState() {
var reformatTablesOnType: Boolean by property(true)
var reformatTablesOnType: Boolean by property(false)
var insertHtmlLineBreakInsideTables: Boolean by property(true)
var insertNewTableRowOnShiftEnter: Boolean by property(true)
var useTableCellNavigation: Boolean by property(true)
var adjustListIndentation: Boolean by property(true)
var smartEnterAndBackspace: Boolean by property(true)
var renumberListsOnType: Boolean by property(false)
var listNumberingType by enum(ListNumberingType.SEQUENTIAL)
var listNumberingType: ListNumberingType by enum(ListNumberingType.SEQUENTIAL)
var enableFileDrop: Boolean by property(true)
}
plugins/markdown/test/src/org/intellij/plugins/markdown/editor/tables/MarkdownTableColumnExpandTest.kt
+11
View File
@@ -2,6 +2,9 @@
package org.intellij.plugins.markdown.editor.tables
import com.intellij.testFramework.LightPlatformCodeInsightTestCase
import com.intellij.openapi.util.Disposer
import org.intellij.plugins.markdown.settings.MarkdownCodeInsightSettings
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
@@ -9,6 +12,14 @@ import org.junit.runners.JUnit4
@RunWith(JUnit4::class)
@Suppress("MarkdownIncorrectTableFormatting")
class MarkdownTableColumnExpandTest: LightPlatformCodeInsightTestCase() {
@Before
fun enableTableReformatting() {
val settings = MarkdownCodeInsightSettings.getInstance()
val old = settings.state.reformatTablesOnType
settings.state.reformatTablesOnType = true
Disposer.register(testRootDisposable) { settings.state.reformatTablesOnType = old }
}
@Test
fun `test right after cell content`() {
// language=Markdown
plugins/markdown/test/src/org/intellij/plugins/markdown/editor/tables/MarkdownTableColumnShrinkTest.kt
+11
View File
@@ -1,7 +1,10 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.intellij.plugins.markdown.editor.tables
import com.intellij.openapi.util.Disposer
import com.intellij.testFramework.LightPlatformCodeInsightTestCase
import org.intellij.plugins.markdown.settings.MarkdownCodeInsightSettings
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
@@ -9,6 +12,14 @@ import org.junit.runners.JUnit4
@RunWith(JUnit4::class)
@Suppress("MarkdownIncorrectTableFormatting")
class MarkdownTableColumnShrinkTest: LightPlatformCodeInsightTestCase() {
@Before
fun enableTableReformatting() {
val settings = MarkdownCodeInsightSettings.getInstance()
val old = settings.state.reformatTablesOnType
settings.state.reformatTablesOnType = true
Disposer.register(testRootDisposable) { settings.state.reformatTablesOnType = old }
}
@Test
fun `test right after cell content`() {
// language=Markdown
plugins/markdown/test/src/org/intellij/plugins/markdown/editor/tables/MarkdownTableColumnShrinkWithFullWidthTest.kt
+11
View File
@@ -1,7 +1,10 @@
// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.intellij.plugins.markdown.editor.tables
import com.intellij.openapi.util.Disposer
import com.intellij.testFramework.LightPlatformCodeInsightTestCase
import org.intellij.plugins.markdown.settings.MarkdownCodeInsightSettings
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
@@ -9,6 +12,14 @@ import org.junit.runners.JUnit4
@RunWith(JUnit4::class)
@Suppress("MarkdownIncorrectTableFormatting")
class MarkdownTableColumnShrinkWithFullWidthTest: LightPlatformCodeInsightTestCase() {
@Before
fun enableTableReformatting() {
val settings = MarkdownCodeInsightSettings.getInstance()
val old = settings.state.reformatTablesOnType
settings.state.reformatTablesOnType = true
Disposer.register(testRootDisposable) { settings.state.reformatTablesOnType = old }
}
@Test
fun `test backspace cjk character`() {
// language=Markdown
plugins/markdown/test/src/org/intellij/plugins/markdown/editor/tables/MarkdownTableTypingTest.kt
+458
View File
@@ -0,0 +1,458 @@
// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.intellij.plugins.markdown.editor.tables
import com.intellij.application.options.CodeStyle
import com.intellij.application.options.codeStyle.excludedFiles.GlobPatternDescriptor
import com.intellij.openapi.util.Disposer
import com.intellij.psi.PsiFile
import com.intellij.testFramework.LightPlatformCodeInsightTestCase
import org.intellij.plugins.markdown.settings.MarkdownCodeInsightSettings
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
@RunWith(JUnit4::class)
@Suppress("MarkdownIncorrectTableFormatting")
class MarkdownTableTypingTest: LightPlatformCodeInsightTestCase() {
@Before
fun enableTableReformatting() {
val settings = MarkdownCodeInsightSettings.getInstance()
val old = settings.state.reformatTablesOnType
settings.state.reformatTablesOnType = true
Disposer.register(testRootDisposable) { settings.state.reformatTablesOnType = old }
}
@Test
fun `test typing in non-last column reformats the table`() {
// language=Markdown
val before = """
| a |malformed| c |
|---|---|---|
| 1<caret> |y| 2 |
""".trimIndent()
// language=Markdown
val after = """
| a |malformed| c |
|----|---|---|
| 1x |y| 2 |
""".trimIndent()
doTest(before, after, 1, "x")
}
@Test
fun `test typing in last column reformats the table`() {
// language=Markdown
val before = """
| a |malformed| c |
|---|---|---|
| 1 |y| 2<caret> |
""".trimIndent()
// language=Markdown
val after = """
| a |malformed| c |
|---|---|----|
| 1 |y| 2x |
""".trimIndent()
doTest(before, after, 1, "x")
}
@Test
fun `test right after cell content`() {
// language=Markdown
doTest(
"""
| none | none |
|------|------|
| a <caret> | asd |
""".trimIndent(),
"""
| none | none |
|-------|------|
| a <caret> | asd |
""".trimIndent()
)
}
@Test
fun `test between spaces on the right side`() {
// language=Markdown
doTest(
"""
| none | none |
|------|------|
| a <caret> | asd |
""".trimIndent(),
"""
| none | none |
|-------|------|
| a <caret> | asd |
""".trimIndent()
)
}
@Test
fun `test just before right pipe`() {
// language=Markdown
doTest(
"""
| none | none |
|------|------|
| a <caret>| asd |
""".trimIndent(),
"""
| none | none |
|-------|------|
| a <caret> | asd |
""".trimIndent()
)
}
@Test
fun `test in separator`() {
doTest(
"""
| none | none |
|--<caret>----|------|
| a | asd |
""".trimIndent(),
"""
| none | none |
|---<caret>----|------|
| a | asd |
""".trimIndent(),
string = "-"
)
}
@Test
fun `test in separator with colon`() {
doTest(
"""
| none | none |
|<caret>------|------|
| a | asd |
""".trimIndent(),
"""
| none | none |
|:<caret>------|------|
| a | asd |
""".trimIndent(),
string = ":"
)
}
@Test
fun `test with right alignment`() {
// language=Markdown
val before = """
| right<caret> |
| ---: |
| some |
""".trimIndent()
// language=Markdown
val after = """
| right <caret> |
|-------:|
| some |
""".trimIndent()
doTest(before, after)
}
@Test
fun `test typing with right alignment`() {
// language=Markdown
val before = """
| right |
|------:|
| <caret> |
""".trimIndent()
// language=Markdown
val after = """
| right |
|------:|
| some<caret> |
""".trimIndent()
doTest(before, after, string = "some")
}
@Test
fun `test typing with right alignment and spaces`() {
// language=Markdown
val before = """
| right |
|------:|
| <caret> |
""".trimIndent()
// language=Markdown
val after = """
| right |
|-------------:|
| some content<caret> |
""".trimIndent()
doTest(before, after, string = "some content")
}
@Test
fun `test typing with left alignment`() {
// language=Markdown
val before = """
| left |
|-----:|
| <caret> |
""".trimIndent()
// language=Markdown
val after = """
| left |
|-----:|
| some<caret> |
""".trimIndent()
doTest(before, after, string = "some")
}
@Test
fun `test typing with left alignment and spaces`() {
// language=Markdown
val before = """
| left |
|-----:|
| <caret> |
""".trimIndent()
// language=Markdown
val after = """
| left |
|-------------:|
| some content<caret> |
""".trimIndent()
doTest(before, after, string = "some content")
}
@Test
fun `test typing with center alignment`() {
// language=Markdown
val before = """
| center |
|:------:|
| <caret> |
""".trimIndent()
// language=Markdown
val after = """
| center |
|:------:|
| some<caret> |
""".trimIndent()
doTest(before, after, string = "some")
}
@Test
fun `test typing with center alignment and ends with space`() {
// language=Markdown
val before = """
| center |
|:------:|
| <caret> |
""".trimIndent()
// language=Markdown
val after = """
| center |
|:------:|
| ssome <caret> |
""".trimIndent()
doTest(before, after, string = "ssome ")
}
@Test
fun `test typing in empty cell`() {
// language=Markdown
val before = """
||
|-|
|<caret>|
""".trimIndent()
// language=Markdown
val after = """
| |
|------|
| some<caret> |
""".trimIndent()
doTest(before, after, string = "some")
}
@Test
fun `test typing space in cell with two spaces`() {
// language=Markdown
val before = """
| |
|--|
| <caret> |
""".trimIndent()
// language=Markdown
val after = """
| |
|---|
| <caret> |
""".trimIndent()
doTest(before, after, string = " ")
}
@Test
fun `test no column expand`() {
// language=Markdown
val content = """
| some |
|------|
| <caret> |
""".trimIndent()
// language=Markdown
val expected = """
| some |
|------|
| some<caret> |
""".trimIndent()
configureFromFileText("some.md", content)
runWithDisabledFormatting(file) {
type("some")
checkResultByText(expected)
}
}
@Test
fun `test no column shrink`() {
// language=Markdown
val content = """
| some |
|--------------|
| some text<caret> |
""".trimIndent()
// language=Markdown
val expected = """
| some |
|--------------|
| some tex<caret> |
""".trimIndent()
configureFromFileText("some.md", content)
runWithDisabledFormatting(file) {
backspace()
checkResultByText(expected)
}
}
@Test
fun `test no alignment correction`() {
// language=Markdown
val content = """
| some content |
|:------------:|
| <caret> |
""".trimIndent()
// language=Markdown
val expected = """
| some content |
|:------------:|
| some<caret> |
""".trimIndent()
configureFromFileText("some.md", content)
runWithDisabledFormatting(file) {
type("some")
checkResultByText(expected)
}
}
@Test
fun `test no column expand when reformat on type is disabled`() {
// language=Markdown
val content = """
| some |
|------|
| <caret> |
""".trimIndent()
// language=Markdown
val expected = """
| some |
|------|
| some<caret> |
""".trimIndent()
configureFromFileText("some.md", content)
runWithReformatOnTypeDisabled {
type("some")
checkResultByText(expected)
}
}
@Test
fun `test no column shrink when reformat on type is disabled`() {
// language=Markdown
val content = """
| some |
|--------------|
| some text<caret> |
""".trimIndent()
// language=Markdown
val expected = """
| some |
|--------------|
| some tex<caret> |
""".trimIndent()
configureFromFileText("some.md", content)
runWithReformatOnTypeDisabled {
backspace()
checkResultByText(expected)
}
}
@Test
fun `test no alignment correction when reformat on type is disabled`() {
// language=Markdown
val content = """
| some content |
|:------------:|
| <caret> |
""".trimIndent()
// language=Markdown
val expected = """
| some content |
|:------------:|
| some<caret> |
""".trimIndent()
configureFromFileText("some.md", content)
runWithReformatOnTypeDisabled {
type("some")
checkResultByText(expected)
}
}
private fun runWithReformatOnTypeDisabled(block: () -> Unit) {
val settings = MarkdownCodeInsightSettings.getInstance()
val old = settings.state.reformatTablesOnType
settings.state.reformatTablesOnType = false
try {
block.invoke()
}
finally {
settings.state.reformatTablesOnType = old
}
}
private fun runWithDisabledFormatting(file: PsiFile, block: () -> Unit) {
val settings = CodeStyle.getSettings(file)
val old = settings.excludedFiles.descriptors.toList()
settings.excludedFiles.addDescriptor(GlobPatternDescriptor("*.md"))
try {
block.invoke()
}
finally {
settings.excludedFiles.apply {
clear()
old.forEach(this::addDescriptor)
}
}
}
private fun doTest(content: String, expected: String, count: Int = 1, string: String = " ") {
configureFromFileText("some.md", content)
type(string.repeat(count))
checkResultByText(expected)
}
}
plugins/markdown/test/src/org/intellij/plugins/markdown/editor/tables/inspections/MarkdownIncorrectTableFormattingInspectionQuickFixTest.kt
+15
View File
@@ -19,6 +19,21 @@ class MarkdownIncorrectTableFormattingInspectionQuickFixTest: LightPlatformCodeI
private val reformatIntentionFixText
get() = MarkdownBundle.message("markdown.reformat.table.intention.text")
private val fixCellAlignmentIntentionText
get() = MarkdownBundle.message("markdown.fix.cell.alignment.intention.text")
@Test
fun `reformat intention is available without inspection`() {
myFixture.configureByText("some.md", "| first | second |\n|---|---|")
assertNotNull(myFixture.availableIntentions.find { it.text == reformatIntentionFixText })
}
@Test
fun `fix cell alignment intention is available without inspection`() {
myFixture.configureByText("some.md", "| first |\n|------:|\n| some <caret>|")
assertNotNull(myFixture.availableIntentions.find { it.text == fixCellAlignmentIntentionText })
}
@Test
fun `works with incorrectly formatted cell`() {
// language=Markdown