ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-06 17:23:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Vscode merge (#4582)

Browse Source 
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd

* fix issues with merges

* bump node version in azpipe

* replace license headers

* remove duplicate launch task

* fix build errors

* fix build errors

* fix tslint issues

* working through package and linux build issues

* more work

* wip

* fix packaged builds

* working through linux build errors

* wip

* wip

* wip

* fix mac and linux file limits

* iterate linux pipeline

* disable editor typing

* revert series to parallel

* remove optimize vscode from linux

* fix linting issues

* revert testing change

* add work round for new node

* readd packaging for extensions

* fix issue with angular not resolving decorator dependencies
This commit is contained in:
Anthony Dresser
2019-03-19 17:44:35 -07:00
committed by GitHub
parent 833d197412
commit 87765e8673
1879 changed files with 54505 additions and 38058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/platform/workspace/common/workspace.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { URI } from 'vs/base/common/uri';
import * as paths from 'vs/base/common/paths';
import { isAbsolute } from 'vs/base/common/path';
import * as resources from 'vs/base/common/resources';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { TernarySearchTree } from 'vs/base/common/map';
@@ -183,12 +183,12 @@ export class Workspace implements IWorkspace {
this._configuration = configuration;
}
getFolder(resource: URI): IWorkspaceFolder | null | undefined {
getFolder(resource: URI): IWorkspaceFolder | null {
if (!resource) {
return null;
}
return this._foldersMap.findSubstr(resource.toString());
return this._foldersMap.findSubstr(resource.toString()) || null;
}
private updateFoldersMap(): void {
@@ -257,7 +257,7 @@ function parseWorkspaceFolders(configuredFolders: IStoredWorkspaceFolder[], rela
function toUri(path: string, relativeTo: URI | undefined): URI | null {
if (path) {
if (paths.isAbsolute(path)) {
if (isAbsolute(path)) {
return URI.file(path);
}
if (relativeTo) {