From 0a58b65ab7b49a82fa318e5edcbe53c0e9e0c69e Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 13 Jan 2016 16:20:07 +0100
Subject: [PATCH] quickopen - prep for meta reuse

---
 .../contrib/quickOpen/browser/quickOutline.ts | 22 ++-----------------
 .../quickopen/browser/gotoSymbolHandler.ts    | 11 ++--------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts b/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts
index fd495088ce2..5513a389292 100644
--- a/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts
+++ b/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts
@@ -26,18 +26,16 @@ var SCOPE_PREFIX = ':';
 
 class SymbolEntry extends QuickOpenModel.QuickOpenEntryGroup {
 	private name:string;
-	private meta:string;
 	private type: string;
 	private description: string;
 	private range:EditorCommon.IRange;
 	private editor:EditorCommon.ICommonCodeEditor;
 	private decorator:EditorQuickOpen.IDecorator;
 
-	constructor(name:string, meta:string, type:string, description:string, range:EditorCommon.IRange, highlights:QuickOpenModel.IHighlight[], editor:EditorCommon.ICommonCodeEditor, decorator:EditorQuickOpen.IDecorator) {
+	constructor(name:string, type:string, description:string, range:EditorCommon.IRange, highlights:QuickOpenModel.IHighlight[], editor:EditorCommon.ICommonCodeEditor, decorator:EditorQuickOpen.IDecorator) {
 		super();
 
 		this.name = name;
-		this.meta = meta;
 		this.type = type;
 		this.description = description;
 		this.range = range;
@@ -50,10 +48,6 @@ class SymbolEntry extends QuickOpenModel.QuickOpenEntryGroup {
 		return this.name;
 	}
 
-	public getMeta():string {
-		return this.meta;
-	}
-
 	public getIcon():string {
 		return this.type;
 	}
@@ -210,18 +204,6 @@ export class QuickOutlineAction extends EditorQuickOpen.BaseEditorQuickOpenActio
 		for (var i = 0; i < flattened.length; i++) {
 			var element = flattened[i];
 			var label = Strings.trim(element.label);
-			var meta:string = null;
-
-			// Parse out parameters from method/function if present
-			if (element.type === 'method' || element.type === 'function') {
-				var indexOf = label.indexOf('(');
-				if (indexOf > 0) {
-					meta = label.substr(indexOf);
-					label = label.substr(0, indexOf);
-				} else {
-					meta = '()'; // otherwise make clear this is a method by adding ()
-				}
-			}
 
 			// Check for meatch
 			var highlights = Filters.matchesFuzzy(normalizedSearchValue, label);
@@ -234,7 +216,7 @@ export class QuickOutlineAction extends EditorQuickOpen.BaseEditorQuickOpenActio
 				}
 
 				// Add
-				results.push(new SymbolEntry(label, meta, element.type, description, element.range, highlights, this.editor, this));
+				results.push(new SymbolEntry(label, element.type, description, element.range, highlights, this.editor, this));
 			}
 		}
 
diff --git a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
index c5fd0392750..314fb629921 100644
--- a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
@@ -231,19 +231,17 @@ class SymbolEntry extends EditorQuickOpenEntryGroup {
 	private editorService: IWorkbenchEditorService;
 	private index: number;
 	private name: string;
-	private meta: string;
 	private type: string;
 	private icon: string;
 	private description: string;
 	private range: IRange;
 	private handler: GotoSymbolHandler;
 
-	constructor(index: number, name: string, meta: string, type: string, description: string, icon: string, range: IRange, highlights: IHighlight[], editorService: IWorkbenchEditorService, handler: GotoSymbolHandler) {
+	constructor(index: number, name: string, type: string, description: string, icon: string, range: IRange, highlights: IHighlight[], editorService: IWorkbenchEditorService, handler: GotoSymbolHandler) {
 		super();
 
 		this.index = index;
 		this.name = name;
-		this.meta = meta;
 		this.type = type;
 		this.icon = icon;
 		this.description = description;
@@ -261,10 +259,6 @@ class SymbolEntry extends EditorQuickOpenEntryGroup {
 		return this.name;
 	}
 
-	public getMeta(): string {
-		return this.meta;
-	}
-
 	public getIcon(): string {
 		return this.icon;
 	}
@@ -460,7 +454,6 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		for (let i = 0; i < flattened.length; i++) {
 			let element = flattened[i];
 			let label = strings.trim(element.label);
-			let meta: string = null;
 
 			// Show parent scope as description
 			let description: string = element.containerLabel;
@@ -470,7 +463,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 
 			// Add
 			let icon = element.icon || element.type;
-			results.push(new SymbolEntry(i, label, meta, element.type, description, icon, element.range, null, this.editorService, this));
+			results.push(new SymbolEntry(i, label, element.type, description, icon, element.range, null, this.editorService, this));
 		}
 
 		return results;
-- 
GitLab