diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts index 57bd8008a123f53a71aa6429b856eaedb3dc6124..eb1647ca1ecb2ce6e2e4d075e72eae4170528af3 100644 --- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts @@ -182,18 +182,15 @@ class FileTooLargeFileView { scrollbar: DomScrollableElement, metadataClb: (meta: string) => void ) { - DOM.clearNode(container); - const size = BinarySize.formatSize(descriptor.size); + metadataClb(size); + + DOM.clearNode(container); const label = document.createElement('span'); label.textContent = nls.localize('nativeFileTooLargeError', "The file is not displayed in the editor because it is too large ({0}).", size); container.appendChild(label); - if (metadataClb) { - metadataClb(size); - } - scrollbar.scanDomNode(); return Disposable.None; @@ -208,6 +205,8 @@ class FileSeemsBinaryFileView { openInternalClb: (uri: URI) => void, metadataClb: (meta: string) => void ) { + metadataClb(typeof descriptor.size === 'number' ? BinarySize.formatSize(descriptor.size) : ''); + DOM.clearNode(container); const disposables: IDisposable[] = []; @@ -224,10 +223,6 @@ class FileSeemsBinaryFileView { disposables.push(DOM.addDisposableListener(link, DOM.EventType.CLICK, () => openInternalClb(descriptor.resource))); } - if (metadataClb) { - metadataClb(typeof descriptor.size === 'number' ? BinarySize.formatSize(descriptor.size) : ''); - } - scrollbar.scanDomNode(); return combinedDisposable(disposables); @@ -543,13 +538,11 @@ class InlineImageView { image.style.visibility = 'hidden'; disposables.push(DOM.addDisposableListener(image, DOM.EventType.LOAD, e => { - let metadata: string; if (typeof descriptor.size === 'number') { metadataClb(nls.localize('imgMeta', '{0}x{1} {2}', image.naturalWidth, image.naturalHeight, BinarySize.formatSize(descriptor.size))); } else { metadataClb(nls.localize('imgMetaNoSize', '{0}x{1}', image.naturalWidth, image.naturalHeight)); } - metadataClb(metadata); scrollbar.scanDomNode(); image.style.visibility = 'visible'; @@ -590,5 +583,6 @@ function getMime(descriptor: IResourceDescriptor) { if (!mime && descriptor.resource.scheme !== Schemas.data) { mime = mimes.getMediaMime(descriptor.resource.path); } + return mime || mimes.MIME_BINARY; }