Skip to content

Commit 3f4b0ef

Browse files
haidubogdanhaidubogdan
committed
markdown document preview improvements
Closes #6652 - bump java release version to 17 - custom <hr> tag renderer - added flexmark strikethrough extension - update vscode regex for striketrhough detection - updated mime type to the latest official text/markdown - created new mime type for preview - using a default skeleton css code for margin, paddings ... - added font configs for markdown preview - link coloring and font size customization css to font config settings
1 parent 8c58a9d commit 3f4b0ef

25 files changed

Lines changed: 756 additions & 16 deletions

‎ide/editor.settings.storage/nbproject/project.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@
175175
<friend>org.netbeans.modules.gsf</friend>
176176
<friend>org.netbeans.modules.jvi</friend>
177177
<friend>org.netbeans.modules.languages</friend>
178+
<friend>org.netbeans.modules.markdown</friend>
178179
<friend>org.netbeans.modules.options.editor</friend>
179180
<friend>org.netbeans.modules.editor.fold</friend>
180181
<friend>org.netbeans.modules.editor.fold.nbui</friend>

‎ide/libs.flexmark/external/binaries-list‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ A3F92ABD0ACBB4D1F12DFD3D6128F73D245D6BA9 com.vladsch.flexmark:flexmark-util-data
3030
985913246DF64FE7E768EB0664B45DEDEA7536CF com.vladsch.flexmark:flexmark-util-sequence:0.64.8
3131
A8178BA6DFD7A958353A60B3A51FE7EDB1578B49 com.vladsch.flexmark:flexmark-util-visitor:0.64.8
3232
4ADC75ADA3D870908BDBFFB76650D19305250D3C com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.64.8
33+
1851E124C6D85C5C7F3FDBBE066D30A76AD6BE44 com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.64.8
3334
CD56EB47DCD4590EF6451F87E5EC33BDDD1A9A51 org.jsoup:jsoup:1.15.4

‎ide/libs.flexmark/external/flexmark-0.64.8-license.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Version: 0.64.8
33
License: BSD-flexmark
44
Description: FlexMark library
55
Origin: https://github.com/vsch/flexmark-java
6-
Files: flexmark-0.64.8.jar flexmark-ext-anchorlink-0.64.8.jar flexmark-ext-emoji-0.64.8.jar flexmark-ext-tables-0.64.8.jar flexmark-html2md-converter-0.64.8.jar flexmark-util-ast-0.64.8.jar flexmark-util-builder-0.64.8.jar flexmark-util-collection-0.64.8.jar flexmark-util-data-0.64.8.jar flexmark-util-dependency-0.64.8.jar flexmark-util-format-0.64.8.jar flexmark-util-html-0.64.8.jar flexmark-util-misc-0.64.8.jar flexmark-util-sequence-0.64.8.jar flexmark-util-visitor-0.64.8.jar flexmark-ext-gfm-tasklist-0.64.8.jar
6+
Files: flexmark-0.64.8.jar flexmark-ext-anchorlink-0.64.8.jar flexmark-ext-emoji-0.64.8.jar flexmark-ext-tables-0.64.8.jar flexmark-html2md-converter-0.64.8.jar flexmark-util-ast-0.64.8.jar flexmark-util-builder-0.64.8.jar flexmark-util-collection-0.64.8.jar flexmark-util-data-0.64.8.jar flexmark-util-dependency-0.64.8.jar flexmark-util-format-0.64.8.jar flexmark-util-html-0.64.8.jar flexmark-util-misc-0.64.8.jar flexmark-util-sequence-0.64.8.jar flexmark-util-visitor-0.64.8.jar flexmark-ext-gfm-tasklist-0.64.8.jar flexmark-ext-gfm-strikethrough-0.64.8.jar
77

88
Copyright (c) 2015-2016, Atlassian Pty Ltd
99
All rights reserved.

‎ide/libs.flexmark/manifest.mf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
22
AutoUpdate-Show-In-Client: true
33
OpenIDE-Module: org.netbeans.libs.flexmark
44
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/flexmark/Bundle.properties
5-
OpenIDE-Module-Specification-Version: 1.25
5+
OpenIDE-Module-Specification-Version: 1.26
66

‎ide/libs.flexmark/nbproject/project.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ release.external/flexmark-ext-emoji-0.64.8.jar=modules/ext/flexmark-ext-emoji-0.
3333
release.external/flexmark-ext-anchorlink-0.64.8.jar=modules/ext/flexmark-ext-anchorlink-0.64.8.jar
3434
release.external/flexmark-ext-tables-0.64.8.jar=modules/ext/flexmark-ext-tables-0.64.8.jar
3535
release.external/flexmark-ext-gfm-tasklist-0.64.8.jar=modules/ext/flexmark-ext-gfm-tasklist-0.64.8.jar
36+
release.external/flexmark-ext-gfm-strikethrough-0.64.8.jar=modules/ext/flexmark-ext-gfm-strikethrough-0.64.8.jar
3637
release.external/jsoup-1.15.4.jar=modules/ext/jsoup-1.15.4.jar
3738

