jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tweak modes

Browse source
This commit is contained in:
nightwing 2014-08-01 21:18:53 +04:00
commit 0eff326d62
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ace/ext/modelist.js
View file

@ -147,7 +147,7 @@ var supportedModes = {
Twig: ["twig"], Twig: ["twig"],
Typescript: ["ts|typescript|str"], Typescript: ["ts|typescript|str"],
Vala: ["vala"], Vala: ["vala"],
VBScript: ["vbs"], VBScript: ["vbs|vb"],
Velocity: ["vm"], Velocity: ["vm"],
Verilog: ["v|vh|sv|svh"], Verilog: ["v|vh|sv|svh"],
XML: ["xml|rdf|rss|wsdl|xslt|atom|mathml|mml|xul|xbl"], XML: ["xml|rdf|rss|wsdl|xslt|atom|mathml|mml|xul|xbl"],
@ -159,7 +159,7 @@ var nameOverrides = {
ObjectiveC: "Objective-C", ObjectiveC: "Objective-C",
CSharp: "C#", CSharp: "C#",
golang: "Go", golang: "Go",
C_Cpp: "C/C++", C_Cpp: "C and C++",
coffee: "CoffeeScript", coffee: "CoffeeScript",
HTML_Ruby: "HTML (Ruby)", HTML_Ruby: "HTML (Ruby)",
FTL: "FreeMarker" FTL: "FreeMarker"

2
lib/ace/mode/javascript/jshint.js
View file

@ -1979,7 +1979,7 @@ var JSHINT = (function () {
function doOption() { function doOption() {
var nt = state.tokens.next; var nt = state.tokens.next;
var body = nt.body.match(/(-\s+)?[^\s,:]+(?:\s*:\s*(-\s+)?[^\s,]+)?/g); var body = nt.body.match(/(-\s+)?[^\s,:]+(?:\s*:\s*(-\s+)?[^\s,]+)?/g) || [];
var predef = {}; var predef = {};
if (nt.type === "globals") { if (nt.type === "globals") {

2
lib/ace/mode/javascript_highlight_rules.js
View file

@ -272,7 +272,7 @@ var JavaScriptHighlightRules = function() {
], ],
"regex_character_class": [ "regex_character_class": [
{ {
token: "regexp.keyword.operator", token: "regexp.charclass.keyword.operator",
regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)" regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
}, { }, {
token: "constant.language.escape", token: "constant.language.escape",

15
lib/ace/mode/php_highlight_rules.js
View file

@ -1005,7 +1005,7 @@ var PhpLangHighlightRules = function() {
return "string"; return "string";
stack.shift(); stack.shift();
stack.shift(); stack.shift();
return "markup.list" return "markup.list";
}, },
regex : "^\\w+(?=;?$)", regex : "^\\w+(?=;?$)",
next: "start" next: "start"
@ -1016,12 +1016,11 @@ var PhpLangHighlightRules = function() {
], ],
"comment" : [ "comment" : [
{ {
token : "comment", // closing comment token : "comment",
regex : ".*?\\*\\/", regex : "\\*\\/",
next : "start" next : "start"
}, { }, {
token : "comment", // comment spanning whole line defaultToken : "comment"
regex : ".+"
} }
], ],
"qqstring" : [ "qqstring" : [
@ -1029,10 +1028,10 @@ var PhpLangHighlightRules = function() {
token : "constant.language.escape", token : "constant.language.escape",
regex : '\\\\(?:[nrtvef\\\\"$]|[0-7]{1,3}|x[0-9A-Fa-f]{1,2})' regex : '\\\\(?:[nrtvef\\\\"$]|[0-7]{1,3}|x[0-9A-Fa-f]{1,2})'
}, { }, {
token : "constant.language.escape", token : "variable",
regex : /\$[\w]+(?:\[[\w\]+]|=>\w+)?/ regex : /\$[\w]+(?:\[[\w\]+]|[=\-]>\w+)?/
}, { }, {
token : "constant.language.escape", token : "variable",
regex : /\$\{[^"\}]+\}?/ // this is wrong but ok for now regex : /\$\{[^"\}]+\}?/ // this is wrong but ok for now
}, },
{token : "string", regex : '"', next : "start"}, {token : "string", regex : '"', next : "start"},

1
lib/ace/mode/snippets.js
View file

@ -104,6 +104,7 @@ oop.inherits(Mode, TextMode);
(function() { (function() {
this.$indentWithTabs = true; this.$indentWithTabs = true;
this.lineCommentStart = "#";
this.$id = "ace/mode/snippets"; this.$id = "ace/mode/snippets";
}).call(Mode.prototype); }).call(Mode.prototype);
exports.Mode = Mode; exports.Mode = Mode;