Merge branch 'master' into clusters

src/common/buffer/Buffer.ts

@@ -270,8 +270,8 @@ export class Buffer implements IBuffer {
   private _batchedMemoryCleanup(): boolean {
     let normalRun = true;
     if (this._memoryCleanupPosition >= this.lines.length) {
-      // cleanup made it once through all lines, thus rescan in loop below to also catch shifted lines,
-      // which should finish rather quick if there are no more cleanups pending
+      // cleanup made it once through all lines, thus rescan in loop below to also catch shifted
+      // lines, which should finish rather quick if there are no more cleanups pending
       this._memoryCleanupPosition = 0;
       normalRun = false;
     }

src/common/buffer/Marker.ts

@@ -11,9 +11,9 @@ export class Marker implements IMarker {
   private static _nextId = 1;
 
   public isDisposed: boolean = false;
-  private _disposables: IDisposable[] = [];
+  private readonly _disposables: IDisposable[] = [];
 
-  private _id: number = Marker._nextId++;
+  private readonly _id: number = Marker._nextId++;
   public get id(): number { return this._id; }
 
   private readonly _onDispose = this.register(new EventEmitter<void>());