[Markdown] Refactor MarkdownLanguageUtils

GitOrigin-RevId: d835001806fb9b4f8895bbd2b266ab84b1dd2d70

plugins/markdown/core/src/org/intellij/plugins/markdown/editor/MarkdownParagraphFillHandler.kt

@@ -4,7 +4,7 @@ import com.intellij.codeInsight.editorActions.fillParagraph.ParagraphFillHandler
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.util.parentOfType
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownLanguage
+import org.intellij.plugins.markdown.lang.isMarkdownLanguage
 import org.intellij.plugins.markdown.lang.MarkdownTokenTypes
 import org.intellij.plugins.markdown.lang.psi.impl.MarkdownParagraph
 import org.intellij.plugins.markdown.lang.psi.util.hasType

plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/actions/column/ColumnBasedTableAction.kt

@@ -10,8 +10,7 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.psi.PsiFile
 import org.intellij.plugins.markdown.editor.tables.TableUtils
 import org.intellij.plugins.markdown.editor.tables.actions.TableActionKeys
-import org.intellij.plugins.markdown.lang.MarkdownLanguage
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownLanguage
+import org.intellij.plugins.markdown.lang.isMarkdownLanguage
 import org.intellij.plugins.markdown.lang.psi.impl.MarkdownTable
 
 /**

plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/actions/column/SetColumnAlignmentAction.kt

@@ -10,7 +10,7 @@ import com.intellij.openapi.command.executeCommand
 import org.intellij.plugins.markdown.editor.tables.TableModificationUtils.hasCorrectBorders
 import org.intellij.plugins.markdown.editor.tables.TableModificationUtils.updateColumnAlignment
 import org.intellij.plugins.markdown.editor.tables.TableUtils.getColumnAlignment
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownLanguage
+import org.intellij.plugins.markdown.lang.isMarkdownLanguage
 import org.intellij.plugins.markdown.lang.psi.impl.MarkdownTableSeparatorRow
 
 internal abstract class SetColumnAlignmentAction(private val alignment: MarkdownTableSeparatorRow.CellAlignment): ToggleAction() {

plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/actions/column/TableColumnAlignmentActionsGroup.kt

@@ -6,7 +6,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.actionSystem.DefaultActionGroup
 import org.intellij.plugins.markdown.editor.tables.TableModificationUtils.hasCorrectBorders
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownLanguage
+import org.intellij.plugins.markdown.lang.isMarkdownLanguage
 
 internal class TableColumnAlignmentActionsGroup: DefaultActionGroup() {
   override fun update(event: AnActionEvent) {

plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/actions/row/RowBasedTableAction.kt

@@ -8,7 +8,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import org.intellij.plugins.markdown.editor.tables.TableUtils
 import org.intellij.plugins.markdown.editor.tables.actions.TableActionKeys
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownLanguage
+import org.intellij.plugins.markdown.lang.isMarkdownLanguage
 import org.intellij.plugins.markdown.lang.psi.impl.MarkdownTable
 import org.intellij.plugins.markdown.lang.psi.impl.MarkdownTableRow
 import org.intellij.plugins.markdown.lang.psi.impl.MarkdownTableSeparatorRow

plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/handlers/MarkdownTableBackspaceHandler.kt

@@ -12,7 +12,7 @@ import org.intellij.plugins.markdown.editor.tables.TableFormattingUtils.reformat
 import org.intellij.plugins.markdown.editor.tables.TableModificationUtils.modifyColumn
 import org.intellij.plugins.markdown.editor.tables.TableUtils
 import org.intellij.plugins.markdown.editor.tables.TableUtils.separatorRow
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownType
+import org.intellij.plugins.markdown.lang.isMarkdownType
 import org.intellij.plugins.markdown.lang.psi.impl.MarkdownTableSeparatorRow
 
 internal class MarkdownTableBackspaceHandler: BackspaceHandlerDelegate() {

plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/handlers/MarkdownTableTypedHandler.kt

@@ -9,7 +9,7 @@ import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiFile
 import org.intellij.plugins.markdown.editor.tables.TableFormattingUtils.reformatColumnOnChange
 import org.intellij.plugins.markdown.editor.tables.TableUtils
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownType
+import org.intellij.plugins.markdown.lang.isMarkdownType
 
 internal class MarkdownTableTypedHandler: TypedHandlerDelegate() {
   override fun charTyped(char: Char, project: Project, editor: Editor, file: PsiFile): Result {

plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ui/MarkdownTableInlayProvider.kt

@@ -13,7 +13,7 @@ import org.intellij.plugins.markdown.editor.tables.TableUtils.calculateActualTex
 import org.intellij.plugins.markdown.editor.tables.TableUtils.separatorRow
 import org.intellij.plugins.markdown.editor.tables.ui.presentation.HorizontalBarPresentation
 import org.intellij.plugins.markdown.editor.tables.ui.presentation.VerticalBarPresentation
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownType
+import org.intellij.plugins.markdown.lang.isMarkdownType
 import org.intellij.plugins.markdown.lang.psi.impl.MarkdownTable
 import org.intellij.plugins.markdown.lang.psi.impl.MarkdownTableRow
 import org.intellij.plugins.markdown.lang.psi.impl.MarkdownTableSeparatorRow

plugins/markdown/core/src/org/intellij/plugins/markdown/injection/MarkdownCodeFenceErrorHighlightingIntention.kt

@@ -16,7 +16,7 @@ import com.intellij.psi.PsiManager
 import com.intellij.psi.util.PsiTreeUtil
 import org.intellij.plugins.markdown.MarkdownBundle
 import org.intellij.plugins.markdown.lang.MarkdownFileType
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.hasMarkdownType
+import org.intellij.plugins.markdown.lang.hasMarkdownType
 import org.intellij.plugins.markdown.lang.psi.impl.MarkdownCodeFence
 import org.intellij.plugins.markdown.settings.MarkdownSettings
 import org.intellij.plugins.markdown.ui.MarkdownNotifications

plugins/markdown/core/src/org/intellij/plugins/markdown/lang/MarkdownLanguageUtils.kt

@@ -5,16 +5,14 @@ import com.intellij.openapi.fileTypes.FileType
 import com.intellij.openapi.fileTypes.FileTypeRegistry
 import com.intellij.openapi.vfs.VirtualFile
 
-object MarkdownLanguageUtils {
-  fun Language.isMarkdownLanguage(): Boolean {
-    return this == MarkdownLanguage.INSTANCE
-  }
-
-  fun FileType.isMarkdownType(): Boolean {
-    return this == MarkdownFileType.INSTANCE
-  }
-
-  fun VirtualFile.hasMarkdownType(): Boolean {
-    return FileTypeRegistry.getInstance().isFileOfType(this, MarkdownFileType.INSTANCE)
-  }
+fun Language.isMarkdownLanguage(): Boolean {
+  return this == MarkdownLanguage.INSTANCE
+}
+
+fun FileType.isMarkdownType(): Boolean {
+  return this == MarkdownFileType.INSTANCE
+}
+
+fun VirtualFile.hasMarkdownType(): Boolean {
+  return FileTypeRegistry.getInstance().isFileOfType(this, MarkdownFileType.INSTANCE)
 }

plugins/markdown/core/src/org/intellij/plugins/markdown/lang/formatter/TablePostFormatProcessor.kt

@@ -9,7 +9,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings
 import com.intellij.psi.impl.source.codeStyle.PostFormatProcessor
 import com.intellij.psi.util.siblings
 import org.intellij.plugins.markdown.editor.tables.TableFormattingUtils
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownLanguage
+import org.intellij.plugins.markdown.lang.isMarkdownLanguage
 import org.intellij.plugins.markdown.lang.formatter.settings.MarkdownCustomCodeStyleSettings
 import org.intellij.plugins.markdown.lang.psi.impl.MarkdownFile
 import org.intellij.plugins.markdown.lang.psi.impl.MarkdownTable

plugins/markdown/core/src/org/intellij/plugins/markdown/lang/references/paths/FileWithoutExtensionReference.kt

@@ -9,7 +9,7 @@ import com.intellij.psi.PsiReferenceBase
 import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReference
 import com.intellij.psi.util.PsiUtilCore
 import org.intellij.plugins.markdown.lang.MarkdownFileType
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownType
+import org.intellij.plugins.markdown.lang.isMarkdownType
 import org.jetbrains.annotations.ApiStatus
 
 @ApiStatus.Internal

plugins/markdown/core/src/org/intellij/plugins/markdown/ui/actions/InsertAction.kt

@@ -8,7 +8,7 @@ import com.intellij.openapi.actionSystem.ex.ActionUtil
 import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.openapi.ui.popup.JBPopupFactory
 import org.intellij.plugins.markdown.MarkdownBundle
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownLanguage
+import org.intellij.plugins.markdown.lang.isMarkdownLanguage
 
 internal class InsertAction: DumbAwareAction() {
   override fun getActionUpdateThread(): ActionUpdateThread {

plugins/markdown/core/src/org/intellij/plugins/markdown/ui/actions/MarkdownActionPromoter.kt

@@ -2,7 +2,7 @@
 package org.intellij.plugins.markdown.ui.actions
 
 import com.intellij.openapi.actionSystem.*
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.hasMarkdownType
+import org.intellij.plugins.markdown.lang.hasMarkdownType
 
 internal class MarkdownActionPromoter: ActionPromoter {
   companion object {

plugins/markdown/core/src/org/intellij/plugins/markdown/ui/actions/MarkdownActionUtil.kt

@@ -15,7 +15,7 @@ import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.util.PsiUtilBase
 import com.intellij.psi.util.parents
 import com.intellij.util.concurrency.annotations.RequiresEdt
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownLanguage
+import org.intellij.plugins.markdown.lang.isMarkdownLanguage
 import org.intellij.plugins.markdown.lang.psi.util.hasType
 import org.intellij.plugins.markdown.ui.preview.MarkdownEditorWithPreview
 import org.intellij.plugins.markdown.ui.preview.MarkdownPreviewFileEditor

plugins/markdown/core/src/org/intellij/plugins/markdown/ui/floating/AddFloatingToolbarTextEditorCustomizer.kt

@@ -7,7 +7,7 @@ import com.intellij.openapi.fileEditor.impl.text.TextEditorCustomizer
 import com.intellij.openapi.options.advanced.AdvancedSettings
 import com.intellij.openapi.util.Disposer
 import org.intellij.plugins.markdown.lang.MarkdownLanguage
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.hasMarkdownType
+import org.intellij.plugins.markdown.lang.hasMarkdownType
 import org.intellij.plugins.markdown.util.MarkdownPluginScope
 
 private class AddFloatingToolbarTextEditorCustomizer: TextEditorCustomizer {

plugins/markdown/core/src/org/intellij/plugins/markdown/ui/preview/MarkdownPreviewFileEditorProvider.kt

@@ -7,8 +7,8 @@ import com.intellij.openapi.fileEditor.FileEditorPolicy
 import com.intellij.openapi.fileEditor.WeighedFileEditorProvider
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.hasMarkdownType
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownLanguage
+import org.intellij.plugins.markdown.lang.hasMarkdownType
+import org.intellij.plugins.markdown.lang.isMarkdownLanguage
 
 internal class MarkdownPreviewFileEditorProvider: WeighedFileEditorProvider() {
   override fun accept(project: Project, file: VirtualFile): Boolean {

plugins/markdown/core/src/org/intellij/plugins/markdown/ui/projectTree/MarkdownFileRenameHandler.kt

@@ -9,7 +9,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.refactoring.RefactoringActionHandlerFactory
 import com.intellij.refactoring.rename.RenameHandler
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.hasMarkdownType
+import org.intellij.plugins.markdown.lang.hasMarkdownType
 import org.intellij.plugins.markdown.lang.psi.impl.MarkdownFile
 
 internal class MarkdownFileRenameHandler: RenameHandler {

plugins/markdown/images/src/main/kotlin/org/intellij/plugins/markdown/images/editor/paste/FileLinkPasteProvider.kt

@@ -11,7 +11,7 @@ import com.intellij.openapi.editor.actions.PasteAction
 import com.intellij.openapi.ide.CopyPasteManager
 import com.intellij.psi.util.PsiEditorUtil
 import org.intellij.plugins.markdown.editor.runForEachCaret
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownType
+import org.intellij.plugins.markdown.lang.isMarkdownType
 import org.intellij.plugins.markdown.settings.MarkdownCodeInsightSettings
 import java.awt.datatransfer.DataFlavor
 

plugins/markdown/images/src/main/kotlin/org/intellij/plugins/markdown/images/editor/paste/MarkdownFileDropHandler.kt

@@ -18,7 +18,7 @@ import org.intellij.images.fileTypes.impl.SvgFileType
 import org.intellij.plugins.markdown.editor.runForEachCaret
 import org.intellij.plugins.markdown.images.MarkdownImagesBundle
 import org.intellij.plugins.markdown.images.editor.ImageUtils
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownLanguage
+import org.intellij.plugins.markdown.lang.isMarkdownLanguage
 import org.intellij.plugins.markdown.settings.MarkdownCodeInsightSettings
 import java.awt.datatransfer.Transferable
 import java.net.URLEncoder

plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/headers/html/HtmlAnchorSymbol.kt

@@ -13,7 +13,7 @@ import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.search.SearchScope
 import org.intellij.plugins.markdown.MarkdownBundle
 import org.intellij.plugins.markdown.MarkdownIcons
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownLanguage
+import org.intellij.plugins.markdown.lang.isMarkdownLanguage
 import org.intellij.plugins.markdown.model.psi.MarkdownSymbolInsideInjection
 import org.intellij.plugins.markdown.model.psi.headers.MarkdownHeaderSymbol
 import org.intellij.plugins.markdown.model.psi.withLocationIn

plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/headers/html/HtmlAnchors.kt

@@ -6,7 +6,7 @@ import com.intellij.psi.PsiFile
 import com.intellij.psi.util.parentOfType
 import com.intellij.psi.xml.XmlAttribute
 import com.intellij.psi.xml.XmlAttributeValue
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownLanguage
+import org.intellij.plugins.markdown.lang.isMarkdownLanguage
 import org.intellij.plugins.markdown.lang.psi.impl.MarkdownFile
 
 internal fun XmlAttributeValue.isValidAnchorAttributeValue(): Boolean {

plugins/markdown/xml/src/main/kotlin/org/intellij/plugins/markdown/xml/DefaultMarkdownFileViewProvider.kt

@@ -12,7 +12,7 @@ import com.intellij.psi.impl.source.PsiFileImpl
 import com.intellij.psi.templateLanguages.TemplateLanguageFileViewProvider
 import org.intellij.plugins.markdown.lang.MarkdownElementTypes.MARKDOWN_TEMPLATE_DATA
 import org.intellij.plugins.markdown.lang.MarkdownLanguage
-import org.intellij.plugins.markdown.lang.MarkdownLanguageUtils.isMarkdownLanguage
+import org.intellij.plugins.markdown.lang.isMarkdownLanguage
 import org.intellij.plugins.markdown.lang.parser.createMarkdownFile
 import org.jetbrains.annotations.ApiStatus