From e24eedace5af192e9f76ef0c5ec2c0dce7ae1ef5 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Thu, 26 Mar 2020 08:53:33 +0100
Subject: [PATCH] codicons - speed up stripCodicons

---
 src/vs/base/common/codicon.ts           |  2 +-
 src/vs/base/common/codicons.ts          |  6 ++++++
 src/vs/base/test/common/codicon.test.ts | 12 ++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/vs/base/common/codicon.ts b/src/vs/base/common/codicon.ts
index 51189279780..5b3541125e0 100644
--- a/src/vs/base/common/codicon.ts
+++ b/src/vs/base/common/codicon.ts
@@ -6,7 +6,7 @@
 import { matchesFuzzy, IMatch } from 'vs/base/common/filters';
 import { ltrim } from 'vs/base/common/strings';
 
-const codiconStartMarker = '$(';
+export const codiconStartMarker = '$(';
 
 export interface IParsedCodicons {
 	readonly text: string;
diff --git a/src/vs/base/common/codicons.ts b/src/vs/base/common/codicons.ts
index 7830bc6d4e9..22f8316ec39 100644
--- a/src/vs/base/common/codicons.ts
+++ b/src/vs/base/common/codicons.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { codiconStartMarker } from 'vs/base/common/codicon';
+
 const escapeCodiconsRegex = /(\\)?\$\([a-z0-9\-]+?(?:~[a-z0-9\-]*?)?\)/gi;
 export function escapeCodicons(text: string): string {
 	return text.replace(escapeCodiconsRegex, (match, escaped) => escaped ? match : `\\${match}`);
@@ -30,5 +32,9 @@ export function renderCodicons(text: string): string {
 
 const stripCodiconsRegex = /(\s)?(\\)?\$\([a-z0-9\-]+?(?:~[a-z0-9\-]*?)?\)(\s)?/gi;
 export function stripCodicons(text: string): string {
+	if (text.indexOf(codiconStartMarker) === -1) {
+		return text;
+	}
+
 	return text.replace(stripCodiconsRegex, (match, preWhitespace, escaped, postWhitespace) => escaped ? match : preWhitespace || postWhitespace || '');
 }
diff --git a/src/vs/base/test/common/codicon.test.ts b/src/vs/base/test/common/codicon.test.ts
index b3fdb5bde1b..8d974ea0ad4 100644
--- a/src/vs/base/test/common/codicon.test.ts
+++ b/src/vs/base/test/common/codicon.test.ts
@@ -2,9 +2,11 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+
 import * as assert from 'assert';
 import { IMatch } from 'vs/base/common/filters';
 import { matchesFuzzyCodiconAware, parseCodicons, IParsedCodicons } from 'vs/base/common/codicon';
+import { stripCodicons } from 'vs/base/common/codicons';
 
 export interface ICodiconFilter {
 	// Returns null if word doesn't match.
@@ -64,3 +66,13 @@ suite('Codicon', () => {
 		]);
 	});
 });
+
+suite('Codicons', () => {
+
+	test('stripCodicons', () => {
+		assert.equal(stripCodicons('Hello World'), 'Hello World');
+		assert.equal(stripCodicons('$(Hello World'), '$(Hello World');
+		assert.equal(stripCodicons('$(Hello) World'), ' World');
+		assert.equal(stripCodicons('$(Hello) W$(oi)rld'), ' Wrld');
+	});
+});
-- 
GitLab