Remove the bom for the string and the buffer

dotnet · Sep 19, 2018 · 454f43c · 454f43c
1 parent 342a5b4
commit 454f43c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/omnisharp/server.ts b/src/omnisharp/server.ts
@@ -29,7 +29,8 @@ import CompositeDisposable from '../CompositeDisposable';
 import Disposable from '../Disposable';
 import OptionProvider from '../observers/OptionProvider';
 import { IMonoResolver } from '../constants/IMonoResolver';
-import * as removeBom from "remove-bom-buffer";
+const removeBomBuffer = require("remove-bom-buffer");
+const removeBomString = require("strip-bom");
 
 enum ServerState {
     Starting,
@@ -517,7 +518,7 @@ export class OmniSharpServer {
     private async _doConnect(options: Options): Promise<void> {
 
         this._serverProcess.stderr.on('data', (data: Buffer) => {
-            let trimData = removeBom.remove(data);
+            let trimData = <Buffer>removeBomBuffer(data);
             if (trimData.length > 0) {
                 this._fireEvent(Events.StdErr, trimData.toString());
             }
@@ -567,6 +568,7 @@ export class OmniSharpServer {
     }
 
     private _onLineReceived(line: string) {
+        line = removeBomString(line);
         line = line.trim();
 
         if (line[0] !== '{') {

diff --git a/typings/remove-bom-buffer.d.ts b/typings/remove-bom-buffer.d.ts