提交 1e6fdb8c 编写于 作者: I isidor

fixes #6983

上级 a0623b44
......@@ -4,6 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import nls = require('vs/nls');
import paths = require('vs/base/common/paths');
import dom = require('vs/base/browser/dom');
import builder = require('vs/base/browser/builder');
import { TPromise } from 'vs/base/common/winjs.base';
......@@ -335,12 +336,12 @@ export class BreakpointsView extends viewlet.AdaptiveCollapsibleViewletView {
if (first instanceof FunctionBreakpoint) {
return -1;
}
if(second instanceof FunctionBreakpoint) {
if (second instanceof FunctionBreakpoint) {
return 1;
}
if (first.source.uri.toString() !== second.source.uri.toString()) {
return first.source.uri.toString().localeCompare(second.source.uri.toString());
return paths.basename(first.source.uri.fsPath).localeCompare(paths.basename(second.source.uri.fsPath));
}
return first.desiredLineNumber - second.desiredLineNumber;
......
......@@ -50,13 +50,8 @@ export class Source {
}
// did not find the raw source amongst the stack frames, construct the raw stack frame from the limited data you have.
return Source.isInMemory(uri) ? { name: Source.getName(uri) } :
{ path: paths.normalize(uri.fsPath, true) };
}
private static getName(uri: uri): string {
const uriStr = uri.toString();
return uriStr.substr(uriStr.lastIndexOf('/') + 1);
return Source.isInMemory(uri) ? { name: paths.basename(uri.toString()) } :
{ path: paths.normalize(uri.fsPath, true), name: paths.basename(uri.fsPath) };
}
private static isInMemory(uri: uri): boolean {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册