3839
# Sigtest seems to have issues with some Java 11 class files, better to disable it.

‎ide/libs.flexmark/nbproject/project.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@
9797
<runtime-relative-path>ext/flexmark-ext-gfm-tasklist-0.64.8.jar</runtime-relative-path>
9898
<binary-origin>external/flexmark-ext-gfm-tasklist-0.64.8.jar</binary-origin>
9999
</class-path-extension>
100+
<class-path-extension>
101+
<runtime-relative-path>ext/flexmark-ext-gfm-strikethrough-0.64.8.jar</runtime-relative-path>
102+
<binary-origin>external/flexmark-ext-gfm-strikethrough-0.64.8.jar</binary-origin>
103+
</class-path-extension>
100104
</data>
101105
</configuration>
102106
</project>

‎ide/markdown/licenseinfo.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,10 @@
3434
<file>src/org/netbeans/modules/markdown/resources/Template.md</file>
3535
<license ref="Apache-2.0-ASF" />
3636
<comment type="TEMPLATE_MINIMAL_IP" />
37-
</fileset>
37+
</fileset>
38+
<fileset>
39+
<file>src/org/netbeans/modules/markdown/resources/Coloring.md</file>
40+
<license ref="Apache-2.0-ASF" />
41+
<comment type="TEMPLATE_MINIMAL_IP" />
42+
</fileset>
3843
</licenseinfo>

‎ide/markdown/manifest.mf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Manifest-Version: 1.0
22
AutoUpdate-Show-In-Client: true
33
OpenIDE-Module: org.netbeans.modules.markdown
4+
OpenIDE-Module-Layer: org/netbeans/modules/markdown/resources/layer.xml
45
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/markdown/Bundle.properties
56
OpenIDE-Module-Specification-Version: 1.20
67

‎ide/markdown/nbproject/project.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,33 @@
5050
<specification-version>1.15</specification-version>
5151
</run-dependency>
5252
</dependency>
53+
<dependency>
54+
<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
55+
<build-prerequisite/>
56+
<compile-dependency/>
57+
<run-dependency>
58+
<release-version>1</release-version>
59+
<specification-version>1.72</specification-version>
60+
</run-dependency>
61+
</dependency>
62+
<dependency>
63+
<code-name-base>org.netbeans.modules.editor.settings</code-name-base>
64+
<build-prerequisite/>
65+
<compile-dependency/>
66+
<run-dependency>
67+
<release-version>1</release-version>
68+
<specification-version>1.89</specification-version>
69+
</run-dependency>
70+
</dependency>
71+
<dependency>
72+
<code-name-base>org.netbeans.modules.editor.settings.storage</code-name-base>
73+
<build-prerequisite/>
74+
<compile-dependency/>
75+
<run-dependency>
76+
<release-version>1</release-version>
77+
<specification-version>1.84</specification-version>
78+
</run-dependency>
79+
</dependency>
5380
<dependency>
5481
<code-name-base>org.netbeans.modules.textmate.lexer</code-name-base>
5582
<build-prerequisite/>

‎ide/markdown/src/org/netbeans/modules/markdown/MarkdownDataObject.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@
105105
@GrammarRegistration(mimeType=MarkdownDataObject.MIME_TYPE, grammar="markdown.tmLanguage.json")
106106
public class MarkdownDataObject extends MultiDataObject {
107107

108-
public static final String MIME_TYPE = "text/x-markdown-nb";
108+
public static final String MIME_TYPE = "text/markdown";
109109

110110
public MarkdownDataObject(FileObject pf, MultiFileLoader loader) throws DataObjectExistsException, IOException {
111111
super(pf, loader);
112-
registerEditor("text/x-markdown", true);
112+
registerEditor(MIME_TYPE, true);
113113
}
114114

115115
@Override
@@ -120,7 +120,7 @@ protected int associateLookup() {
120120
@MultiViewElement.Registration(
121121
displayName = "#LBL_Markdown_EDITOR",
122122
iconBase = "org/netbeans/modules/markdown/markdown.png",
123-
mimeType = "text/x-markdown",
123+
mimeType = "text/markdown",
124124
persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED,
125125
preferredID = "Markdown",
126126
position = 1000

0 commit comments

Comments
 (0)