From 4a1d1fdffb2464fbc311f99ddacabfacc0f9eaf9 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Tue, 22 Sep 2015 09:25:02 -0600
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20use=20Serializable=20mixin=20in?=
 =?UTF-8?q?=20TokenizedBuffer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/tokenized-buffer.coffee | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/tokenized-buffer.coffee b/src/tokenized-buffer.coffee
index 9a45bd623..8721b0547 100644
--- a/src/tokenized-buffer.coffee
+++ b/src/tokenized-buffer.coffee
@@ -2,7 +2,6 @@ _ = require 'underscore-plus'
 {CompositeDisposable, Emitter} = require 'event-kit'
 {Point, Range} = require 'text-buffer'
 {ScopeSelector} = require 'first-mate'
-Serializable = require 'serializable'
 Model = require './model'
 TokenizedLine = require './tokenized-line'
 TokenIterator = require './token-iterator'
@@ -11,8 +10,6 @@ ScopeDescriptor = require './scope-descriptor'
 
 module.exports =
 class TokenizedBuffer extends Model
-  Serializable.includeInto(this)
-
   grammar: null
   currentGrammarScore: null
   buffer: null
@@ -24,6 +21,10 @@ class TokenizedBuffer extends Model
   configSettings: null
   changeCount: 0
 
+  @deserialize: (state) ->
+    state.buffer = atom.project.bufferForPathSync(state.bufferPath)
+    new this(state)
+
   constructor: ({@buffer, @tabLength, @ignoreInvisibles, @largeFileMode}) ->
     @emitter = new Emitter
     @disposables = new CompositeDisposable
@@ -40,16 +41,13 @@ class TokenizedBuffer extends Model
   destroyed: ->
     @disposables.dispose()
 
-  serializeParams: ->
+  serialize: ->
+    deserializer: 'TokenizedBuffer'
     bufferPath: @buffer.getPath()
     tabLength: @tabLength
     ignoreInvisibles: @ignoreInvisibles
     largeFileMode: @largeFileMode
 
-  deserializeParams: (params) ->
-    params.buffer = atom.project.bufferForPathSync(params.bufferPath)
-    params
-
   observeGrammar: (callback) ->
     callback(@grammar)
     @onDidChangeGrammar(callback)