From e7de136a2749a19e81ef86f8bb5d03bc83208988 Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Mon, 13 Jul 2015 00:58:03 +0200 Subject: [PATCH] Small tweaks after review --- spec/text-editor-spec.coffee | 1 - src/language-mode.coffee | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spec/text-editor-spec.coffee b/spec/text-editor-spec.coffee index c7fb88148..2b754f433 100644 --- a/spec/text-editor-spec.coffee +++ b/spec/text-editor-spec.coffee @@ -3023,7 +3023,6 @@ describe "TextEditor", -> expect(editor.lineTextForBufferRow(9)).toBe " c(x);" expect(editor.lineTextForBufferRow(10)).toBe " }" - describe "when pasting a line of text without line ending", -> it "does not auto-indent the text", -> atom.clipboard.write("a(x);", indentBasis: 0) diff --git a/src/language-mode.coffee b/src/language-mode.coffee index 3c21a5f63..71313b32c 100644 --- a/src/language-mode.coffee +++ b/src/language-mode.coffee @@ -242,7 +242,7 @@ class LanguageMode tokenizedLine = @editor.displayBuffer.tokenizedBuffer.buildTokenizedLineForRowWithText(bufferRow, line) @suggestedIndentForTokenizedLineAtBufferRow(bufferRow, line, tokenizedLine, options) - suggestedIndentForTokenizedLineAtBufferRow: (bufferRow, line, tokenizedLine, options={}) -> + suggestedIndentForTokenizedLineAtBufferRow: (bufferRow, line, tokenizedLine, options) -> iterator = tokenizedLine.getTokenIterator() iterator.next() scopeDescriptor = new ScopeDescriptor(scopes: iterator.getScopes()) @@ -254,7 +254,7 @@ class LanguageMode currentIndentLevel = @editor.indentationForBufferRow(bufferRow) return currentIndentLevel unless increaseIndentRegex - if options.skipBlankLines ? true + if options?.skipBlankLines ? true precedingRow = @buffer.previousNonBlankRow(bufferRow) return 0 unless precedingRow? else