Skip to content

r, python, javascript and css sections highlighted #151

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: internship-spring-2018
Choose a base branch
from
Open

r, python, javascript and css sections highlighted #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81b1162
r, python, javascript and css sections highlighted
tilacyn May 23, 2018
786b17e
unnessecary changes canceled
tilacyn May 23, 2018
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: 6 additions & 1 deletion demo/spring-2018.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@

# Header1

Some text in our markdown file

```{r}
library(feather)
library(ggplot2)
Expand Down Expand Up @@ -89,6 +91,7 @@
```

```{js}
var a = "hello"
$('.title').remove()
```

Expand All @@ -113,8 +116,10 @@
function(ace, langTools, katexPreviewer, highlighter, TexCompleter, Spellchecker, SpellcheckerPopup) {
var editor = ace.edit("editor");
editor.$blockScrolling = Infinity;
// editor.setTheme("ace/theme/monokai");
var session = editor.getSession();
session.setMode("ace/mode/markdown");
//alert("Mode Set");
session.setUseWorker(true);

// SpellcheckerPopup.setup(editor);
Expand Down Expand Up @@ -244,7 +249,7 @@
});
</script>
<span id = "highlightInfo"></span>
<span id="formula"><span>
<span id="formula"></span>

</body>
</html>
11 changes: 10 additions & 1 deletion lib/ace/mode/markdown_highlight_rules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
var RHighlightRules = require("./r_highlight_rules").RHighlightRules;
var PythonHighlightRules = require("./python_highlight_rules").PythonHighlightRules;

var escaped = function(ch) {
return "(?:[^" + lang.escapeRegExp(ch) + "\\\\]|\\\\.)*";
Expand All @@ -47,7 +48,7 @@ var escaped = function(ch) {
function github_embed(tag, prefix) {
return { // Github style block
token : "support.function",
regex : "^\\s*```" + tag + "\\s*$",
regex : "^\\s*```{" + tag + "}\\s*$",
push : prefix + "start"
};
}
Expand Down Expand Up @@ -78,6 +79,8 @@ var MarkdownHighlightRules = function() {
github_embed("xml", "xmlcode-"),
github_embed("html", "htmlcode-"),
github_embed("css", "csscode-"),
github_embed("python", "pycode-"),
github_embed("r", "rcode-"),
{ // Github style block
token : "support.function",
regex : "^\\s*```\\s*\\S*(?:{.*?\\})?\\s*$",
Expand Down Expand Up @@ -228,6 +231,12 @@ var MarkdownHighlightRules = function() {
next : "pop"
}]);

this.embedRules(PythonHighlightRules, "pycode-", [{
token : "support.function",
regex : "^\\s*```",
next : "pop"
}]);

this.normalizeRules();
};
oop.inherits(MarkdownHighlightRules, TextHighlightRules);
Expand Down