Fixes microsoft#3549: Add support for $0

alexdima · alexdima · commit 0093264a49cb · 2016-03-15T17:01:52.000+01:00
diff --git a/src/vs/editor/contrib/find/common/findModel.ts b/src/vs/editor/contrib/find/common/findModel.ts
@@ -362,13 +362,16 @@ export class FindModelBoundToEditorModel {
 }
 
 const BACKSLASH_CHAR_CODE = '\\'.charCodeAt(0);
+const DOLLAR_CHAR_CODE = '$'.charCodeAt(0);
+const ZERO_CHAR_CODE = '0'.charCodeAt(0);
 const n_CHAR_CODE = 'n'.charCodeAt(0);
 const t_CHAR_CODE = 't'.charCodeAt(0);
 
 /**
  * \n => LF
  * \t => TAB
  * \\ => \
+ * $0 => $& (see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace#Specifying_a_string_as_a_parameter)
  * everything else stays untouched
  */
 export function parseReplaceString(input:string): string {
@@ -413,6 +416,32 @@ export function parseReplaceString(input:string): string {
 				substrFrom = i + 1;
 			}
 		}
+
+		if (chCode === DOLLAR_CHAR_CODE) {
+
+			// move to next char
+			i++;
+
+			if (i >= len) {
+				// string ends with a $
+				break;
+			}
+
+			let nextChCode = input.charCodeAt(i);
+			let replaceWithCharacter: string = null;
+
+			switch (nextChCode) {
+				case ZERO_CHAR_CODE:
+					// $0 => $&
+					replaceWithCharacter = '$&';
+					break;
+			}
+
+			if (replaceWithCharacter) {
+				result += input.substring(substrFrom, i - 1) + replaceWithCharacter;
+				substrFrom = i + 1;
+			}
+		}
 	}
 
 	if (substrFrom === 0) {
diff --git a/src/vs/editor/contrib/find/test/common/findModel.test.ts b/src/vs/editor/contrib/find/test/common/findModel.test.ts
@@ -50,6 +50,23 @@ suite('FindModel', () => {
 
 		// \ with back reference => no treatment
 		testParse('hello\\0', 'hello\\0');
+
+
+
+		// $1 => no treatment
+		testParse('hello$1', 'hello$1');
+		// $2 => no treatment
+		testParse('hello$2', 'hello$2');
+		// $12 => no treatment
+		testParse('hello$12', 'hello$12');
+		// $$ => no treatment
+		testParse('hello$$', 'hello$$');
+		// $$0 => no treatment
+		testParse('hello$$0', 'hello$$0');
+
+		// $0 => $&
+		testParse('hello$0', 'hello$&');
+		testParse('hello$02', 'hello$&2');
 	});
 
 	function findTest(testName:string, callback:(editor:ICommonCodeEditor, cursor:Cursor)=>void): void {
