mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[markdown] Move markdown code from collaboration-tools to markdown-utils module
* Create markdown-utils module * Move classes to markdown-utils * Add dependency on markdown-utils in markdown-plugin, space-plugin, github-plugin GitOrigin-RevId: febe9743b9b1572dd07e807bd4bb343a32d57293
This commit is contained in:
committed by
intellij-monorepo-bot
parent
5d15c7ceb5
commit
0e57b3ef53
Generated
+1
@@ -753,6 +753,7 @@
|
||||
<module fileurl="file://$PROJECT_DIR$/platform/lvcs-impl/intellij.platform.lvcs.impl.iml" filepath="$PROJECT_DIR$/platform/lvcs-impl/intellij.platform.lvcs.impl.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/platform/macro/intellij.platform.macro.iml" filepath="$PROJECT_DIR$/platform/macro/intellij.platform.macro.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/platform/platform-main/intellij.platform.main.iml" filepath="$PROJECT_DIR$/platform/platform-main/intellij.platform.main.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/platform/markdown-utils/intellij.platform.markdown.utils.iml" filepath="$PROJECT_DIR$/platform/markdown-utils/intellij.platform.markdown.utils.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/platform/ml-impl/intellij.platform.ml.impl.iml" filepath="$PROJECT_DIR$/platform/ml-impl/intellij.platform.ml.impl.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.iml" filepath="$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.annotations.iml" filepath="$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.annotations.iml" />
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ui" />
|
||||
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
|
||||
<orderEntry type="library" name="intellij-markdown" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
// 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 com.intellij.collaboration.markdown
|
||||
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.markdown.utils
|
||||
|
||||
import com.intellij.collaboration.lang.HtmlSyntaxHighlighter
|
||||
import com.intellij.markdown.utils.lang.HtmlSyntaxHighlighter
|
||||
import com.intellij.openapi.util.text.HtmlBuilder
|
||||
import com.intellij.openapi.util.text.HtmlChunk
|
||||
import org.intellij.markdown.MarkdownTokenTypes
|
||||
+4
-2
@@ -1,13 +1,15 @@
|
||||
// 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 com.intellij.collaboration.markdown
|
||||
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.markdown.utils
|
||||
|
||||
import com.intellij.openapi.util.NlsSafe
|
||||
import org.intellij.markdown.flavours.MarkdownFlavourDescriptor
|
||||
import org.intellij.markdown.html.HtmlGenerator
|
||||
import org.intellij.markdown.parser.LinkMap
|
||||
import org.intellij.markdown.parser.MarkdownParser
|
||||
import org.jetbrains.annotations.ApiStatus
|
||||
import java.net.URI
|
||||
|
||||
@ApiStatus.Internal
|
||||
class MarkdownToHtmlConverter(
|
||||
private val flavourDescriptor: MarkdownFlavourDescriptor
|
||||
) {
|
||||
+3
-3
@@ -1,8 +1,8 @@
|
||||
// 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 com.intellij.collaboration.lang
|
||||
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.markdown.utils.lang
|
||||
|
||||
import com.intellij.collaboration.lang.HtmlSyntaxHighlighter.Companion.colorHtmlChunk
|
||||
import com.intellij.lang.Language
|
||||
import com.intellij.markdown.utils.lang.HtmlSyntaxHighlighter.Companion.colorHtmlChunk
|
||||
import com.intellij.openapi.project.Project
|
||||
import com.intellij.openapi.util.NlsSafe
|
||||
import com.intellij.openapi.util.text.HtmlChunk
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
// 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 com.intellij.collaboration.lang
|
||||
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.markdown.utils.lang
|
||||
|
||||
import com.intellij.lang.Language
|
||||
import com.intellij.openapi.editor.colors.EditorColorsManager
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
// 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 com.intellij.collaboration.markdown
|
||||
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.markdown.utils
|
||||
|
||||
import com.intellij.collaboration.lang.HtmlSyntaxHighlighter
|
||||
import com.intellij.markdown.utils.lang.HtmlSyntaxHighlighter
|
||||
import com.intellij.openapi.util.text.HtmlChunk
|
||||
import org.intellij.markdown.IElementType
|
||||
import org.intellij.markdown.MarkdownElementTypes
|
||||
@@ -48,6 +48,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
|
||||
<orderEntry type="library" name="caffeine" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.collaborationTools.auth" />
|
||||
<orderEntry type="module" module-name="intellij.platform.markdown.utils" />
|
||||
<orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
|
||||
<orderEntry type="library" name="intellij-markdown" level="project" />
|
||||
</component>
|
||||
|
||||
+4
-4
@@ -1,10 +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.jetbrains.plugins.github.pullrequest.comment
|
||||
|
||||
import com.intellij.collaboration.lang.CodeBlockHtmlSyntaxHighlighter
|
||||
import com.intellij.collaboration.lang.HtmlSyntaxHighlighter
|
||||
import com.intellij.collaboration.markdown.CodeFenceSyntaxHighlighterGeneratingProvider
|
||||
import com.intellij.collaboration.markdown.MarkdownToHtmlConverter
|
||||
import com.intellij.markdown.utils.CodeFenceSyntaxHighlighterGeneratingProvider
|
||||
import com.intellij.markdown.utils.MarkdownToHtmlConverter
|
||||
import com.intellij.markdown.utils.lang.CodeBlockHtmlSyntaxHighlighter
|
||||
import com.intellij.markdown.utils.lang.HtmlSyntaxHighlighter
|
||||
import com.intellij.openapi.project.Project
|
||||
import com.intellij.openapi.util.NlsSafe
|
||||
import org.intellij.markdown.IElementType
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
// 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.jetbrains.plugins.github.pullrequest.comment
|
||||
|
||||
import com.intellij.collaboration.lang.HtmlSyntaxHighlighter
|
||||
import com.intellij.collaboration.lang.HtmlSyntaxHighlighter.Companion.colorHtmlChunk
|
||||
import com.intellij.lang.Language
|
||||
import com.intellij.markdown.utils.lang.HtmlSyntaxHighlighter
|
||||
import com.intellij.markdown.utils.lang.HtmlSyntaxHighlighter.Companion.colorHtmlChunk
|
||||
import com.intellij.openapi.diff.DiffColors
|
||||
import com.intellij.openapi.diff.impl.patch.PatchHunk
|
||||
import com.intellij.openapi.diff.impl.patch.PatchLine
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
|
||||
<orderEntry type="module" module-name="intellij.platform.collaborationTools" />
|
||||
<orderEntry type="module" module-name="intellij.platform.markdown.utils" />
|
||||
<orderEntry type="library" name="jackson" level="project" />
|
||||
<orderEntry type="library" name="jackson-databind" level="project" />
|
||||
<orderEntry type="library" name="jackson-module-kotlin" level="project" />
|
||||
|
||||
+1
-1
@@ -1,8 +1,8 @@
|
||||
// Copyright 2000-2020 JetBrains s.r.o. 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.extensions.common.highlighter
|
||||
|
||||
import com.intellij.collaboration.lang.HtmlSyntaxHighlighter
|
||||
import com.intellij.lang.Language
|
||||
import com.intellij.markdown.utils.lang.HtmlSyntaxHighlighter
|
||||
import com.intellij.openapi.vfs.VirtualFile
|
||||
import com.intellij.ui.ColorUtil
|
||||
import org.intellij.markdown.MarkdownTokenTypes
|
||||
|
||||
Reference in New Issue
Block a user