upgrade to api 1.0

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.1
+* Fixed: Upgrade to atom 1.0 api.  Upgrade autocomplete
+* Fixed: Fix issue requiring package to be manually deactivated/reactivated
+
 ## 0.3.0
 * New: Code prettify by `stylish-haskell`.
 

keymaps/ide-haskell.cson

@@ -7,8 +7,8 @@
 
 # For more detailed documentation see
 # https://atom.io/docs/latest/advanced/keymaps
-'.workspace':
+'atom-workspace':
   'ctrl-cmd-o': 'ide-haskell:toggle-output'
 
-'.editor':
+'atom-text-editor':
   'ctrl-cmd-s': 'ide-haskell:prettify-file'

lib/complete-provider.coffee

@@ -1,14 +1,13 @@
-{Provider, Suggestion} = require 'autocomplete-plus'
 fuzzaldrin = require 'fuzzaldrin'
 
 {CompletionDatabase} = require './completion-db'
 {isHaskellSource} = require './utils'
 ArrayHelperModule = require './utils'
 {CompleteType} = require './util-data'
+{CompositeDisposable} = require 'atom'
 
 ArrayHelperModule.extendArray(Array)
 
-
 # used regular expressions
 REGEXP_MODULE_NAME         = "[\\w\\.']"
 REGEXP_MODULE_NAME_MAYBE   = REGEXP_MODULE_NAME + "*"
