From e888b37e98a175162f3d293c0edfad5c8e3c7dcc Mon Sep 17 00:00:00 2001 From: steelbrain Date: Thu, 23 Jun 2016 09:35:54 -0700 Subject: [PATCH] :art: Address reviewer's comments --- spec/helper-spec.js | 16 ++-------------- src/index.js | 7 +++---- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/spec/helper-spec.js b/spec/helper-spec.js index d258efa..a9f3bbb 100644 --- a/spec/helper-spec.js +++ b/spec/helper-spec.js @@ -42,13 +42,7 @@ describe('linter helpers', function () { await atom.workspace.open(somethingFile) const textEditor = atom.workspace.getActiveTextEditor() const range = helpers.rangeFromLineNumber(textEditor, 7) - expect(range instanceof Array).toBe(true) - expect(range[0] instanceof Array).toBe(true) - expect(range[1] instanceof Array).toBe(true) - expect(range[0][0]).toEqual(7) - expect(range[0][1]).toEqual(0) - expect(range[1][0]).toEqual(7) - expect(range[1][1]).toEqual(2) + expect(range).toEqual([[7, 0], [7, 2]]) }) ) @@ -57,13 +51,7 @@ describe('linter helpers', function () { await atom.workspace.open(somethingFile) const textEditor = atom.workspace.getActiveTextEditor() const range = helpers.rangeFromLineNumber(textEditor, 7, 4) - expect(range instanceof Array).toBe(true) - expect(range[0] instanceof Array).toBe(true) - expect(range[1] instanceof Array).toBe(true) - expect(range[0][0]).toEqual(7) - expect(range[0][1]).toEqual(4) - expect(range[1][0]).toEqual(7) - expect(range[1][1]).toEqual(11) + expect(range).toEqual([[7, 4], [7, 11]]) }) ) diff --git a/src/index.js b/src/index.js index d474a82..3f6d5cf 100644 --- a/src/index.js +++ b/src/index.js @@ -12,11 +12,11 @@ import { exec, execNode } from 'sb-exec' let NamedRegexp = null export const FindCache = new Map() -export function rangeFromLineNumber(textEditor: TextEditor, line: number, column: ?number): Range { +export function rangeFromLineNumber(textEditor: TextEditor, line: ?number, column: ?number): Range { Helpers.validateEditor(textEditor) let lineNumber = line - if (!Number.isFinite(lineNumber) || Number.isNaN(lineNumber) || lineNumber < 0) { + if (typeof lineNumber !== 'number' || !Number.isFinite(lineNumber) || lineNumber < 0) { lineNumber = 0 } @@ -38,8 +38,7 @@ export function rangeFromLineNumber(textEditor: TextEditor, line: number, column let colEnd = lineLength let colStart = columnGiven ? column : 0 - const rowText = buffer.lineForRow(lineNumber).substr(colStart) - const match = Helpers.getWordRegexp(textEditor, [lineNumber, colStart]).exec(rowText) + const match = Helpers.getWordRegexp(textEditor, [lineNumber, colStart]).exec(lineText) if (match) { colEnd = colStart + match.index + match[0].length if (!columnGiven) {