development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-18 01:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

adress comments and some renames

Browse source
This commit is contained in:
isidor 2018-03-22 11:13:09 +01:00
parent 3de450fa2b
commit 24447fb840
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vs/workbench/parts/files/common/explorerModel.ts
View file

@ -17,7 +17,7 @@ import { IEditorGroup, toResource, IEditorIdentifier } from 'vs/workbench/common
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { getPathLabel } from 'vs/base/common/labels';
import { Schemas } from 'vs/base/common/network';
import { startsWith } from 'vs/base/common/strings';
import { startsWith, beginsWithIgnoreCase } from 'vs/base/common/strings';
export class Model {
@ -222,7 +222,7 @@ export class ExplorerItem {
child.parent = this;
child.updateResource(false);
this.children[this.lowercaseOnCaseInsensitivePlatforms(child.name)] = child;
this.children[this.getPlatformAwareName(child.name)] = child;
}
public getChild(name: string): ExplorerItem {
@ -230,7 +230,7 @@ export class ExplorerItem {
return undefined;
}
return this.children[this.lowercaseOnCaseInsensitivePlatforms(name)];
return this.children[this.getPlatformAwareName(name)];
}
/**
@ -256,10 +256,10 @@ export class ExplorerItem {
* Removes a child element from this folder.
*/
public removeChild(child: ExplorerItem): void {
delete this.children[this.lowercaseOnCaseInsensitivePlatforms(child.name)];
delete this.children[this.getPlatformAwareName(child.name)];
}
private lowercaseOnCaseInsensitivePlatforms(name: string): string {
private getPlatformAwareName(name: string): string {
return isLinux ? name : name.toLowerCase();
}
@ -316,7 +316,7 @@ export class ExplorerItem {
public find(resource: URI): ExplorerItem {
// Return if path found
if (resource && this.resource.scheme === resource.scheme && this.resource.authority === resource.authority &&
startsWith(this.lowercaseOnCaseInsensitivePlatforms(resource.path), this.lowercaseOnCaseInsensitivePlatforms(this.resource.path))
(isLinux ? startsWith(resource.path, this.resource.path) : beginsWithIgnoreCase(resource.path, this.resource.path))
) {
return this.findByPath(resource.path, this.resource.path.length);
}
@ -343,7 +343,7 @@ export class ExplorerItem {
// The name to search is between two separators
const name = path.substring(index, indexOfNextSep);
const child = this.children[this.lowercaseOnCaseInsensitivePlatforms(name)];
const child = this.children[this.getPlatformAwareName(name)];
if (child) {
// We found a child with the given name, search inside it

4
src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
View file

@ -886,8 +886,8 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
}
// Recurse into children
stat.getChildrenNames().forEach(name => {
this.getResolvedDirectories(stat.getChild(name), resolvedDirectories);
stat.getChildrenArray().forEach(child => {
this.getResolvedDirectories(child, resolvedDirectories);
});
}
}