@@ -36,7 +35,13 @@ PREFIX_IMPORT_FUNCTIONS    = new RegExp("[\\(\\s,]+(" + REGEXP_FUNCTION_NAME_MAY
 # regexps for completion in functions
 PREFIX_FUNCTION_NAME       = new RegExp("(" + REGEXP_FUNCTION_NAME_JUST + "|" + REGEXP_ALIAS_NAME_CAP + "\\." + REGEXP_FUNCTION_NAME_MAYBE + ")$")
 
-class CompleteProvider extends Provider
+class Suggestion
+  constructor: (options) ->
+    @word = options.word if options.word?
+    @prefix = options.prefix if options.prefix?
+    @label = options.label if options.label?
+
+class CompleteProvider
 
   pragmasWords: [
     'LANGUAGE', 'OPTIONS_GHC', 'INCLUDE', 'WARNING', 'DEPRECATED', 'INLINE',
@@ -53,11 +58,12 @@ class CompleteProvider extends Provider
     'then', 'where'
   ]
 
-  initialize: (@editorView, @manager) ->
+  constructor: (@editor, @manager) ->
+    @disposables = new CompositeDisposable
     # if saved, rebuild completion list
     @currentBuffer = @editor.getBuffer()
-    @currentBuffer.on 'will-be-saved', @onBeforeSaved
-    @currentBuffer.on 'saved', @onSaved
+    @disposables.add @currentBuffer.onWillSave @onBeforeSaved
+    @disposables.add @currentBuffer.onDidSave @onSaved
 
     # if main database updated, rebuild completion list
     @manager.mainCDB.on 'rebuild', @buildCompletionList
@@ -66,11 +72,10 @@ class CompleteProvider extends Provider
     @buildCompletionList()
 
   dispose: ->
-    @currentBuffer?.off 'saved', @onSaved
-    @currentBuffer?.off 'will-be-saved', @onBeforeSaved
     @manager?.mainCDB.off 'rebuild', @buildCompletionList
     @manager?.mainCDB.off 'updated', @setUpdatedFlag
     @manager.localCDB[@currentBuffer.getUri()]?.off 'updated', @setUpdatedFlag
+    @disposables.dispose()
 
   setUpdatedFlag: =>
     @databaseUpdated = true
@@ -96,12 +101,13 @@ class CompleteProvider extends Provider
     # rebuild local completion database
     @buildCompletionList()
 
+  # internal method: called by the from the provider requestHandler in the plugin manager
   buildSuggestions: ->
     # try to rebuild completion list if database changed
     @rebuildWordList()
     return unless @totalWordList?
 
-    selection = @editor.getSelection()
+    selection = @editor.getLastSelection()
     suggestions = @getSelectionSuggestion selection
     return unless suggestions.length
     return suggestions
@@ -133,7 +139,7 @@ class CompleteProvider extends Provider
     words = fuzzaldrin.filter @pragmasWords, prefix
 
     suggestions = for word in words when word isnt prefix
-      new Suggestion this, word: word, prefix: prefix
+      new Suggestion word: word, prefix: prefix
     return suggestions
 
   # check for language extensions
@@ -146,7 +152,7 @@ class CompleteProvider extends Provider
     words = fuzzaldrin.filter @manager.mainCDB.extensions, prefix
 
     suggestions = for word in words when word isnt prefix
-      new Suggestion this, word: word, prefix: prefix
+      new Suggestion word: word, prefix: prefix
     return suggestions
 
   # check for ghc flags
@@ -159,7 +165,7 @@ class CompleteProvider extends Provider
     words = fuzzaldrin.filter @manager.mainCDB.ghcFlags, prefix
 
     suggestions = for word in words when word isnt prefix
-      new Suggestion this, word: word, prefix: prefix
+      new Suggestion word: word, prefix: prefix
     return suggestions
 
   # check for keywords
@@ -172,7 +178,7 @@ class CompleteProvider extends Provider
     words = fuzzaldrin.filter @keyWords, prefix
 
     suggestions = for word in words when word isnt prefix
-      new Suggestion this, word: word, prefix: prefix
+      new Suggestion word: word, prefix: prefix
     return suggestions
 
   # completions inside import statement
@@ -205,14 +211,14 @@ class CompleteProvider extends Provider
     return unless prefix? and words?
 
     suggestions = for word in words when word isnt prefix
-      new Suggestion this, word: word, prefix: prefix
+      new Suggestion word: word, prefix: prefix
     return suggestions
 
   # function scope goes here
   isLanguageFunctions: (srange, scope) =>
 
     # check if current cursor is not inside string
-    [_, scope] = @editor.getCursorScopes()
+    [_, scope] = @editor.getLastCursor().getScopeDescriptor().getScopesArray()
     return if scope? and scope in
                       [ "string.quoted.single.haskell",
                         "string.quoted.double.haskell",
@@ -226,7 +232,7 @@ class CompleteProvider extends Provider
     words = fuzzaldrin.filter @totalWordList, prefix, key: 'expr'
 
     suggestions = for word in words when word isnt prefix
-      new Suggestion this, word: word.expr, prefix: prefix, label: word.type
+      new Suggestion word: word.expr, prefix: prefix, label: word.type
     return suggestions
 
   # get prefix before cursor

lib/editor-control.coffee

@@ -1,38 +1,40 @@
-{$, $$, $$$, View} = require 'atom'
+{$$, $$$, View} = require 'atom-space-pen-views'
+$ = require 'jquery'
 {Subscriber} = require 'emissary'
 
 {Channel} = require './pending-backend'
-{isHaskellSource, screenPositionFromMouseEvent, pixelPositionFromMouseEvent} = require './utils'
+{isHaskellSource, screenPositionFromMouseEvent, pixelPositionFromMouseEvent, getElementsByClass} = require './utils'
 {TooltipView} = require './tooltip-view'
 utilGhcMod = require './util-ghc-mod'
-
+{CompositeDisposable} = require 'atom'
 
 class EditorControl
   className: ['ide-haskell-error', 'ide-haskell-warning', 'ide-haskell-lint']
 
-  constructor: (@editorView, @manager) ->
+  constructor: (@editor, @manager) ->
     @checkMarkers = []
-
-    @editor = @editorView.getEditor()
-    @gutter = @editorView.gutter
-    @scroll = @editorView.find('.scroll-view')
+    @disposables = new CompositeDisposable
+    @editorElement = atom.views.getView(@editor)
+    @gutter = $(getElementsByClass(@editorElement, '.gutter'))
+    @scroll = $(getElementsByClass(@editorElement, '.scroll-view'))
 
     @subscriber = new Subscriber()
 
     # event for editor updates
-    @subscriber.subscribe @editorView, 'editor:will-be-removed', =>
+    @disposables.add @editor.onDidDestroy =>
       @deactivate()
 
     # buffer events for automatic check
-    @subscriber.subscribe @editor.getBuffer(), 'saved', (buffer) =>
+    buffer = @editor.getBuffer()
+    @disposables.add buffer.onDidSave () =>
       return unless isHaskellSource buffer.getUri()
 
       # TODO if uri was changed, then we have to remove all current markers
-
+      workspaceElement = atom.views.getView(atom.workspace)
       if atom.config.get('ide-haskell.checkOnFileSave')
-        atom.workspaceView.trigger 'ide-haskell:check-file'
+        atom.commands.dispatch workspaceElement, 'ide-haskell:check-file'
       if atom.config.get('ide-haskell.lintOnFileSave')
-        atom.workspaceView.trigger 'ide-haskell:lint-file'
+        atom.commands.dispatch workspaceElement, 'ide-haskell:lint-file'
 
     # show expression type if mouse stopped somewhere
     @subscriber.subscribe @scroll, 'mousemove', (e) =>
@@ -59,7 +61,7 @@ class EditorControl
     @clearExprTypeTimeout()
     @hideCheckResult()
     @subscriber.unsubscribe()
-    @editorView.control = undefined
+    @disposables.dispose()
 
   # helper function to hide tooltip and stop timeout
   clearExprTypeTimeout: ->
@@ -89,7 +91,7 @@ class EditorControl
       @checkMarkers = []
 
   markerFromCheckResult: (result) ->
-    return unless result.uri is @editor.getUri()
+    return unless result.uri is @editor.getURI()
     @checkMarkers[result.type] = [] unless @checkMarkers[result.type]?
 
     # create a new marker
@@ -108,23 +110,24 @@ class EditorControl
 
   decorateMarker: (m) ->
     { marker, klass } = m
-    @editor.decorateMarker marker, type: 'gutter', class: klass
+    @editor.decorateMarker marker, type: 'line-number', class: klass
     @editor.decorateMarker marker, type: 'highlight', class: klass
     @editor.decorateMarker marker, type: 'line', class: klass
 
   # get expression type under mouse cursor and show it
   showExpressionType: (e) ->
-    return unless isHaskellSource(@editor.getUri()) and not @exprTypeTooltip?
+    return unless isHaskellSource(@editor.getURI()) and not @exprTypeTooltip?
 
-    pixelPt = pixelPositionFromMouseEvent(@editorView, e)
+    pixelPt = pixelPositionFromMouseEvent(@editor, e)
     screenPt = @editor.screenPositionForPixelPosition(pixelPt)
     bufferPt = @editor.bufferPositionForScreenPosition(screenPt)
-    nextCharPixelPt = @editor.pixelPositionForBufferPosition([bufferPt.row, bufferPt.column + 1])
+    editorElement = atom.views.getView(@editor);
+    nextCharPixelPt = editorElement.pixelPositionForBufferPosition([bufferPt.row, bufferPt.column + 1])
 
     return if pixelPt.left > nextCharPixelPt.left
 
     # find out show position
-    offset = @editorView.lineHeight * 0.7
+    offset = @editor.getLineHeightInPixels() * 0.7
     tooltipRect =
       left: e.clientX
       right: e.clientX
@@ -137,7 +140,7 @@ class EditorControl
     # process start
     @manager.pendingProcessController.start Channel.expressionType, utilGhcMod.type, {
       pt: bufferPt
-      fileName: @editor.getUri()
+      fileName: @editor.getURI()
       onResult: (result) =>
         @exprTypeTooltip?.updateText(result.type)
     }
@@ -150,7 +153,7 @@ class EditorControl
   # show check result when mouse over gutter icon
   showCheckResult: (e) ->
     @hideCheckResult()
-    row = @editor.bufferPositionForScreenPosition(screenPositionFromMouseEvent(@editorView, e)).row
+    row = @editor.bufferPositionForScreenPosition(screenPositionFromMouseEvent(@editor, e)).row
 
     # find best result for row
     foundResult = null
@@ -168,7 +171,7 @@ class EditorControl
 
     # create show position
     targetRect = e.currentTarget.getBoundingClientRect()
-    offset = @editorView.lineHeight * 0.3
+    offset = @editor.getLineHeightInPixels() * 0.3
     rect =
       left: targetRect.left - offset
       right: targetRect.right + offset