Ship with hunspell dictionaries on Linux and Windows.

Calculate invisibles correctly

build/tasks/build-task.coffee

@@ -47,7 +47,8 @@ module.exports = (grunt) ->
       path.join('less', 'test')
       path.join('bootstrap', 'docs')
       path.join('bootstrap', 'examples')
-      path.join('spellchecker', 'vendor')
+      # Add .* to avoid matching hunspell_dictionaries.
+      path.join('spellchecker', 'vendor', 'hunspell', '.*')
       path.join('xmldom', 'test')
       path.join('jasmine-reporters', 'ext')
       path.join('build', 'Release', 'obj.target')
@@ -56,6 +57,9 @@ module.exports = (grunt) ->
       path.join('resources', 'mac')
       path.join('resources', 'win')
     ]
+    # Hunspell dictionaries are only not needed on OS X.
+    if process.platform is 'darwin'
+      ignoredPaths.push path.join('spellchecker', 'vendor', 'hunspell_dictionaries')
     ignoredPaths = ignoredPaths.map (ignoredPath) -> "(#{ignoredPath})"
     nodeModulesFilter = new RegExp(ignoredPaths.join('|'))
     packageFilter = new RegExp("(#{ignoredPaths.join('|')})|(.+\\.(cson|coffee)$)")

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.78.0",
+  "version": "0.79.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
@@ -12,7 +12,7 @@
     "url": "https://github.com/atom/atom/issues"
   },
   "license": "All Rights Reserved",
-  "atomShellVersion": "0.11.3",
+  "atomShellVersion": "0.11.4",
   "dependencies": {
     "async": "0.2.6",
     "atom-keymap": "^0.11.0",
@@ -41,16 +41,16 @@
     "q": "^1.0.1",
     "random-words": "0.0.1",
     "runas": "0.5.x",
-    "scandal": "0.15.0",
+    "scandal": "0.15.2",
     "scrollbar-style": "^0.1.0",
     "season": ">=1.0.2 <2.0",
     "semver": "1.1.4",
     "serializable": "1.x",
     "space-pen": "3.1.1",
     "temp": "0.5.0",
-    "text-buffer": "^1.4.5",
+    "text-buffer": "^1.4.6",
     "theorist": "1.x",
-    "underscore-plus": ">=1.0.5 <2.0",
+    "underscore-plus": "^1.1.2",
     "vm-compatibility-layer": "0.1.0"
   },
   "packageDependencies": {
@@ -67,27 +67,27 @@
     "autosave": "0.13.0",
     "background-tips": "0.9.0",
     "bookmarks": "0.22.0",
-    "bracket-matcher": "0.26.0",
+    "bracket-matcher": "0.27.0",
     "command-palette": "0.19.0",
     "dev-live-reload": "0.30.0",
     "exception-reporting": "0.17.0",
     "feedback": "0.28.0",
-    "find-and-replace": "0.92.0",
+    "find-and-replace": "0.93.0",
     "fuzzy-finder": "0.42.0",
-    "git-diff": "0.25.0",
+    "git-diff": "0.26.0",
     "go-to-line": "0.18.0",
     "grammar-selector": "0.23.0",
     "image-view": "0.32.0",
     "keybinding-resolver": "0.12.0",
     "link": "0.20.0",
-    "markdown-preview": "0.51.0",
+    "markdown-preview": "0.54.0",
     "metrics": "0.32.0",
     "open-on-github": "0.23.0",
     "package-generator": "0.30.0",
     "release-notes": "0.26.0",
-    "settings-view": "0.97.0",
+    "settings-view": "0.98.0",
     "snippets": "0.40.0",
-    "spell-check": "0.28.0",
+    "spell-check": "0.30.0",
     "status-bar": "0.37.0",
     "styleguide": "0.26.0",
     "symbols-view": "0.46.0",
@@ -99,12 +99,12 @@
     "whitespace": "0.21.0",
     "wrap-guide": "0.18.0",
     "language-c": "0.13.0",
-    "language-coffee-script": "0.16.0",
+    "language-coffee-script": "0.17.0",
     "language-css": "0.13.0",
     "language-gfm": "0.25.0",
     "language-git": "0.9.0",
     "language-go": "0.7.0",
-    "language-html": "0.15.0",
+    "language-html": "0.17.0",
     "language-hyperlink": "0.9.0",
     "language-java": "0.9.0",
     "language-javascript": "0.21.0",

spec/editor-view-spec.coffee

@@ -2894,6 +2894,20 @@ describe "EditorView", ->
       for rowNumber in [1..5]
         expect(editorView.lineElementForScreenRow(rowNumber).text()).toBe buffer.lineForRow(rowNumber)
 
+    it "correctly calculates the position left for non-monospaced invisibles", ->
+      editorView.setShowInvisibles(true)
+      editorView.setInvisibles tab: '♘'
+      editor.setText('\tx')
+
+      editorView.setFontFamily('serif')
+      editorView.setFontSize(10)
+      editorView.attachToDom()
+      editorView.setWidthInChars(5)
+
+      expect(editorView.pixelPositionForScreenPosition([0, 0]).left).toEqual 0
+      expect(editorView.pixelPositionForScreenPosition([0, 1]).left).toEqual 10
+      expect(editorView.pixelPositionForScreenPosition([0, 2]).left).toEqual 13
+
   describe "when the window is resized", ->
     it "updates the active edit session with the current soft wrap column", ->
       editorView.attachToDom()

src/editor-view.coffee

@@ -1338,14 +1338,17 @@ class EditorView extends View
     return 0 if screenColumn == 0
 
     tokenizedLine = @editor.displayBuffer.lineForRow(screenRow)
+    textContent = lineElement.textContent
 
     left = 0
     index = 0
     for token in tokenizedLine.tokens
-      for char in token.value
+      for bufferChar in token.value
         return left if index >= screenColumn
 
-        val = @getCharacterWidthCache(token.scopes, char)
+        # Invisibles might cause renderedChar to be different than bufferChar
+        renderedChar = textContent[index]
+        val = @getCharacterWidthCache(token.scopes, renderedChar)
         if val?
           left += val
         else

src/space-pen-extensions.coffee

@@ -39,10 +39,10 @@ jQuery.fn.setTooltip = (tooltipOptions, {command, commandElement}={}) ->
 
   tooltipOptions = {title: tooltipOptions} if _.isString(tooltipOptions)
 
-  bindings = if commandElement
-    atom.keymap.keyBindingsForCommandMatchingElement(command, commandElement)
-  else
-    atom.keymap.keyBindingsForCommand(command)
+  if commandElement
+    bindings = atom.keymap.keyBindingsForCommandMatchingElement(command, commandElement)
+  else if command
+    bindings = atom.keymap.keyBindingsForCommand(command)
 
   tooltipOptions.title = "#{tooltipOptions.title} #{getKeystroke(bindings)}"