Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: re-enable markdown syntax after language pack update #554

Merged
merged 2 commits into from
Jun 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions org.eclipse.tm4e.language_pack/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ for the [Eclipse IDE](https://eclipseide.org).
| [HTML](https://en.wikipedia.org/wiki/HTML) | *.html, *.htm, *.shtml, *.xhtml, *.xht, *.mdoc, *.jsp, *.asp, *.aspx, *.jshtm, *.volt, *.ejs, *.rhtml |
| [INI File](https://en.wikipedia.org/wiki/INI%20file) | *.ini |
| [Java](https://en.wikipedia.org/wiki/Java%20%28programming%20language%29) | *.java, *.jav |
| [JavaScript React](https://en.wikipedia.org/wiki/React%20%28JavaScript%20library%29) | *.jsx |
| [JavaScript JSX](https://en.wikipedia.org/wiki/JSX%20%28JavaScript%29) | *.jsx |
| [JavaScript](https://en.wikipedia.org/wiki/JavaScript) | *.js, *.es6, *.mjs, *.cjs, *.pac, jakefile |
| [JSON](https://en.wikipedia.org/wiki/JSON) | *.json, *.bowerrc, *.jscsrc, *.webmanifest, *.js.map, *.css.map, *.ts.map, *.har, *.jslintrc, *.jsonld, *.geojson, *.ipynb, *.vuerc, composer.lock, .watchmanconfig |
| [JSON with Comments](https://code.visualstudio.com/docs/languages/json#_json-with-comments) | *.jsonc, *.eslintrc, *.eslintrc.json, *.jsfmtrc, *.jshintrc, *.swcrc, *.hintrc, *.babelrc, babel.config.json, .babelrc.json, .ember-cli, typedoc.json |
Expand All @@ -37,6 +37,7 @@ for the [Eclipse IDE](https://eclipseide.org).
| [Less](https://en.wikipedia.org/wiki/Less%20%28style%20sheet%20language%29) | *.less |
| [Lua](https://en.wikipedia.org/wiki/Lua%20%28programming%20language%29) | *.lua |
| [Makefile](https://github.com/emilast/vscode-logfile-highlighter#features) | *.mak, *.mk, Makefile, makefile, GNUmakefile, OCamlMakefile |
| [Markdown](https://en.wikipedia.org/wiki/Markdown) | *.md, *.mkd, *.mdwn, *.mdown, *.markdown, *.markdn, *.mdtxt, *.mdtext, *.workbook |
| [Objective-C](https://en.wikipedia.org/wiki/Objective-C) | *.m |
| [Objective-C++](https://en.wikipedia.org/wiki/Objective-C#Objective-C++) | *.mm |
| [Perl](https://en.wikipedia.org/wiki/Perl) | *.pl, *.pm, *.pod, *.t, *.PL, *.psgi |
Expand All @@ -52,6 +53,8 @@ for the [Eclipse IDE](https://eclipseide.org).
| [SQL](https://en.wikipedia.org/wiki/SQL) | *.sql, *.dsql |
| [Swift](https://en.wikipedia.org/wiki/Swift%20%28programming%20language%29) | *.swift |
| [TypeScript](https://en.wikipedia.org/wiki/TypeScript) | *.ts, *.cts, *.mts |
| [TypeScript React](https://www.typescriptlang.org/docs/handbook/react.html) | *.tsx |
| [TypeScript JSX](https://www.typescriptlang.org/docs/handbook/react.html) | *.tsx |
| [Visual Basic .NET](https://en.wikipedia.org/wiki/Visual%20Basic%20%28.NET%29) | *.vb, *.brs, *.vbs, *.bas, *.vba |
| [XML](https://en.wikipedia.org/wiki/XML) | *.xml, *.xsd, *.ascx, *.atom, *.axml, *.axaml, *.bpmn, *.cpt, *.csl, *.csproj, *.csproj.user, *.dita, *.ditamap, *.dtd, *.ent, *.mod, *.dtml, *.fsproj, *.fxml, *.iml, *.isml, *.jmx, *.launch, *.menu, *.mxml, *.nuspec, *.opml, *.owl, *.proj, *.props, *.pt, *.publishsettings, *.pubxml, *.pubxml.user, *.rbxlx, *.rbxmx, *.rdf, *.rng, *.rss, *.shproj, *.storyboard, *.svg, *.targets, *.tld, *.tmx, *.vbproj, *.vbproj.user, *.vcxproj, *.vcxproj.filters, *.wsdl, *.wxi, *.wxl, *.wxs, *.xaml, *.xbl, *.xib, *.xlf, *.xliff, *.xpdl, *.xul, *.xoml |
| [XSL](https://en.wikipedia.org/wiki/XSL) | *.xsl, *.xslt |

21 changes: 19 additions & 2 deletions org.eclipse.tm4e.language_pack/_update/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,24 @@
# Language Pack Update

Run [`update/pom.xml`](update/pom.xml) via Maven to update/recreate the content of the
[`org.eclipse.tm4e.language_pack`](../README.md) plugin.
To update/recreate the content of the [`org.eclipse.tm4e.language_pack`](../README.md) plugin,
run the following Maven command inside the `_update/` folder:

```bash
$ mvn clean process-resources

[INFO] ------------------------< language_pack:update >------------------------
[INFO] Building update 1.0.0-SNAPSHOT
[INFO] --------------------------------[ pom ]---------------------------------
[INFO] --- antrun:3.0.0:run (update-language-pack) @ update ---
[INFO] Executing tasks
[INFO] [get] Getting: https://github.com/microsoft/vscode/tree/main/extensions
...
[INFO] [copy] Copying 142 files to tm4e/org.eclipse.tm4e.language_pack
[INFO] Executed tasks
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
```

Do not edit the files of the project directly. If required, adapt the update/recreate scripts in this folder instead.

Expand Down
18 changes: 13 additions & 5 deletions org.eclipse.tm4e.language_pack/_update/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,16 @@ https://en.wikipedia.org/w/api.php?action=query&format=xml&prop=pageprops&ppprop
</extension>
<extension id="javascript">
<language name="JavaScript" wikidata="Q2005"/>
<language name="JavaScript React" wikidata="Q19399674"/>
<language name="JavaScript JSX" wikidata="Q105157779"/>
</extension>
<extension id="json">
<language name="JSON" wikidata="Q2063"/>
<language name="JSON with Comments">
<related link="https://code.visualstudio.com/docs/languages/json#_json-with-comments"/>
</language>
<language name="JSON Lines">
<related link="https://jsonlines.org/"/>
</language>
</extension>
<extension id="julia">
<language name="Julia" wikidata=""
Expand Down Expand Up @@ -132,7 +135,12 @@ https://en.wikipedia.org/w/api.php?action=query&format=xml&prop=pageprops&ppprop
</language>
</extension>
<extension id="markdown-basics">
<language name="Markdown" wikidata="Q1193600" issues="syntax highlighting and uncommenting broken, folding works"/>
<language name="Markdown" wikidata="Q1193600"/>
</extension>
<extension id="markdown-math">
<language name="Markdown Math" issue="broken because math.block begin regex not supported by Joni. Re-enable when the following is fixed and integrated: https://github.com/microsoft/vscode/issues/181662">
<related link="https://upyesp.org/posts/makrdown-vscode-math-formula/"/>
</language>
</extension>
<extension id="objective-c">
<language name="Objective-C" wikidata="Q188531"/>
Expand Down Expand Up @@ -201,7 +209,7 @@ https://en.wikipedia.org/w/api.php?action=query&format=xml&prop=pageprops&ppprop
</extension>
<extension id="typescript-basics">
<language name="TypeScript" wikidata="Q978185"/>
<language name="TypeScript React">
<language name="TypeScript JSX">
<related link="https://www.typescriptlang.org/docs/handbook/react.html"/>
<related wikidata="Q978185"/>
</language>
Expand All @@ -210,8 +218,8 @@ https://en.wikipedia.org/w/api.php?action=query&format=xml&prop=pageprops&ppprop
<language name="Visual Basic" better-name="Visual Basic .NET" wikidata="Q50077"/>
</extension>
<extension id="xml">
<language name="XML" wikidata="Q2115" issues="syntax highlighting broken"/>
<language name="XSL" wikidata="Q32061" issues="java.lang.IllegalArgumentException: "/>
<language name="XML" wikidata="Q2115" />
<language name="XSL" wikidata="Q32061" />
</extension>
<extension id="yaml">
<language name="YAML" wikidata="Q281876"/>
Expand Down
15 changes: 13 additions & 2 deletions org.eclipse.tm4e.language_pack/info.html
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ <h2>Supported languages and formats</h2>
</tr>

<tr>
<td><a href="https://en.wikipedia.org/wiki/React%20%28JavaScript%20library%29">JavaScript React</a></td><td>*.jsx</td>
<td><a href="https://en.wikipedia.org/wiki/JSX%20%28JavaScript%29">JavaScript JSX</a></td><td>*.jsx</td>
</tr>
<tr>
<td><a href="https://en.wikipedia.org/wiki/JavaScript">JavaScript</a></td><td>*.js, *.es6, *.mjs, *.cjs, *.pac, jakefile</td>
Expand Down Expand Up @@ -125,6 +125,10 @@ <h2>Supported languages and formats</h2>
<td><a href="https://github.com/emilast/vscode-logfile-highlighter#features">Makefile</a></td><td>*.mak, *.mk, Makefile, makefile, GNUmakefile, OCamlMakefile</td>
</tr>

<tr>
<td><a href="https://en.wikipedia.org/wiki/Markdown">Markdown</a></td><td>*.md, *.mkd, *.mdwn, *.mdown, *.markdown, *.markdn, *.mdtxt, *.mdtext, *.workbook</td>
</tr>

<tr>
<td><a href="https://en.wikipedia.org/wiki/Objective-C">Objective-C</a></td><td>*.m</td>
</tr>
Expand Down Expand Up @@ -183,13 +187,20 @@ <h2>Supported languages and formats</h2>
<td><a href="https://en.wikipedia.org/wiki/TypeScript">TypeScript</a></td><td>*.ts, *.cts, *.mts</td>
</tr>
<tr>
<td><a href="https://www.typescriptlang.org/docs/handbook/react.html">TypeScript React</a></td><td>*.tsx</td>
<td><a href="https://www.typescriptlang.org/docs/handbook/react.html">TypeScript JSX</a></td><td>*.tsx</td>
</tr>

<tr>
<td><a href="https://en.wikipedia.org/wiki/Visual%20Basic%20%28.NET%29">Visual Basic .NET</a></td><td>*.vb, *.brs, *.vbs, *.bas, *.vba</td>
</tr>

<tr>
<td><a href="https://en.wikipedia.org/wiki/XML">XML</a></td><td>*.xml, *.xsd, *.ascx, *.atom, *.axml, *.axaml, *.bpmn, *.cpt, *.csl, *.csproj, *.csproj.user, *.dita, *.ditamap, *.dtd, *.ent, *.mod, *.dtml, *.fsproj, *.fxml, *.iml, *.isml, *.jmx, *.launch, *.menu, *.mxml, *.nuspec, *.opml, *.owl, *.proj, *.props, *.pt, *.publishsettings, *.pubxml, *.pubxml.user, *.rbxlx, *.rbxmx, *.rdf, *.rng, *.rss, *.shproj, *.storyboard, *.svg, *.targets, *.tld, *.tmx, *.vbproj, *.vbproj.user, *.vcxproj, *.vcxproj.filters, *.wsdl, *.wxi, *.wxl, *.wxs, *.xaml, *.xbl, *.xib, *.xlf, *.xliff, *.xpdl, *.xul, *.xoml</td>
</tr>
<tr>
<td><a href="https://en.wikipedia.org/wiki/XSL">XSL</a></td><td>*.xsl, *.xslt</td>
</tr>

</table>

</body>
Expand Down
4 changes: 0 additions & 4 deletions org.eclipse.tm4e.language_pack/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,6 @@
<extension point="org.eclipse.tm4e.registry.grammars">
<grammar scopeName="lngpck.source.ini" path="ini/ini.tmLanguage.json"/>
<scopeNameContentTypeBinding scopeName="lngpck.source.ini" contentTypeId="lng.ini"/>
<grammar scopeName="lngpck.source.ini" path="ini/ini.tmLanguage.json"/>
<scopeNameContentTypeBinding scopeName="lngpck.source.ini" contentTypeId="lng.properties"/>
</extension>

<!-- java -->
Expand Down Expand Up @@ -393,7 +391,6 @@
</extension>

<!-- markdown-basics -->
<!-- issues: syntax highlighting and uncommenting broken, folding works
<extension point="org.eclipse.core.contenttype.contentTypes">
<content-type id="lng.markdown" base-type="org.eclipse.tm4e.language_pack.basetype" name="Markdown (Syntax Highlighting)" priority="low" file-extensions="md,mkd,mdwn,mdown,markdown,markdn,mdtxt,mdtext,workbook"/>
</extension>
Expand All @@ -404,7 +401,6 @@
<grammar scopeName="lngpck.text.html.markdown" path="markdown-basics/markdown.tmLanguage.json"/>
<scopeNameContentTypeBinding scopeName="lngpck.text.html.markdown" contentTypeId="lng.markdown"/>
</extension>
-->

<!-- markdown-math -->
<!-- issues: broken because math.block begin regex not supported by Joni. Re-enable when the following is fixed
Expand Down