🎨 Address reviewer's comments

steelbrain · Jun 23, 2016 · e888b37 · e888b37
1 parent 890f080
commit e888b37
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git 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
@@ -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) {