From 38943f4d7989609d6870fdd9149bb0b00a6867a7 Mon Sep 17 00:00:00 2001 From: katainaka0503 Date: Wed, 1 Mar 2017 20:27:51 +0900 Subject: [PATCH] Fix whitespace indentation and format --- src/vs/base/node/stream.ts | 228 +++++++++--------- .../base/test/node/encoding/encoding.test.ts | 2 +- src/vs/base/test/node/stream/stream.test.ts | 2 +- .../search/node/worker/searchWorker.ts | 2 +- 4 files changed, 117 insertions(+), 117 deletions(-) diff --git a/src/vs/base/node/stream.ts b/src/vs/base/node/stream.ts index 463ce02831f..1d38a28f32a 100644 --- a/src/vs/base/node/stream.ts +++ b/src/vs/base/node/stream.ts @@ -11,102 +11,102 @@ import stream = require('stream'); import { TPromise } from 'vs/base/common/winjs.base'; export interface ReadResult { - buffer: NodeBuffer; - bytesRead: number; + buffer: NodeBuffer; + bytesRead: number; } /** * Reads up to total bytes from the provided stream. */ export function readExactlyByStream(stream: stream.Readable, totalBytes: number): TPromise { - return new TPromise((complete, error) => { - let done = false; - let buffer = new Buffer(totalBytes); - let bytesRead = 0; + return new TPromise((complete, error) => { + let done = false; + let buffer = new Buffer(totalBytes); + let bytesRead = 0; - stream.on('data', (data: NodeBuffer) => { - let bytesToRead = Math.min(totalBytes - bytesRead, data.length); - data.copy(buffer, bytesRead, 0, bytesToRead); - bytesRead += bytesToRead; + stream.on('data', (data: NodeBuffer) => { + let bytesToRead = Math.min(totalBytes - bytesRead, data.length); + data.copy(buffer, bytesRead, 0, bytesToRead); + bytesRead += bytesToRead; - if (bytesRead === totalBytes) { - stream.destroy(); // Will trigger the close event eventually - } - }); + if (bytesRead === totalBytes) { + stream.destroy(); // Will trigger the close event eventually + } + }); - stream.on('error', (e: Error) => { - if (!done) { - done = true; - error(e); - } - }); + stream.on('error', (e: Error) => { + if (!done) { + done = true; + error(e); + } + }); - let onSuccess = () => { - if (!done) { - done = true; - complete({ buffer, bytesRead }); - } - }; + let onSuccess = () => { + if (!done) { + done = true; + complete({ buffer, bytesRead }); + } + }; - stream.on('close', onSuccess); - }); + stream.on('close', onSuccess); + }); } /** * Reads totalBytes from the provided file. */ export function readExactlyByFile(file: string, totalBytes: number): TPromise { - return new TPromise((complete, error) => { - fs.open(file, 'r', null, (err, fd) => { - if (err) { - return error(err); - } + return new TPromise((complete, error) => { + fs.open(file, 'r', null, (err, fd) => { + if (err) { + return error(err); + } - function end(err: Error, resultBuffer: NodeBuffer, bytesRead: number): void { - fs.close(fd, (closeError: Error) => { - if (closeError) { - return error(closeError); - } + function end(err: Error, resultBuffer: NodeBuffer, bytesRead: number): void { + fs.close(fd, (closeError: Error) => { + if (closeError) { + return error(closeError); + } - if (err && (err).code === 'EISDIR') { - return error(err); // we want to bubble this error up (file is actually a folder) - } + if (err && (err).code === 'EISDIR') { + return error(err); // we want to bubble this error up (file is actually a folder) + } - return complete({ buffer:resultBuffer, bytesRead }); - }); - } + return complete({ buffer: resultBuffer, bytesRead }); + }); + } - let buffer = new Buffer(totalBytes); - let bytesRead = 0; - let zeroAttempts = 0; - function loop(): void { - fs.read(fd, buffer, bytesRead, totalBytes - bytesRead, null, (err, moreBytesRead) => { - if (err) { - return end(err, null, 0); - } + let buffer = new Buffer(totalBytes); + let bytesRead = 0; + let zeroAttempts = 0; + function loop(): void { + fs.read(fd, buffer, bytesRead, totalBytes - bytesRead, null, (err, moreBytesRead) => { + if (err) { + return end(err, null, 0); + } - // Retry up to N times in case 0 bytes where read - if (moreBytesRead === 0) { - if (++zeroAttempts === 10) { - return end(null, buffer, bytesRead); - } + // Retry up to N times in case 0 bytes where read + if (moreBytesRead === 0) { + if (++zeroAttempts === 10) { + return end(null, buffer, bytesRead); + } - return loop(); - } + return loop(); + } - bytesRead += moreBytesRead; + bytesRead += moreBytesRead; - if (bytesRead === totalBytes) { - return end(null, buffer, bytesRead); - } + if (bytesRead === totalBytes) { + return end(null, buffer, bytesRead); + } - return loop(); - }); - } + return loop(); + }); + } - loop(); - }); - }); + loop(); + }); + }); } /** @@ -119,60 +119,60 @@ export function readExactlyByFile(file: string, totalBytes: number): TPromise { - return new TPromise((complete, error) => - fs.open(file, 'r', null, (err, fd) => { - if (err) { - return error(err); - } + return new TPromise((complete, error) => + fs.open(file, 'r', null, (err, fd) => { + if (err) { + return error(err); + } - function end(err: Error, result: string): void { - fs.close(fd, (closeError: Error) => { - if (closeError) { - return error(closeError); - } + function end(err: Error, result: string): void { + fs.close(fd, (closeError: Error) => { + if (closeError) { + return error(closeError); + } - if (err && (err).code === 'EISDIR') { - return error(err); // we want to bubble this error up (file is actually a folder) - } + if (err && (err).code === 'EISDIR') { + return error(err); // we want to bubble this error up (file is actually a folder) + } - return complete(result); - }); - } + return complete(result); + }); + } - let buffer = new Buffer(maximumBytesToRead); - let bytesRead = 0; - let zeroAttempts = 0; - function loop(): void { - fs.read(fd, buffer, bytesRead, chunkBytes, null, (err, moreBytesRead) => { - if (err) { - return end(err, null); - } + let buffer = new Buffer(maximumBytesToRead); + let bytesRead = 0; + let zeroAttempts = 0; + function loop(): void { + fs.read(fd, buffer, bytesRead, chunkBytes, null, (err, moreBytesRead) => { + if (err) { + return end(err, null); + } - // Retry up to N times in case 0 bytes where read - if (moreBytesRead === 0) { - if (++zeroAttempts === 10) { - return end(null, null); - } + // Retry up to N times in case 0 bytes where read + if (moreBytesRead === 0) { + if (++zeroAttempts === 10) { + return end(null, null); + } - return loop(); - } + return loop(); + } - bytesRead += moreBytesRead; + bytesRead += moreBytesRead; - const newLineIndex = buffer.indexOf(matchingString); - if (newLineIndex >= 0) { - return end(null, buffer.toString('utf8').substr(0, newLineIndex)); - } + const newLineIndex = buffer.indexOf(matchingString); + if (newLineIndex >= 0) { + return end(null, buffer.toString('utf8').substr(0, newLineIndex)); + } - if (bytesRead >= maximumBytesToRead) { - return end(new Error(`Could not find ${matchingString} in first ${maximumBytesToRead} bytes of ${file}`), null); - } + if (bytesRead >= maximumBytesToRead) { + return end(new Error(`Could not find ${matchingString} in first ${maximumBytesToRead} bytes of ${file}`), null); + } - return loop(); - }); - } + return loop(); + }); + } - loop(); - }) - ); + loop(); + }) + ); } \ No newline at end of file diff --git a/src/vs/base/test/node/encoding/encoding.test.ts b/src/vs/base/test/node/encoding/encoding.test.ts index d1f861ad79e..ce229da6f90 100644 --- a/src/vs/base/test/node/encoding/encoding.test.ts +++ b/src/vs/base/test/node/encoding/encoding.test.ts @@ -13,7 +13,7 @@ suite('Encoding', () => { test('detectBOM UTF-8', (done: (err?: any) => void) => { const file = require.toUrl('./fixtures/some_utf8.css'); - encoding.detectEncodingByBOM(file).then( (encoding : string) => { + encoding.detectEncodingByBOM(file).then((encoding: string) => { assert.equal(encoding, 'utf8'); done(); }, done); diff --git a/src/vs/base/test/node/stream/stream.test.ts b/src/vs/base/test/node/stream/stream.test.ts index 2826ef443da..5fe172fd21b 100644 --- a/src/vs/base/test/node/stream/stream.test.ts +++ b/src/vs/base/test/node/stream/stream.test.ts @@ -52,7 +52,7 @@ suite('Stream', () => { test('readToMatchingString - ANSI', function (done: (err?: any) => void) { const file = require.toUrl('./fixtures/file.css'); - stream.readToMatchingString(file, '\n', 10, 100).then ((result: string) => { + stream.readToMatchingString(file, '\n', 10, 100).then((result: string) => { // \r may be present on Windows assert.equal(result.replace('\r', ''), '/*---------------------------------------------------------------------------------------------'); done(); diff --git a/src/vs/workbench/services/search/node/worker/searchWorker.ts b/src/vs/workbench/services/search/node/worker/searchWorker.ts index 220ec72eb0c..42f2e326782 100644 --- a/src/vs/workbench/services/search/node/worker/searchWorker.ts +++ b/src/vs/workbench/services/search/node/worker/searchWorker.ts @@ -209,7 +209,7 @@ export class SearchWorkerEngine { // Detect encoding and mime when this is the beginning of the file if (isFirstRead) { - const mimeAndEncoding = detectMimeAndEncodingFromBuffer({buffer, bytesRead}); + const mimeAndEncoding = detectMimeAndEncodingFromBuffer({ buffer, bytesRead }); if (mimeAndEncoding.mimes[mimeAndEncoding.mimes.length - 1] !== baseMime.MIME_TEXT) { return clb(null); // skip files that seem binary }