Skip to content

Commit fa0b298

Browse files
author
madflow
committed
Continued language integration
1 parent 733b980 commit fa0b298

10 files changed

Lines changed: 553 additions & 176 deletions

File tree

‎build.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
3-
<!-- for some information on what you could do (e.g. targets to override). -->
4-
<!-- If you delete this file and reopen the project it will be recreated. -->
5-
<project name="flow.netbeans.markdown" default="netbeans" basedir=".">
6-
<description>Builds, tests, and runs the project flow.netbeans.markdown.</description>
7-
<import file="nbproject/build-impl.xml"/>
8-
</project>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
3+
<!-- for some information on what you could do (e.g. targets to override). -->
4+
<!-- If you delete this file and reopen the project it will be recreated. -->
5+
<project name="flow.netbeans.markdown" default="netbeans" basedir=".">
6+
<description>Builds, tests, and runs the project flow.netbeans.markdown.</description>
7+
<import file="nbproject/build-impl.xml"/>
8+
</project>

‎nbproject/build-impl.xml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
*** GENERATED FROM project.xml - DO NOT EDIT ***
4-
*** EDIT ../build.xml INSTEAD ***
5-
-->
6-
<project name="flow.netbeans.markdown-impl" basedir="..">
7-
<property file="nbproject/private/platform-private.properties"/>
8-
<property file="nbproject/platform.properties"/>
9-
<macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
10-
<attribute name="name"/>
11-
<attribute name="value"/>
12-
<sequential>
13-
<property name="@{name}" value="${@{value}}"/>
14-
</sequential>
15-
</macrodef>
16-
<property file="${user.properties.file}"/>
17-
<nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
18-
<nbmproject2:property name="netbeans.dest.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
19-
<fail message="You must define 'nbplatform.${nbplatform.active}.harness.dir'">
20-
<condition>
21-
<not>
22-
<available file="${harness.dir}" type="dir"/>
23-
</not>
24-
</condition>
25-
</fail>
26-
<import file="${harness.dir}/build.xml"/>
27-
</project>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
*** GENERATED FROM project.xml - DO NOT EDIT ***
4+
*** EDIT ../build.xml INSTEAD ***
5+
-->
6+
<project name="flow.netbeans.markdown-impl" basedir="..">
7+
<property file="nbproject/private/platform-private.properties"/>
8+
<property file="nbproject/platform.properties"/>
9+
<macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
10+
<attribute name="name"/>
11+
<attribute name="value"/>
12+
<sequential>
13+
<property name="@{name}" value="${@{value}}"/>
14+
</sequential>
15+
</macrodef>
16+
<property file="${user.properties.file}"/>
17+
<nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
18+
<nbmproject2:property name="netbeans.dest.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
19+
<fail message="You must define 'nbplatform.${nbplatform.active}.harness.dir'">
20+
<condition>
21+
<not>
22+
<available file="${harness.dir}" type="dir"/>
23+
</not>
24+
</condition>
25+
</fail>
26+
<import file="${harness.dir}/build.xml"/>
27+
</project>

‎nbproject/genfiles.properties‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
build.xml.data.CRC32=3a189c10
2-
build.xml.script.CRC32=1b4e1375
3-
build.xml.stylesheet.CRC32=a56c6a5b@2.47.2
4-
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
5-
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6-
nbproject/build-impl.xml.data.CRC32=3a189c10
7-
nbproject/build-impl.xml.script.CRC32=758052b0
8-
nbproject/build-impl.xml.stylesheet.CRC32=68e521fc@2.47.2
1+
build.xml.data.CRC32=0fba034d
2+
build.xml.script.CRC32=1b4e1375
3+
build.xml.stylesheet.CRC32=a56c6a5b@2.47.2
4+
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
5+
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6+
nbproject/build-impl.xml.data.CRC32=0fba034d
7+
nbproject/build-impl.xml.script.CRC32=758052b0
8+
nbproject/build-impl.xml.stylesheet.CRC32=68e521fc@2.47.2

‎nbproject/platform.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nbplatform.active=NetBeans_IDE_7.0_(Build_201104080000)
1+
nbplatform.active=default

‎nbproject/project.xml‎

