Skip to content
Snippets Groups Projects
Commit efbd453a authored by Marijn Haverbeke's avatar Marijn Haverbeke
Browse files

[dockerfile mode] Integrate

Issue #2888
parent 0930f2bf
No related branches found
No related tags found
No related merge requests found
......@@ -106,6 +106,7 @@
<option value="http://codemirror.net/mode/d/d.js">d.js</option>
<option value="http://codemirror.net/mode/diff/diff.js">diff.js</option>
<option value="http://codemirror.net/mode/django/django.js">django.js</option>
<option value="http://codemirror.net/mode/dockerfile/dockerfile.js">dockerfile.js</option>
<option value="http://codemirror.net/mode/dtd/dtd.js">dtd.js</option>
<option value="http://codemirror.net/mode/dylan/dylan.js">dylan.js</option>
<option value="http://codemirror.net/mode/ecl/ecl.js">ecl.js</option>
......
......@@ -61,23 +61,12 @@
// Match everything except for the inline comment
regex: /[^#]+/,
token: null,
next: "lineComment"
},
{
regex: /$/,
token: null,
next: "start"
},
// Fail safe return to start
{
regex: /$/,
token: null,
next: "start"
}
],
lineComment: [
{
regex: /#.*$/,
token: "comment"
},
// Fail safe return to start
{
......
......@@ -42,6 +42,7 @@ option.</p>
<li><a href="python/index.html">Cython</a></li>
<li><a href="d/index.html">D</a></li>
<li><a href="django/index.html">Django</a> (templating language)</li>
<li><a href="dockerfile/index.html">Dockerfile</a></li>
<li><a href="diff/index.html">diff</a></li>
<li><a href="dtd/index.html">DTD</a></li>
<li><a href="dylan/index.html">Dylan</a></li>
......
......@@ -28,6 +28,7 @@
{name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
{name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]},
{name: "Django", mime: "text/x-django", mode: "django"},
{name: "Dockerfile", mime: "text/x-dockerfile", mode: "dockerfile"},
{name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ["dtd"]},
{name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
{name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment