Skip to content

Commit 31c597f

Browse files
authored
Invert test logic for auto-detection (#1438)
* Now the latest is `ebnf`. Inverting logic to force it to more likely candidates. * Try this for a while and simulate in doc Post #572 Auto-merge
1 parent 3bc21c5 commit 31c597f

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

libs/markdown.js

+16-11
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,15 @@ renderer.link = function (aHref, aTitle, aText) {
151151
marked.setOptions({
152152
highlight: function (aCode, aLang) {
153153
var obj = null;
154+
var lang = [ // NOTE: More likely to less likely
155+
'javascript', 'xpath', 'xml',
156+
'css', 'less', 'scss',
157+
'json',
158+
'diff',
159+
'shell',
160+
'bash', 'dos',
161+
'vbscript'
162+
];
154163

155164
if (aLang && hljs.getLanguage(aLang)) {
156165
try {
@@ -162,17 +171,13 @@ marked.setOptions({
162171
try {
163172
obj = hljs.highlightAuto(aCode);
164173

165-
switch (obj.language) {
166-
// Transform list of auto-detected language highlights
167-
case 'dust':
168-
case '1c':
169-
case 'qml':
170-
// Narrow auto-detection to something that is more likely
171-
return hljs.highlightAuto(aCode, ['css', 'html', 'js', 'json']).value;
172-
break;
173-
// Any other detected go ahead and return
174-
default:
175-
return obj.value;
174+
if (lang.indexOf(obj.language) > -1) {
175+
return obj.value;
176+
} else {
177+
if (isDev) {
178+
console.log('Unusual auto-detected md language code is', '`' + obj.language + '`');
179+
}
180+
return hljs.highlightAuto(aCode, lang).value;
176181
}
177182
} catch (aErr) {
178183
}

views/includes/documents/Frequently-Asked-Questions.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ var thisIsJavascript = "yahoo!";
4141

4242
... instead of:
4343

44-
```
44+
``` ebnf
4545
var thisIsJavascript = "yahoo!";
4646
```
4747

0 commit comments

Comments
 (0)