Lines changed: 133 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,133 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://www.netbeans.org/ns/project/1">
3-
<type>org.netbeans.modules.apisupport.project</type>
4-
<configuration>
5-
<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
6-
<code-name-base>flow.netbeans.markdown</code-name-base>
7-
<standalone/>
8-
<module-dependencies>
9-
<dependency>
10-
<code-name-base>org.netbeans.modules.settings</code-name-base>
11-
<build-prerequisite/>
12-
<compile-dependency/>
13-
<run-dependency>
14-
<release-version>1</release-version>
15-
<specification-version>1.30.1</specification-version>
16-
</run-dependency>
17-
</dependency>
18-
<dependency>
19-
<code-name-base>org.openide.awt</code-name-base>
20-
<build-prerequisite/>
21-
<compile-dependency/>
22-
<run-dependency>
23-
<specification-version>7.30.1</specification-version>
24-
</run-dependency>
25-
</dependency>
26-
<dependency>
27-
<code-name-base>org.openide.dialogs</code-name-base>
28-
<build-prerequisite/>
29-
<compile-dependency/>
30-
<run-dependency>
31-
<specification-version>7.18.1</specification-version>
32-
</run-dependency>
33-
</dependency>
34-
<dependency>
35-
<code-name-base>org.openide.filesystems</code-name-base>
36-
<build-prerequisite/>
37-
<compile-dependency/>
38-
<run-dependency>
39-
<specification-version>7.46.1</specification-version>
40-
</run-dependency>
41-
</dependency>
42-
<dependency>
43-
<code-name-base>org.openide.loaders</code-name-base>
44-
<build-prerequisite/>
45-
<compile-dependency/>
46-
<run-dependency>
47-
<specification-version>7.20.1</specification-version>
48-
</run-dependency>
49-
</dependency>
50-
<dependency>
51-
<code-name-base>org.openide.nodes</code-name-base>
52-
<build-prerequisite/>
53-
<compile-dependency/>
54-
<run-dependency>
55-
<specification-version>7.20.1</specification-version>
56-
</run-dependency>
57-
</dependency>
58-
<dependency>
59-
<code-name-base>org.openide.text</code-name-base>
60-
<build-prerequisite/>
61-
<compile-dependency/>
62-
<run-dependency>
63-
<specification-version>6.36.1</specification-version>
64-
</run-dependency>
65-
</dependency>
66-
<dependency>
67-
<code-name-base>org.openide.util</code-name-base>
68-
<build-prerequisite/>
69-
<compile-dependency/>
70-
<run-dependency>
71-
<specification-version>8.14.1</specification-version>
72-
</run-dependency>
73-
</dependency>
74-
<dependency>
75-
<code-name-base>org.openide.util.lookup</code-name-base>
76-
<build-prerequisite/>
77-
<compile-dependency/>
78-
<run-dependency>
79-
<specification-version>8.6.1</specification-version>
80-
</run-dependency>
81-
</dependency>
82-
<dependency>
83-
<code-name-base>org.openide.windows</code-name-base>
84-
<build-prerequisite/>
85-
<compile-dependency/>
86-
<run-dependency>
87-
<specification-version>6.39.1</specification-version>
88-
</run-dependency>
89-
</dependency>
90-
</module-dependencies>
91-
<public-packages>
92-
<package>flow.netbeans.markdown</package>
93-
</public-packages>
94-
<class-path-extension>
95-
<runtime-relative-path>ext/parboiled-core-1.0.2.jar</runtime-relative-path>
96-
<binary-origin>release/modules/ext/parboiled-core-1.0.2.jar</binary-origin>
97-
</class-path-extension>
98-
<class-path-extension>
99-
<runtime-relative-path>ext/asm-3.3.1.jar</runtime-relative-path>
100-
<binary-origin>release/modules/ext/asm-3.3.1.jar</binary-origin>
101-
</class-path-extension>
102-
<class-path-extension>
103-
<runtime-relative-path>ext/asm-tree-3.3.1.jar</runtime-relative-path>
104-
<binary-origin>release/modules/ext/asm-tree-3.3.1.jar</binary-origin>
105-
</class-path-extension>
106-
<class-path-extension>
107-
<runtime-relative-path>ext/asm-analysis-3.3.1.jar</runtime-relative-path>
108-
<binary-origin>release/modules/ext/asm-analysis-3.3.1.jar</binary-origin>
109-
</class-path-extension>
110-
<class-path-extension>
111-
<runtime-relative-path>ext/pegdown-1.1.0.jar</runtime-relative-path>
112-
<binary-origin>release/modules/ext/pegdown-1.1.0.jar</binary-origin>
113-
</class-path-extension>
114-
<class-path-extension>
115-
<runtime-relative-path>ext/parboiled-java-1.0.2.jar</runtime-relative-path>
116-
<binary-origin>release/modules/ext/parboiled-java-1.0.2.jar</binary-origin>
117-
</class-path-extension>
118-
<class-path-extension>
119-
<runtime-relative-path>ext/asm-util-3.3.1.jar</runtime-relative-path>
120-
<binary-origin>release/modules/ext/asm-util-3.3.1.jar</binary-origin>
121-
</class-path-extension>
122-
</data>
123-
</configuration>
124-
</project>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://www.netbeans.org/ns/project/1">
3+
<type>org.netbeans.modules.apisupport.project</type>
4+
<configuration>
5+
<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
6+
<code-name-base>flow.netbeans.markdown</code-name-base>
7+
<standalone/>
8+
<module-dependencies>
9+
<dependency>
10+
<code-name-base>org.netbeans.modules.lexer</code-name-base>
11+
<build-prerequisite/>
12+
<compile-dependency/>
13+
<run-dependency>
14+
<release-version>2</release-version>
15+
<specification-version>1.42.1.1</specification-version>
16+
</run-dependency>
17+
</dependency>
18+
<dependency>
19+
<code-name-base>org.netbeans.modules.settings</code-name-base>
20+
<build-prerequisite/>
21+
<compile-dependency/>
22+
<run-dependency>
23+
<release-version>1</release-version>
24+
<specification-version>1.30.1</specification-version>
25+
</run-dependency>
26+
</dependency>
27+
<dependency>
28+
<code-name-base>org.openide.awt</code-name-base>
29+
<build-prerequisite/>
30+
<compile-dependency/>
31+
<run-dependency>
32+
<specification-version>7.30.1</specification-version>
33+
</run-dependency>
34+
</dependency>
35+
<dependency>
36+
<code-name-base>org.openide.dialogs</code-name-base>
37+
<build-prerequisite/>
38+
<compile-dependency/>
39+
<run-dependency>
40+
<specification-version>7.18.1</specification-version>
41+
</run-dependency>
42+
</dependency>
43+
<dependency>
44+
<code-name-base>org.openide.filesystems</code-name-base>
45+
<build-prerequisite/>
46+
<compile-dependency/>
47+
<run-dependency>
48+
<specification-version>7.46.1</specification-version>
49+
</run-dependency>
50+
</dependency>
51+
<dependency>
52+
<code-name-base>org.openide.loaders</code-name-base>
53+
<build-prerequisite/>
54+
<compile-dependency/>
55+
<run-dependency>
56+
<specification-version>7.20.1</specification-version>
57+
</run-dependency>
58+
</dependency>
59+
<dependency>
60+
<code-name-base>org.openide.nodes</code-name-base>
61+
<build-prerequisite/>
62+
<compile-dependency/>
63+
<run-dependency>
64+
<specification-version>7.20.1</specification-version>
65+
</run-dependency>
66+
</dependency>
67+
<dependency>
68+
<code-name-base>org.openide.text</code-name-base>
69+
<build-prerequisite/>
70+
<compile-dependency/>
71+
<run-dependency>
72+
<specification-version>6.36.1</specification-version>
73+
</run-dependency>
74+
</dependency>
75+
<dependency>
76+
<code-name-base>org.openide.util</code-name-base>
77+
<build-prerequisite/>
78+
<compile-dependency/>
79+
<run-dependency>
80+
<specification-version>8.14.1</specification-version>
81+
</run-dependency>
82+
</dependency>
83+
<dependency>
84+
<code-name-base>org.openide.util.lookup</code-name-base>
85+
<build-prerequisite/>
86+
<compile-dependency/>
87+
<run-dependency>
88+
<specification-version>8.6.1</specification-version>
89+
</run-dependency>
90+
</dependency>
91+
<dependency>
92+
<code-name-base>org.openide.windows</code-name-base>
93+
<build-prerequisite/>
94+
<compile-dependency/>
95+
<run-dependency>
96+
<specification-version>6.39.1</specification-version>
97+
</run-dependency>
98+
</dependency>
99+
</module-dependencies>
100+
<public-packages>
101+
<package>flow.netbeans.markdown</package>
102+
</public-packages>
103+
<class-path-extension>
104+
<runtime-relative-path>ext/parboiled-core-1.0.2.jar</runtime-relative-path>
105+
<binary-origin>release/modules/ext/parboiled-core-1.0.2.jar</binary-origin>
106+
</class-path-extension>
107+
<class-path-extension>
108+
<runtime-relative-path>ext/asm-3.3.1.jar</runtime-relative-path>
109+
<binary-origin>release/modules/ext/asm-3.3.1.jar</binary-origin>
110+
</class-path-extension>
111+
<class-path-extension>
112+
<runtime-relative-path>ext/asm-tree-3.3.1.jar</runtime-relative-path>
113+
<binary-origin>release/modules/ext/asm-tree-3.3.1.jar</binary-origin>
114+
</class-path-extension>
115+
<class-path-extension>
116+
<runtime-relative-path>ext/asm-analysis-3.3.1.jar</runtime-relative-path>
117+
<binary-origin>release/modules/ext/asm-analysis-3.3.1.jar</binary-origin>
118+
</class-path-extension>
119+
<class-path-extension>
120+
<runtime-relative-path>ext/pegdown-1.1.0.jar</runtime-relative-path>
121+
<binary-origin>release/modules/ext/pegdown-1.1.0.jar</binary-origin>
122+
</class-path-extension>
123+
<class-path-extension>
124+
<runtime-relative-path>ext/parboiled-java-1.0.2.jar</runtime-relative-path>
125+
<binary-origin>release/modules/ext/parboiled-java-1.0.2.jar</binary-origin>
126+
</class-path-extension>
127+
<class-path-extension>
128+
<runtime-relative-path>ext/asm-util-3.3.1.jar</runtime-relative-path>
129+
<binary-origin>release/modules/ext/asm-util-3.3.1.jar</binary-origin>
130+
</class-path-extension>
131+
</data>
132+
</configuration>
133+
</project>

‎src/flow/netbeans/markdown/Bundle.properties‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
CTL_MarkdownAction=Markdown
2-
CTL_MarkdownTopComponent=Markdown Window
3-
HINT_MarkdownTopComponent=This is a Markdown window
4-
OpenIDE-Module-Display-Category=Languages Support
5-
OpenIDE-Module-Name=Markdown File Support
6-
OpenIDE-Module-Short-Description=Markdown file support for the Netbeans IDE
7-
Services/MIMEResolver/MarkdownResolver.xml=Markdown Files
8-
Templates/Other/MarkdownTemplate.md=Markdown file
1+
CTL_MarkdownAction=Markdown
2+
CTL_MarkdownTopComponent=Markdown Window
3+
HINT_MarkdownTopComponent=This is a Markdown window
4+
OpenIDE-Module-Display-Category=Languages Support
5+
OpenIDE-Module-Name=Markdown File Support
6+
OpenIDE-Module-Short-Description=Markdown file support for the Netbeans IDE
7+
Services/MIMEResolver/MarkdownResolver.xml=Markdown Files
8+
Templates/Other/MarkdownTemplate.md=Markdown file

‎src/flow/netbeans/markdown/highlighter/MarkdownLanguageHierarchy.java‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package flow.netbeans.markdown.highlighter;
2+
3+
import java.util.Collection;
4+
import java.util.EnumSet;
5+
import org.netbeans.spi.lexer.LanguageHierarchy;
6+
import org.netbeans.spi.lexer.Lexer;
7+
import org.netbeans.spi.lexer.LexerRestartInfo;
8+
9+
public class MarkdownLanguageHierarchy extends LanguageHierarchy<MarkdownTokenId> {
10+
11+
@Override
12+
protected synchronized Collection<MarkdownTokenId> createTokenIds () {
13+
return EnumSet.allOf (MarkdownTokenId.class);
14+
}
15+
16+
@Override
17+
protected Lexer<MarkdownTokenId> createLexer (LexerRestartInfo<MarkdownTokenId> info) {
18+
return new MarkdownLexer(info);
19+
}
20+
21+
@Override
22+
protected String mimeType () {
23+
return "text/x-markdown";
24+
}
25+
26+
}

0 commit comments

Comments
 (0)