fixing validation on maxMemory setting

sbatten · sbatten · commit c1e5eca5b954 · 2018-03-27T17:33:05.000-07:00
fixes microsoft#46767
diff --git a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
@@ -171,7 +171,7 @@ export class TextFileEditor extends BaseTextEditor {
 				}
 
 				if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_EXCEED_MEMORY_LIMIT) {
-					let memoryLimit = this.configurationService.getValue<number>(null, 'files.maxMemoryForLargeFilesMB') | 4096;
+					let memoryLimit = Math.max(2048, +this.configurationService.getValue<number>(null, 'files.maxMemoryForLargeFilesMB') || 4096);
 
 					return TPromise.wrapError<void>(errors.create(toErrorMessage(error), {
 						actions: [

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ export class TextFileEditor extends BaseTextEditor {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_EXCEED_MEMORY_LIMIT) {`
`174`		`- let memoryLimit = this.configurationService.getValue<number>(null, 'files.maxMemoryForLargeFilesMB') \| 4096;`
	`174`	`+ let memoryLimit = Math.max(2048, +this.configurationService.getValue<number>(null, 'files.maxMemoryForLargeFilesMB') \|\| 4096);`
`175`	`175`
`176`	`176`	`return TPromise.wrapError<void>(errors.create(toErrorMessage(error), {`
`177`	`177`	`actions: [`