fix more tests, get rid of any flowtype

flow-libs/atom.js.flow

@@ -274,7 +274,7 @@ declare class atom$Decoration {
 }
 
 declare class atom$DisplayMarkerLayer {
- id: number,
+ id: string,
  destroy(): void,
  clear(): void,
  isDestroyed(): boolean,
@@ -663,6 +663,7 @@ declare class atom$Range {
  end: atom$Point,
  isEmpty(): boolean,
  isEqual(otherRange: atom$RangeLike): boolean,
+ isSingleLine(): boolean,
  intersectsWith(otherRange: atom$RangeLike, exclusive?: boolean): boolean,
  containsPoint(point: atom$PointLike, exclusive?: boolean): boolean,
  containsRange(other: atom$Range, exclusive?: boolean): boolean,
@@ -686,6 +687,7 @@ type atom$StatusBarTile = {
 
 declare class atom$ScopeDescriptor {
  constructor(object: {scopes: Array<string>}): void,
+ scopes: Array<string>,
  getScopesArray(): Array<string>,
 }
 
@@ -957,7 +959,7 @@ declare class atom$TextEditor extends atom$Model {
  // Markers
  addMarkerLayer(): atom$DisplayMarkerLayer,
  getDefaultMarkerLayer(): atom$DisplayMarkerLayer,
- getMarkerLayer(id: number): atom$DisplayMarkerLayer,
+ getMarkerLayer(id: string): atom$DisplayMarkerLayer,
  markBufferPosition(position: atom$PointLike, options?: MarkerOptions): atom$Marker,
  markBufferRange(range: atom$RangeLike, options?: MarkerOptions): atom$Marker,
  markScreenRange(range: atom$RangeLike, options?: MarkerOptions): atom$Marker,
@@ -1768,6 +1770,7 @@ declare class atom$Project {
 }
 
 type TextBufferScanIterator = (arg: {
+ row: number,
  match: Array<string>,
  matchText: string,
  range: atom$Range,

lib/autocomplete/gocodeprovider-helper.js

@@ -1,11 +1,10 @@
 // @flow
 
 import path from 'path'
-import type { AtomPoint } from './provider'
 
 const vendorString = '/vendor/'
 
-export function wantedPackage(buffer: any, pos: AtomPoint) {
+export function wantedPackage(buffer: atom$TextBuffer, pos: atom$Point) {
  // get the pkg the user tries to autocomplete from the current line
  const lineTillPos = buffer.getTextInRange([[pos.row, 0], pos])
  const matches = lineTillPos.match(/(\w+)\.$/)
@@ -15,7 +14,11 @@ export function wantedPackage(buffer: any, pos: AtomPoint) {
  return matches[1]
 }
 
-export function addImport(buffer: any, pkg: string, offset: number) {
+export function addImport(
+ buffer: atom$TextBuffer,
+ pkg: string,
+ offset: number
+) {
  // find the "package ..." statement
  let row = -1
  buffer.scan(/^package /, result => {

lib/autocomplete/gocodeprovider.js

@@ -142,7 +142,7 @@ class GocodeProvider implements AutocompleteProvider {
 
  characterIsSuppressed(
  char: string,
- scopeDescriptor: { scopes: Array<string> }
+ scopeDescriptor: atom$ScopeDescriptor
  ): boolean {
  if (
  scopeDescriptor &&
@@ -188,7 +188,9 @@ class GocodeProvider implements AutocompleteProvider {
  }
  }
 
- const sameFile = this.currentFile === editor.getPath()
+ const file = editor.getPath() || ''
+
+ const sameFile = this.currentFile === file
  const sameLine =
  this.currentRow >= 0 && this.currentRow === bufferPosition.row
  const movingForward =
@@ -216,7 +218,7 @@ class GocodeProvider implements AutocompleteProvider {
  }).map(s =>
  Object.assign({}, s, { replacementPrefix: newPrefix })
  )
- this.currentFile = editor.getPath()
+ this.currentFile = file
  this.currentRow = bufferPosition.row
  this.currentColumn = bufferPosition.column
  resolve(fil)
@@ -262,7 +264,6 @@ class GocodeProvider implements AutocompleteProvider {
  resolve([])
  return
  }
- const file = buffer.getPath()
  const args = ['-f=json', 'autocomplete', file, offset.toString()]
  if (this.proposeBuiltins) args.unshift('-builtin')
  if (this.unimportedPackages) args.unshift('-unimported-packages')
@@ -313,7 +314,7 @@ class GocodeProvider implements AutocompleteProvider {
  }
 
  this.currentSuggestions = suggestions
- this.currentFile = editor.getPath()
+ this.currentFile = file
  this.currentRow = bufferPosition.row
  this.currentColumn = bufferPosition.column
  const newPrefix = editor.getTextInBufferRange([
@@ -386,8 +387,8 @@ class GocodeProvider implements AutocompleteProvider {
 
  mapMessages(
  res: RawGoCodeSuggestion,
- editor: any,
- position: any
+ editor: TextEditor,
+ position: atom$Point
  ): Array<Suggestion> {
  const candidates: GoCodeSuggestion[] = res[1]
  if (!candidates || !candidates.length) {

lib/autocomplete/provider.js

@@ -34,15 +34,9 @@ export type Suggestion = {
  descriptionMoreURL?: string
 }
 
-export type AtomPoint = {
- row: number,
- column: number,
- copy: () => AtomPoint
-}
-
 export type SuggestionRequest = {
- editor: any,
- bufferPosition: AtomPoint,
+ editor: TextEditor,
+ bufferPosition: atom$Point,
  scopeDescriptor: string,
  prefix: string,
  activatedManually: boolean
@@ -59,8 +53,8 @@ export interface AutocompleteProvider {
 
  +dipose?: () => void;
  +onDidInsertSuggestion?: ({
- editor: any,
- triggerPosition: any,
+ editor: TextEditor,
+ triggerPosition: atom$Point,
  suggestion: Suggestion
  }) => void;
 

lib/bootstrap.js

@@ -59,7 +59,7 @@ class Bootstrap {
 
  subscribeToEvents() {
  const activationHook = (hookName, fn) => {
- const hooks: any = (atom.packages: any).triggeredActivationHooks
+ const hooks = atom.packages.triggeredActivationHooks
  if (hooks && hooks.has(hookName)) {
  fn()
  return

lib/build/builder.js

@@ -26,7 +26,7 @@ class Builder {
  goconfig: GoConfig,
  linter: () => LinterDelegate,
  output: OutputManager,
- busySignal: () => any
+ busySignal: () => ?BusySignalService
  ) {
  this.goconfig = goconfig
  this.linter = linter
@@ -64,15 +64,15 @@ class Builder {
  }
  }
 
- async build(editor: any, path: string = editor.getPath()): Promise<any> {
+ async build(editor: TextEditor, path: string): Promise<void> {
  if (!atom.config.get('go-plus.config.compileOnSave')) {
  return
  }
  if (!isValidEditor(editor)) {
  throw new Error('invalid editor')
  }
  this.deleteMessages()
- const options = this.goconfig.executor.getOptions('file')
+ const options = this.goconfig.executor.getOptions('file', editor)
  const cmd = await this.goconfig.locator.findTool('go')
  if (!cmd) {
  throw new Error('cannot find go tool')

lib/config/executor.js

@@ -1,11 +1,11 @@
 // @flow
 
-import { BufferedProcess } from 'atom'
+import { BufferedProcess, TextEditor } from 'atom'
 import { spawnSync } from 'child_process'
 import { getenvironment } from './environment'
 import fs from 'fs-extra'
 import path from 'path'
-import { getEditor, projectPath } from '../utils'
+import { projectPath } from '../utils'
 
 export type ExecutorOptions = {
  timeout?: number,
@@ -196,7 +196,7 @@ class Executor {
 
  getOptions(
  kind: 'file' | 'project' = 'file',
- editor: any = getEditor()
+ editor?: ?TextEditor
  ): ExecutorOptions {
  const result: ExecutorOptions = this.getDefaultOptions(kind, editor)
  return this.ensureOptions(result)
@@ -225,7 +225,7 @@ class Executor {
 
  getDefaultOptions(
  key: 'file' | 'project' = 'file',
- editor: any = getEditor()
+ editor?: ?TextEditor
  ): ExecutorOptions {
  let options = {}
  switch (key) {

lib/config/service.js

@@ -6,12 +6,15 @@ import { Locator } from './locator'
 import type { ExecutorOptions, ExecResult } from './executor'
 import type { FindResult, Runtime } from './locator'
 
+interface PublicExecutor {
+ exec(string, Array<string>, ExecutorOptions): Promise<ExecResult>;
+ execSync(string, Array<string>, ExecutorOptions): ExecResult;
+ getOptions('file', editor: TextEditor): ExecutorOptions;
+ getOptions('project', editor?: ?TextEditor): ExecutorOptions;
+}
+
 export type GoConfig = {
- executor: {
- exec: (string, Array<string>, ExecutorOptions) => Promise<ExecResult>,
- execSync: (string, Array<string>, ExecutorOptions) => ExecResult,
- getOptions: ('file' | 'project', any) => ExecutorOptions
- },
+ executor: PublicExecutor,
  locator: {
  runtimes: () => Promise<Array<Runtime>>,
  runtime: () => Promise<false | Runtime>,

lib/doc/godoc.js

@@ -1,6 +1,6 @@
 // @flow
 
-import { CompositeDisposable, Point, Range } from 'atom'
+import { CompositeDisposable, Range } from 'atom'
 import { GodocPanel } from './godoc-panel'
 import { utf8OffsetForBufferPosition } from '../utils'
 import { buildGuruArchive } from '../guru-utils'
@@ -188,18 +188,6 @@ ${doc.doc}`
  })
  }
 
- editorByteOffset(editor: any): number {
- const cursor = editor.getLastCursor()
- const range = cursor.getCurrentWordBufferRange()
- const middle = new Point(
- range.start.row,
- Math.floor((range.start.column + range.end.column) / 2)
- )
- const charOffset = editor.buffer.characterIndexForPosition(middle)
- const text = editor.getText().substring(0, charOffset)
- return Buffer.byteLength(text, 'utf8')
- }
-
  getPanel() {
  return this.panelModel
  }

lib/format/formatter.js

@@ -50,7 +50,7 @@ class Formatter {
  console.log('skipping format, could not find tool', tool) // eslint-disable-line no-console
  return null
  }
- const options = this.goconfig.executor.getOptions('project')
+ const options = this.goconfig.executor.getOptions('project', editor)
  options.input = editor.getText()
  const args = []
  if (tool === 'goimports') {

lib/get/get-manager.js

@@ -15,7 +15,7 @@ type GetResult = {
  args: Array<string>
 }
 
-type MultiGetResult = {
+export type MultiGetResult = {
  success: boolean,
  result: ?GetResult,
  results: ?Array<GetResult>
@@ -225,7 +225,7 @@ class GetManager {
  return { success: false, result: null, results: null }
  }
 
- const executorOptions = this.goconfig.executor.getOptions('file')
+ const executorOptions = this.goconfig.executor.getOptions('project')
  const timeout = atom.config.get('go-plus.get.timeout')
  if (typeof timeout === 'number') {
  executorOptions.timeout = timeout

lib/get/service.js

@@ -2,12 +2,13 @@
 
 import { Disposable } from 'atom'
 import { GetManager } from './get-manager'
+import type { MultiGetResult } from './get-manager'
 import type { GoConfig } from './../config/service'
 
 import type { InteractiveGetOptions } from './get-manager'
 
 export type GoGet = {
- get: InteractiveGetOptions => Promise<any>,
+ get: InteractiveGetOptions => Promise<?MultiGetResult>,
  register: (string, ?Function) => Disposable
 }
 

lib/guru-utils.js

@@ -1,7 +1,8 @@
 // @flow
 
+import type { TextEditor } from 'atom'
+
 import {
- getEditor,
  getCursorPosition,
  isValidEditor,
  utf8OffsetForBufferPosition
@@ -17,7 +18,7 @@ const scopedModes = [
  'referrers'
 ]
 
-function buildGuruArchive(editor: any = null) {
+function buildGuruArchive(editor: ?TextEditor) {
  let archive = ''
  const editors = editor ? [editor] : atom.workspace.getTextEditors()
  for (const e of editors) {
@@ -33,14 +34,18 @@ function buildGuruArchive(editor: any = null) {
 function computeArgs(
  mode: string,
  options: ?{ gopath: string },
- editor: any = getEditor(),
+ editor: TextEditor,
  pos: number = currentCursorOffset(editor)
 ): ?Array<string> {
  if (!mode || !editor || (!pos && pos !== 0)) {
  return undefined
  }
 
  const filePath = editor.getPath()
+ if (!filePath) {
+ return undefined
+ }
+
  const args = ['-json']
  if (scopedModes.includes(mode)) {
  const src = 'src/'
@@ -59,15 +64,16 @@ function computeArgs(
  return args
 }
 
-function currentCursorOffset(editor: any = getEditor()): number {
- const pos = adjustPositionForGuru(getCursorPosition(), editor)
+function currentCursorOffset(editor: TextEditor): number {
+ let pos = getCursorPosition(editor)
+ if (!pos) {
+ return 0
+ }
+ pos = adjustPositionForGuru(pos, editor)
  return utf8OffsetForBufferPosition(pos, editor)
 }
 
-function adjustPositionForGuru(
- pos: any = getCursorPosition(),
- editor: any = getEditor()
-) {
+function adjustPositionForGuru(pos: atom$Point, editor: TextEditor) {
  if (!pos) {
  return pos
  }
@@ -78,9 +84,7 @@ function adjustPositionForGuru(
  // at the given position is considered a part of an identifier.
  // If not step back 1 char as it might contain a valid identifier.
  const char = editor.getTextInBufferRange([pos, pos.translate([0, 1])])
- const nonWordChars = editor.getNonWordCharacters(
- editor.scopeDescriptorForBufferPosition(pos)
- )
+ const nonWordChars = editor.getNonWordCharacters(pos)
  if (nonWordChars.indexOf(char) >= 0 || /\s/.test(char)) {
  return pos.translate([0, -1])
  }