Merge pull request #61 from arianitu/master

Fixed a crashing issue with auto completion.
swank-js · Jan 3, 2013 · 586e189 · 586e189
2 parents 9dac9e9 + a372f6d
commit 586e189
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/completion.js b/completion.js
@@ -91,7 +91,8 @@ Completion.prototype.nameCompletion = function nameCompletion(str) {
   var parent = dotIndex >= 0 ? str.substring(0, dotIndex) : null;
   var strToComplete = str.substring(dotIndex + 1, str.length);
   // console.log("dotIndex %s, strToComplete %s", dotIndex, strToComplete);
-  return this.dotCompletion(parent, new RegExp("^" + strToComplete), dotIndex < 0);
+  var strRegex = new RegExp("^" + this.escapeRegex(strToComplete));
+  return this.dotCompletion(parent, strRegex, dotIndex < 0);
 };
 
 Completion.prototype.doCompletion = function doCompletion (str) {
@@ -111,4 +112,8 @@ Completion.prototype.complete = function complete (prefix) {
   return { values: values, partial: partial };
 };
 
+Completion.prototype.escapeRegex = function escapeRegex (str) {
+  return (str+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
+};
+
 exports.Completion = Completion;