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

fix typo

Browse source
This commit is contained in:
nightwing 2013-04-04 23:27:26 +04:00
commit 9409ae8090
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/ace/snippets.js
View file

@ -484,6 +484,7 @@ var SnippetManager = function() {
snippets.forEach(removeSnippet); snippets.forEach(removeSnippet);
}; };
this.parseSnippetFile = function(str) { this.parseSnippetFile = function(str) {
str = str.replace(/\r/, "");
var list = [], snippet = {}; var list = [], snippet = {};
var re = /^#.*|^({[\s\S]*})\s*$|^(\S+) (.*)$|^((?:\n*\t.*)+)/gm; var re = /^#.*|^({[\s\S]*})\s*$|^(\S+) (.*)$|^((?:\n*\t.*)+)/gm;
var m; var m;
@ -500,11 +501,11 @@ var SnippetManager = function() {
} else { } else {
var key = m[2], val = m[3]; var key = m[2], val = m[3];
if (key == "regex") { if (key == "regex") {
var re = /\/((?:[^\/\\]|\\.)*)|$/g; var guardRe = /\/((?:[^\/\\]|\\.)*)|$/g;
snippet.guard = re.exec(val)[1]; snippet.guard = guardRe.exec(val)[1];
snippet.trigger = re.exec(val)[1]; snippet.trigger = guardRe.exec(val)[1];
snippet.endTrigger = re.exec(val)[1]; snippet.endTrigger = guardRe.exec(val)[1];
snippet.endGuard = re.exec(val)[1]; snippet.endGuard = guardRe.exec(val)[1];
} else if (key == "snippet") { } else if (key == "snippet") {
snippet.tabTrigger = val.match(/^\S*/)[0]; snippet.tabTrigger = val.match(/^\S*/)[0];
if (!snippet.name) if (!snippet.name)

12
lib/ace/snippets_test.js
View file

@ -35,13 +35,13 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) { define(function(require, exports, module) {
"use strict"; "use strict";
var SnippetManager = require("./snippets").SnippetManager; var snippetManager = require("./snippets").snippetManager;
var assert = require("./test/assertions"); var assert = require("./test/assertions");
module.exports = { module.exports = {
"test: textmate style format strings" : function() { "test: textmate style format strings" : function() {
var fmt = SnippetManager.tmStrFormat; var fmt = snippetManager.tmStrFormat;
SnippetManager.tmStrFormat("hello", { snippetManager.tmStrFormat("hello", {
guard: "(..)(.)(.)", guard: "(..)(.)(.)",
flag:"g", flag:"g",
fmt: "a\\UO\\l$1\\E$2" fmt: "a\\UO\\l$1\\E$2"
@ -63,7 +63,7 @@ module.exports = {
var parsed = SnippetManager.parseSnippetFile( var parsed = snippetManager.parseSnippetFile(
"name a\nregex /(?:(=)|(:))?\s*)/\\(?f/\\)/\n\t{$0}" + "name a\nregex /(?:(=)|(:))?\s*)/\\(?f/\\)/\n\t{$0}" +
"\n\t\n\n#function\nsnippet f function\n\tfunction" "\n\t\n\n#function\nsnippet f function\n\tfunction"
); );
@ -72,13 +72,13 @@ module.exports = {
}, },
"test: parse snippet": function() { "test: parse snippet": function() {
var content = "-\\$$2a${1:x${$2:y$3\\}\\n\\}$TM_SELECTION}"; var content = "-\\$$2a${1:x${$2:y$3\\}\\n\\}$TM_SELECTION}";
var tokens = SnippetManager.tokenizeTmSnippet(content); var tokens = snippetManager.tokenizeTmSnippet(content);
assert.equal(tokens.length, 15); assert.equal(tokens.length, 15);
assert.equal(tokens[4], tokens[14]); assert.equal(tokens[4], tokens[14]);
assert.equal(tokens[2].tabstopId, 2); assert.equal(tokens[2].tabstopId, 2);
var content = "\\}${var/as\\/d/\\ul\\//g:s}" var content = "\\}${var/as\\/d/\\ul\\//g:s}"
var tokens = SnippetManager.tokenizeTmSnippet(content); var tokens = snippetManager.tokenizeTmSnippet(content);
assert.equal(tokens.length, 4); assert.equal(tokens.length, 4);
assert.equal(tokens[1], tokens[3]); assert.equal(tokens[1], tokens[3]);
assert.equal(tokens[2], "s"); assert.equal(tokens[2], "s");