From 70430f5c8c90b1c9757887a27bb0612e15bef192 Mon Sep 17 00:00:00 2001 From: Dirk Baeumer Date: Wed, 17 Feb 2016 11:39:30 +0100 Subject: [PATCH] Fixed compile errors caused by 1.8.0 --- src/vs/base/common/diagnostics.ts | 3 ++- src/vs/base/test/browser/mockDom.ts | 19 +++++++++++++++++-- src/vs/base/test/node/flow.test.ts | 8 ++++---- .../browser/workerStatusReporter.ts | 6 +++--- .../languages/css/common/parser/cssParser.ts | 1 - .../platform/markers/common/problemMatcher.ts | 2 +- .../api/node/extHostTypeConverters.ts | 2 +- .../browser/actions/showPerformanceBox.ts | 8 ++++---- .../electron-browser/textFileServices.ts | 3 ++- .../tasks/node/processRunnerConfiguration.ts | 1 - 10 files changed, 34 insertions(+), 19 deletions(-) diff --git a/src/vs/base/common/diagnostics.ts b/src/vs/base/common/diagnostics.ts index 3508bcfd9d9..a83885e2755 100644 --- a/src/vs/base/common/diagnostics.ts +++ b/src/vs/base/common/diagnostics.ts @@ -29,7 +29,8 @@ function fifo(array:any[], size:number) { export function register(what: string, fn: Function): (...args: any[]) => void { - if (true) { + let disable = true; // Otherwise we have unreachable code. + if (disable) { return () => { // Intentional empty, disable for now because it is leaking memory }; diff --git a/src/vs/base/test/browser/mockDom.ts b/src/vs/base/test/browser/mockDom.ts index 8359086d2ec..4a4db90e43b 100644 --- a/src/vs/base/test/browser/mockDom.ts +++ b/src/vs/base/test/browser/mockDom.ts @@ -107,7 +107,7 @@ export class MockNode extends MockEventTarget implements Node { this.appendChild(this.ownerDocument.createTextNode(value)); } - removeChild(oldChild: Node): Node { + public removeChild(oldChild: Node): Node { var i = this._childNodes.indexOf(oldChild); if(i >= 0) { var removed = this._childNodes.splice(i, 1); @@ -116,6 +116,10 @@ export class MockNode extends MockEventTarget implements Node { return null; } + public contains(node: Node): boolean { + return this._childNodes.indexOf(node) !== -1; + } + appendChild(newChild: Node): Node { this._childNodes.push(newChild); return newChild; @@ -238,6 +242,14 @@ export class MockElement extends MockNode implements Element { return filter.length ? filter[0].value : ''; } + get innerHTML(): string { + throw new Error('Not implemented!'); + } + + set innerHTML(value: string) { + throw new Error('Not implemented!'); + } + getElementsByTagNameNS(namespaceURI: string, localName: string): NodeListOf { throw new Error('Not implemented!'); } @@ -302,6 +314,10 @@ export class MockElement extends MockNode implements Element { throw new Error('Not implemented!'); } + matches(selector: string): boolean { + throw new Error('Not implemented!'); + } + // interface NodeSelector querySelectorAll(selectors: string): NodeListOf { throw new Error('Not implemented!'); @@ -750,7 +766,6 @@ class AttributeValueParser implements IParserState { else { return this.attribute; } - break; default: if(this.quote === false) { return new ErrorState('Expected " character'); diff --git a/src/vs/base/test/node/flow.test.ts b/src/vs/base/test/node/flow.test.ts index 7c7fe85c411..f4aa29a002e 100644 --- a/src/vs/base/test/node/flow.test.ts +++ b/src/vs/base/test/node/flow.test.ts @@ -266,8 +266,8 @@ suite('Flow', () => { if (true) { throw new Error(""); } - assertionCount++; - syncGet(null, this); + // assertionCount++; + // syncGet(null, this); }, function handleThird(third) { @@ -332,8 +332,8 @@ suite('Flow', () => { if (true) { throw new Error(""); } - assertionCount++; - asyncGet(null, this); + // assertionCount++; + // asyncGet(null, this); }, function handleThird(third) { diff --git a/src/vs/editor/contrib/workerStatusReporter/browser/workerStatusReporter.ts b/src/vs/editor/contrib/workerStatusReporter/browser/workerStatusReporter.ts index 5357362e7c0..2ed45fcb6e9 100644 --- a/src/vs/editor/contrib/workerStatusReporter/browser/workerStatusReporter.ts +++ b/src/vs/editor/contrib/workerStatusReporter/browser/workerStatusReporter.ts @@ -93,6 +93,6 @@ function attr(target:HTMLElement, attrName:string, attrValue:string): void { target.setAttribute(attrName, attrValue); } -if (false) { //TODO@Debt - EditorBrowserRegistry.registerEditorContribution(WorkerStatusReporter); -} \ No newline at end of file +// if (false) { //TODO@Debt +// EditorBrowserRegistry.registerEditorContribution(WorkerStatusReporter); +// } \ No newline at end of file diff --git a/src/vs/languages/css/common/parser/cssParser.ts b/src/vs/languages/css/common/parser/cssParser.ts index cd8224147a1..62c37fce5ad 100644 --- a/src/vs/languages/css/common/parser/cssParser.ts +++ b/src/vs/languages/css/common/parser/cssParser.ts @@ -112,7 +112,6 @@ export class Parser { this.token = this.scanner.scan(); } } - return false; } public createNode(nodeType:nodes.NodeType): nodes.Node { diff --git a/src/vs/platform/markers/common/problemMatcher.ts b/src/vs/platform/markers/common/problemMatcher.ts index 31d88c949a2..0e667294f4c 100644 --- a/src/vs/platform/markers/common/problemMatcher.ts +++ b/src/vs/platform/markers/common/problemMatcher.ts @@ -115,7 +115,7 @@ export interface NamedProblemMatcher extends ProblemMatcher { } export function isNamedProblemMatcher(value: ProblemMatcher): value is NamedProblemMatcher { - return Types.isString((value).name); + return Types.isString((value).name) ? true : false; } let valueMap: { [key: string]: string; } = { diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts index 08a8cf86791..263d9d50f6c 100644 --- a/src/vs/workbench/api/node/extHostTypeConverters.ts +++ b/src/vs/workbench/api/node/extHostTypeConverters.ts @@ -162,7 +162,7 @@ function isRangeWithMessageArr(something: vscode.Range[]|vscode.DecorationOption if (something.length === 0) { return true; } - return isRangeWithMessage(something[0]); + return isRangeWithMessage(something[0]) ? true : false; } export function fromRangeOrRangeWithMessage(ranges:vscode.Range[]|vscode.DecorationOptions[]): IRangeWithMessage[] { diff --git a/src/vs/workbench/browser/actions/showPerformanceBox.ts b/src/vs/workbench/browser/actions/showPerformanceBox.ts index 1978dea623b..b8af4ab62ac 100644 --- a/src/vs/workbench/browser/actions/showPerformanceBox.ts +++ b/src/vs/workbench/browser/actions/showPerformanceBox.ts @@ -34,7 +34,7 @@ export class ShowPerformanceBox extends Action { } } -if (false /* Env.enablePerformanceTools */) { - let registry = Registry.as(Extensions.WorkbenchActions); - registry.registerWorkbenchAction(new SyncActionDescriptor(ShowPerformanceBox, ID, LABEL)); -} \ No newline at end of file +// if (false /* Env.enablePerformanceTools */) { +// let registry = Registry.as(Extensions.WorkbenchActions); +// registry.registerWorkbenchAction(new SyncActionDescriptor(ShowPerformanceBox, ID, LABEL)); +// } \ No newline at end of file diff --git a/src/vs/workbench/parts/files/electron-browser/textFileServices.ts b/src/vs/workbench/parts/files/electron-browser/textFileServices.ts index 71224cbff0c..1793466bf84 100644 --- a/src/vs/workbench/parts/files/electron-browser/textFileServices.ts +++ b/src/vs/workbench/parts/files/electron-browser/textFileServices.ts @@ -380,7 +380,8 @@ export class TextFileService extends AbstractTextFileService { // - https://github.com/Microsoft/vscode/issues/451 // - Bug on Windows: When "All Files" is picked, the path gets an extra ".*" // Until these issues are resolved, we disable the dialog file extension filtering. - if (true) { + let disable = true; // Simply using if (true) flags the code afterwards as not reachable. + if (disable) { return options; } diff --git a/src/vs/workbench/parts/tasks/node/processRunnerConfiguration.ts b/src/vs/workbench/parts/tasks/node/processRunnerConfiguration.ts index d744817ea01..591b7d93562 100644 --- a/src/vs/workbench/parts/tasks/node/processRunnerConfiguration.ts +++ b/src/vs/workbench/parts/tasks/node/processRunnerConfiguration.ts @@ -665,7 +665,6 @@ class ConfigurationParser { let json = value; return new ProblemMatcherParser(ProblemMatcherRegistry, this.logger, this.validationStatus).parse(json); } - return null; } } -- GitLab