From 8b1071bcbfbcd9a99353d630fbd954e0cf83cabd Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 8 Feb 2019 10:12:03 +0100
Subject: [PATCH] use resources#basename instead of path#posix

---
 .../{electron-browser => browser}/outline.contribution.ts   | 0
 .../outline/{electron-browser => browser}/outlinePanel.css  | 0
 .../outline/{electron-browser => browser}/outlinePanel.ts   | 6 +++---
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename src/vs/workbench/contrib/outline/{electron-browser => browser}/outline.contribution.ts (100%)
 rename src/vs/workbench/contrib/outline/{electron-browser => browser}/outlinePanel.css (100%)
 rename src/vs/workbench/contrib/outline/{electron-browser => browser}/outlinePanel.ts (99%)

diff --git a/src/vs/workbench/contrib/outline/electron-browser/outline.contribution.ts b/src/vs/workbench/contrib/outline/browser/outline.contribution.ts
similarity index 100%
rename from src/vs/workbench/contrib/outline/electron-browser/outline.contribution.ts
rename to src/vs/workbench/contrib/outline/browser/outline.contribution.ts
diff --git a/src/vs/workbench/contrib/outline/electron-browser/outlinePanel.css b/src/vs/workbench/contrib/outline/browser/outlinePanel.css
similarity index 100%
rename from src/vs/workbench/contrib/outline/electron-browser/outlinePanel.css
rename to src/vs/workbench/contrib/outline/browser/outlinePanel.css
diff --git a/src/vs/workbench/contrib/outline/electron-browser/outlinePanel.ts b/src/vs/workbench/contrib/outline/browser/outlinePanel.ts
similarity index 99%
rename from src/vs/workbench/contrib/outline/electron-browser/outlinePanel.ts
rename to src/vs/workbench/contrib/outline/browser/outlinePanel.ts
index 70684ff8365..a6421a616e6 100644
--- a/src/vs/workbench/contrib/outline/electron-browser/outlinePanel.ts
+++ b/src/vs/workbench/contrib/outline/browser/outlinePanel.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { posix } from 'path';
 import * as dom from 'vs/base/browser/dom';
 import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
@@ -47,6 +46,7 @@ import { FuzzyScore } from 'vs/base/common/filters';
 import { OutlineDataSource, OutlineItemComparator, OutlineSortOrder, OutlineVirtualDelegate, OutlineGroupRenderer, OutlineElementRenderer, OutlineItem, OutlineIdentityProvider, OutlineNavigationLabelProvider } from 'vs/editor/contrib/documentSymbols/outlineTree';
 import { IDataTreeViewState } from 'vs/base/browser/ui/tree/dataTree';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
+import { basename } from 'vs/base/common/resources';
 
 class RequestState {
 
@@ -433,7 +433,7 @@ export class OutlinePanel extends ViewletPanel {
 		let loadingMessage: IDisposable;
 		if (!oldModel) {
 			loadingMessage = new TimeoutTimer(
-				() => this._showMessage(localize('loading', "Loading document symbols for '{0}'...", posix.basename(textModel.uri.path))),
+				() => this._showMessage(localize('loading', "Loading document symbols for '{0}'...", basename(textModel.uri))),
 				100
 			);
 		}
@@ -445,7 +445,7 @@ export class OutlinePanel extends ViewletPanel {
 		}
 
 		if (TreeElement.empty(newModel)) {
-			return this._showMessage(localize('no-symbols', "No symbols found in document '{0}'", posix.basename(textModel.uri.path)));
+			return this._showMessage(localize('no-symbols', "No symbols found in document '{0}'", basename(textModel.uri)));
 		}
 
 		let newSize = TreeElement.size(newModel);
-- 
GitLab