From 5dcd2ba848d96cc77f60c6549d2ffd03fde8e309 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Tue, 6 Feb 2018 00:41:54 -0800 Subject: [PATCH] Revert "Bump ripgrep" This reverts commit 5938ad9108279c497f21749ea183cf66afe2ffd7. --- package.json | 2 +- .../workbench/services/search/node/ripgrepTextSearch.ts | 8 ++++---- yarn.lock | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 1b28cb82b9a..0c255a74987 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "v8-inspect-profiler": "^0.0.7", "vscode-chokidar": "1.6.2", "vscode-debugprotocol": "1.25.0", - "vscode-ripgrep": "0.7.1-patch.1.1", + "vscode-ripgrep": "^0.7.1-patch.0", "vscode-textmate": "^3.2.0", "vscode-xterm": "3.2.0-beta1", "yauzl": "2.8.0" diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts index fcbb2389203..a38556247ef 100644 --- a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts +++ b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts @@ -164,11 +164,11 @@ export function rgErrorMsgForDisplay(msg: string): string | undefined { } export class RipgrepParser extends EventEmitter { - private static readonly RESULT_REGEX = /^\u001b\[0m(\d+)\u001b\[0m:(.*)(\r?)/; - private static readonly FILE_REGEX = /^\u001b\[0m(.+)\u001b\[0m$/; + private static readonly RESULT_REGEX = /^\u001b\[m(\d+)\u001b\[m:(.*)(\r?)/; + private static readonly FILE_REGEX = /^\u001b\[m(.+)\u001b\[m$/; - public static readonly MATCH_START_MARKER = '\u001b[0m\u001b[31m'; - public static readonly MATCH_END_MARKER = '\u001b[0m'; + public static readonly MATCH_START_MARKER = '\u001b[m\u001b[31m'; + public static readonly MATCH_END_MARKER = '\u001b[m'; private fileMatch: FileMatch; private remainder: string; diff --git a/yarn.lock b/yarn.lock index 83635b79f2a..821d916f147 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5992,9 +5992,9 @@ vscode-nls-dev@3.0.7: xml2js "^0.4.19" yargs "^10.1.1" -vscode-ripgrep@0.7.1-patch.1.1: - version "0.7.1-patch.1.1" - resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-0.7.1-patch.1.1.tgz#d5fd19979998ccd040fd54c144c4190135e9e5c2" +vscode-ripgrep@^0.7.1-patch.0: + version "0.7.1-patch.0" + resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-0.7.1-patch.0.tgz#738be8b6da5cb9a8807b528595a884b0dfcb60a5" vscode-textmate@^3.2.0: version "3.2.0"