Upgrade to settings-view@0.152

Don't fail create-installer if ATOM_ACCESS_TOKEN isn't set

CONTRIBUTING.md

@@ -12,14 +12,14 @@ propose changes to this document in a pull request.
 ## Submitting Issues
 
 * Check the [debugging guide](https://atom.io/docs/latest/debugging) for tips
-  on debugging. You might be able to find the cause of the problem and fix 
+  on debugging. You might be able to find the cause of the problem and fix
   things yourself.
 * Include the version of Atom you are using and the OS.
 * Include screenshots and animated GIFs whenever possible; they are immensely
   helpful.
 * Include the behavior you expected and other places you've seen that behavior
   such as Emacs, vi, Xcode, etc.
-* Check the dev tools (`alt-cmd-i`) for errors to include. If the dev tools 
+* Check the dev tools (`alt-cmd-i`) for errors to include. If the dev tools
   are open _before_ the error is triggered, a full stack trace for the error
   will be logged. If you can reproduce the error, use this approach to get the
   full stack trace and include it in the issue.
@@ -82,6 +82,7 @@ For more information on how to work with Atom's official packages, see
     * :green_heart: `:green_heart:` when fixing the CI build
     * :white_check_mark: `:white_check_mark:` when adding tests
     * :lock: `:lock:` when dealing with security
+    * :arrow_up: `:arrow_up:` when upgrading dependencies
 
 ## CoffeeScript Styleguide
 

apm/package.json

@@ -6,6 +6,6 @@
     "url": "https://github.com/atom/atom.git"
   },
   "dependencies": {
-    "atom-package-manager": "0.101.0"
+    "atom-package-manager": "0.102.0"
   }
 }

atom.sh

@@ -71,9 +71,7 @@ elif [ $OS == 'Linux' ]; then
   ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
   DOT_ATOM_DIR="$HOME/.atom"
 
-  if [ ! -d "$DOT_ATOM_DIR" ]; then
-    mkdir -p "$DOT_ATOM_DIR"
-  fi
+  mkdir -p "$DOT_ATOM_DIR"
 
   : ${TMPDIR:=/tmp}
 

build/Gruntfile.coffee

@@ -120,7 +120,10 @@ module.exports = (grunt) ->
 
   for child in fs.readdirSync('node_modules') when child isnt '.bin'
     directory = path.join('node_modules', child)
-    {engines, theme} = grunt.file.readJSON(path.join(directory, 'package.json'))
+    metadataPath = path.join(directory, 'package.json')
+    continue unless grunt.file.isFile(metadataPath)
+
+    {engines, theme} = grunt.file.readJSON(metadataPath)
     if engines?.atom?
       coffeeConfig.glob_to_multiple.src.push("#{directory}/**/*.coffee")
       lessConfig.glob_to_multiple.src.push("#{directory}/**/*.less")

build/tasks/create-installer.coffee

@@ -12,6 +12,8 @@ module.exports = (grunt) ->
 
     buildDir = grunt.config.get('atom.buildDir')
     atomDir = path.join(buildDir, 'Atom')
+    releasesDir = path.join(buildDir, 'Releases')
+    atomGitHubToken = process.env.ATOM_ACCESS_TOKEN
 
     packageInfo = grunt.file.readJSON(path.join(atomDir, 'resources', 'app', 'package.json'))
     inputTemplate = grunt.file.read(path.join('build', 'windows', 'atom.nuspec.erb'))
@@ -22,20 +24,23 @@ module.exports = (grunt) ->
     targetNuspecPath = path.join(buildDir, 'atom.nuspec')
     grunt.file.write(targetNuspecPath, _.template(inputTemplate, packageInfo))
 
-    cmd = 'build/windows/nuget.exe'
-    args = ['pack', targetNuspecPath, '-BasePath', atomDir, '-OutputDirectory', buildDir]
+    # We use the previous releases to build deltas for the current release,
+    # sync down the existing releases directory by rolling through GitHub releases
+    cmd = 'build/windows/SyncGitHubReleases.exe'
+    args = ['-r', releasesDir, '-u', 'https://github.com/atom/atom', '-t', atomGitHubToken]
 
     spawn {cmd, args}, (error, result, code) ->
-      return done(error) if error?
+      if error?
+        grunt.log.error "ATOM_ACCESS_TOKEN environment variable not set or invalid, can't download old releases; continuing anyways"
 
-      pkgs = pkg for pkg in fs.readdirSync(buildDir) when path.extname(pkg) is '.nupkg'
+      cmd = 'build/windows/nuget.exe'
+      args = ['pack', targetNuspecPath, '-BasePath', atomDir, '-OutputDirectory', buildDir]
 
-      releasesDir = path.join(buildDir, 'Releases')
+      spawn {cmd, args}, (error, result, code) ->
+        return done(error) if error?
 
-      # NB: Gonna clear Releases for now, in the future we need to pull down
-      # the existing version
-      rm(releasesDir)
+        pkgs = pkg for pkg in fs.readdirSync(buildDir) when path.extname(pkg) is '.nupkg'
 
-      cmd = 'build/windows/update.com'
-      args = ['--releasify', path.join(buildDir, pkgs), '-r', releasesDir, '-g', 'build/windows/install-spinner.gif']
-      spawn {cmd, args}, (error, result, code) -> done(error)
+        cmd = 'build/windows/update.com'
+        args = ['--releasify', path.join(buildDir, pkgs), '-r', releasesDir, '-g', 'build/windows/install-spinner.gif']
+        spawn {cmd, args}, (error, result, code) -> done(error)

build/tasks/install-task.coffee

@@ -40,11 +40,11 @@ module.exports = (grunt) ->
       mkdir path.dirname(shareDir)
       cp shellAppDir, shareDir
 
-      # Create Atom.desktop if installation not in temporary folder
+      # Create atom.desktop if installation not in temporary folder
       tmpDir = if process.env.TMPDIR? then process.env.TMPDIR else '/tmp'
       if installDir.indexOf(tmpDir) isnt 0
-        desktopFile = path.join('resources', 'linux', 'Atom.desktop.in')
-        desktopInstallFile = path.join(installDir, 'share', 'applications', 'Atom.desktop')
+        desktopFile = path.join('resources', 'linux', 'atom.desktop.in')
+        desktopInstallFile = path.join(installDir, 'share', 'applications', 'atom.desktop')
 
         {description} = grunt.file.readJSON('package.json')
         iconName = path.join(shareDir, 'resources', 'app', 'resources', 'atom.png')

build/tasks/mkdeb-task.coffee

@@ -39,7 +39,7 @@ module.exports = (grunt) ->
     getInstalledSize buildDir, (error, installedSize) ->
       data = {name, version, description, section, arch, maintainer, installDir, iconName, installedSize}
       controlFilePath = fillTemplate(path.join('resources', 'linux', 'debian', 'control'), data)
-      desktopFilePath = fillTemplate(path.join('resources', 'linux', 'Atom.desktop'), data)
+      desktopFilePath = fillTemplate(path.join('resources', 'linux', 'atom.desktop'), data)
       icon = path.join('resources', 'atom.png')
 
       cmd = path.join('script', 'mkdeb')

docs/advanced/keymaps.md

@@ -6,25 +6,25 @@ Keymap files are encoded as JSON or CSON files containing nested hashes. They
 work much like stylesheets, but instead of applying style properties to elements
 matching the selector, they specify the meaning of keystrokes on elements
 matching the selector. Here is an example of some bindings that apply when
-keystrokes pass through elements with the class `.editor`:
+keystrokes pass through `atom-text-editor` elements:
 
 ```coffee
-'.editor':
+'atom-text-editor':
   'cmd-delete': 'editor:delete-to-beginning-of-line'
   'alt-backspace': 'editor:delete-to-beginning-of-word'
   'ctrl-A': 'editor:select-to-first-character-of-line'
   'ctrl-shift-e': 'editor:select-to-end-of-line'
   'cmd-left': 'editor:move-to-first-character-of-line'
 
-'.editor:not(.mini)'
+'atom-text-editor:not(.mini)'
   'cmd-alt-[': 'editor:fold-current-row'
   'cmd-alt-]': 'editor:unfold-current-row'
 ```
 
 Beneath the first selector are several bindings, mapping specific *keystroke
-patterns* to *commands*. When an element with the `.editor` class is focused and
+patterns* to *commands*. When an element with the `atom-text-editor` class is focused and
 `cmd-delete` is pressed, an custom DOM event called
-`editor:delete-to-beginning-of-line` is emitted on the `.editor` element.
+`editor:delete-to-beginning-of-line` is emitted on the `atom-text-editor` element.
 
 The second selector group also targets editors, but only if they don't have the
 `.mini` class. In this example, the commands for code folding don't really make
@@ -91,7 +91,7 @@ the current keystroke sequence and continue searching from its parent. If you
 want to remove a binding from a keymap you don't control, such as keymaps in
 Atom core or in packages, use the `unset!` directive.
 
-For example, the following code removes the keybinding for `a` in the Tree View, 
+For example, the following code removes the keybinding for `a` in the Tree View,
 which is normally used to trigger the `tree-view:add-file` command:
 
 ```coffee

docs/advanced/view-system.md

@@ -11,7 +11,7 @@ have methods that are view-specific. For example, you could call both general
 and view-specific on the global `atom.workspaceView` instance:
 
 ```coffeescript
-atom.workspaceView.find('.editor.active') # standard jQuery method
+atom.workspaceView.find('atom-text-editor.active') # standard jQuery method
 atom.workspaceView.getActiveEditor()      # view-specific method
 ```
 
@@ -20,7 +20,7 @@ If you retrieve a jQuery wrapper for an element associated with a view, use the
 
 ```coffeescript
 # this is a plain jQuery object; you can't call view-specific methods
-editorElement = atom.workspaceView.find('.editor.active')
+editorElement = atom.workspaceView.find('atom-text-editor.active')
 
 # get the view object by calling `.view()` to call view-specific methods
 editorView = editorElement.view()

docs/build-instructions/linux.md

@@ -16,7 +16,7 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.
 
 ### Ubuntu / Debian
 
-* `sudo apt-get install build-essential git libgnome-keyring-dev`
+* `sudo apt-get install build-essential git libgnome-keyring-dev fakeroot`
 * Instructions for  [Node.js](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#ubuntu-mint-elementary-os).
 
 ### Fedora

docs/creating-a-package.md

@@ -210,7 +210,7 @@ specific parts of the interface, like adding a file in the tree-view:
   '.tree-view': [
     {label: 'Add file', command: 'tree-view:add-file'}
   ]
-  '.workspace': [
+  'atom-workspace': [
     {label: 'Inspect Element', command: 'core:inspect'}
   ]
 ```
@@ -233,7 +233,7 @@ an item with a single `type: 'separator'` key/value pair.
 
 ```coffeescript
 'context-menu':
-  '.workspace': [
+  'atom-workspace': [
     {
       label: 'Text'
       submenu: [

docs/customizing-atom.md

@@ -60,10 +60,10 @@ with events in specific contexts. Here's a small example, excerpted from Atom's
 built-in keymaps:
 
 ```coffee
-'.editor':
+'atom-text-editor':
   'enter': 'editor:newline'
 
-'.mini.editor input':
+'atom-text-editor.mini input':
   'enter': 'core:confirm'
 ```
 
@@ -169,7 +169,7 @@ For example, to change the color of the cursor, you could add the following
 rule to your _~/.atom/styles.less_ file:
 
 ```less
-.editor.is-focused .cursor {
+atom-text-editor.is-focused .cursor {
   border-color: pink;
 }
 ```

docs/your-first-package.md

@@ -91,13 +91,13 @@ _keymaps/ascii-art.cson_ and add a key binding linking `ctrl-alt-a` to the
 you don't need it anymore. When finished, the file will look like this:
 
 ```coffeescript
-'.editor':
+'atom-text-editor':
   'cmd-alt-a': 'ascii-art:convert'
 ```
 
-Notice `.editor` on the first line. Just like CSS, keymap selectors *scope* key
+Notice `atom-text-editor` on the first line. Just like CSS, keymap selectors *scope* key
 bindings so they only apply to specific elements. In this case, our binding is
-only active for elements matching the `.editor` selector. If the Tree View has
+only active for elements matching the `atom-text-editor` selector. If the Tree View has
 focus, pressing `cmd-alt-a` won't trigger the `ascii-art:convert` command. But
 if the editor has focus, the `ascii-art:convert` method *will* be triggered.
 More information on key bindings can be found in the

dot-atom/keymap.cson

@@ -9,7 +9,7 @@
 #
 # Here's an example taken from Atom's built-in keymap:
 #
-# '.editor':
+# 'atom-text-editor':
 #   'enter': 'editor:newline'
 #
 # '.workspace':

dot-atom/styles.less

@@ -12,10 +12,10 @@
 
 }
 
-.editor {
+atom-text-editor {
 
 }
 
-.editor .cursor {
+atom-text-editor .cursor {
 
 }

keymaps/base.cson

@@ -1,11 +1,11 @@
-'.editor':
+'atom-text-editor':
   # Platform Bindings
   'home': 'editor:move-to-first-character-of-line'
   'end': 'editor:move-to-end-of-screen-line'
   'shift-home': 'editor:select-to-first-character-of-line'
   'shift-end': 'editor:select-to-end-of-line'
 
-'.editor:not(.mini)':
+'atom-text-editor:not(.mini)':
   # Atom Specific
   'ctrl-C': 'editor:copy-path'
 
@@ -18,7 +18,7 @@
 '.tool-panel.panel-left, .tool-panel.panel-right':
   'escape': 'tool-panel:unfocus'
 
-'.editor !important, .editor.mini !important':
+'atom-text-editor !important, atom-text-editor.mini !important':
   'escape': 'editor:consolidate-selections'
 
 # allow standard input fields to work correctly

keymaps/darwin.cson

@@ -100,7 +100,7 @@
   'cmd-8': 'pane:show-item-8'
   'cmd-9': 'pane:show-item-9'
 
-'.editor':
+'atom-text-editor':
   # Platform Bindings
   'alt-left': 'editor:move-to-beginning-of-word'
   'alt-right': 'editor:move-to-end-of-word'
@@ -134,7 +134,7 @@
   'cmd-l': 'editor:select-line'
   'ctrl-t': 'editor:transpose'
 
-'.workspace .editor:not(.mini)':
+'atom-workspace atom-text-editor:not(.mini)':
   # Atom specific
   'alt-cmd-z': 'editor:checkout-head-revision'
   'cmd-<': 'editor:scroll-to-cursor'

keymaps/emacs.cson

@@ -1,4 +1,4 @@
-'.editor':
+'atom-text-editor':
   'alt-f': 'editor:move-to-end-of-word'
   'alt-F': 'editor:select-to-end-of-word'
   'alt-b': 'editor:move-to-beginning-of-word'

keymaps/linux.cson

@@ -79,7 +79,7 @@
   'alt-8': 'pane:show-item-8'
   'alt-9': 'pane:show-item-9'
 
-'.workspace .editor':
+'atom-workspace atom-text-editor':
   # Platform Bindings
   'ctrl-left': 'editor:move-to-beginning-of-word'
   'ctrl-right': 'editor:move-to-end-of-word'
@@ -99,7 +99,7 @@
   'ctrl-k ctrl-l': 'editor:lower-case'
   'ctrl-l': 'editor:select-line'
 
-'.workspace .editor:not(.mini)':
+'atom-workspace atom-text-editor:not(.mini)':
   # Atom specific
   'alt-ctrl-z': 'editor:checkout-head-revision'
   'ctrl-<': 'editor:scroll-to-cursor'

keymaps/win32.cson

@@ -74,7 +74,7 @@
   'ctrl-k ctrl-left':  'window:focus-pane-on-left'
   'ctrl-k ctrl-right': 'window:focus-pane-on-right'
 
-'.workspace .editor':
+'atom-workspace atom-text-editor':
   # Platform Bindings
   'ctrl-left': 'editor:move-to-beginning-of-word'
   'ctrl-right': 'editor:move-to-end-of-word'
@@ -94,7 +94,7 @@
   'ctrl-k ctrl-l': 'editor:lower-case'
   'ctrl-l': 'editor:select-line'
 
-'.workspace .editor:not(.mini)':
+'atom-workspace atom-text-editor:not(.mini)':
   # Atom specific
   'alt-ctrl-z': 'editor:checkout-head-revision'
   'ctrl-<': 'editor:scroll-to-cursor'

menus/darwin.cson

@@ -212,7 +212,7 @@
     {label: 'Split Right', command: 'pane:split-right'}
     {type: 'separator'}
   ]
-  '.pane': [
+  'atom-pane': [
     {type: 'separator'}
     {label: 'Split Up', command: 'pane:split-up'}
     {label: 'Split Down', command: 'pane:split-down'}

menus/linux.cson

@@ -169,7 +169,7 @@
     {label: 'Split Right', command: 'pane:split-right'}
     {type: 'separator'}
   ]
-  '.pane': [
+  'atom-pane': [
     {type: 'separator'}
     {label: 'Split Up', command: 'pane:split-up'}
     {label: 'Split Down', command: 'pane:split-down'}

menus/win32.cson

@@ -187,7 +187,7 @@
     {label: 'Split Right', command: 'pane:split-right'}
     {type: 'separator'}
   ]
-  '.pane': [
+  'atom-pane': [
     {type: 'separator'}
     {label: 'Split Up', command: 'pane:split-up'}
     {label: 'Split Down', command: 'pane:split-down'}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.136.0",
+  "version": "0.137.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
@@ -17,10 +17,10 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.17.1",
+  "atomShellVersion": "0.18.0",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "^2.2.0",
+    "atom-keymap": "^2.2.1",
     "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
     "clear-cut": "0.4.0",
     "coffee-script": "1.7.0",
@@ -35,6 +35,7 @@
     "git-utils": "^2.1.5",
     "grim": "0.12.0",
     "guid": "0.0.10",
+    "jasmine-json": "~0.0",
     "jasmine-tagged": "^1.1.2",
     "less-cache": "0.15.0",
     "mixto": "^1",
@@ -50,12 +51,12 @@
     "reactionary-atom-fork": "^1.0.0",
     "runas": "1.0.1",
     "scandal": "1.0.2",
-    "scoped-property-store": "^0.11.0",
+    "scoped-property-store": "^0.13.2",
     "scrollbar-style": "^1.0.2",
     "season": "^1.0.2",
     "semver": "1.1.4",
     "serializable": "^1",
-    "space-pen": "3.6.1",
+    "space-pen": "3.8.0",
     "temp": "0.7.0",
     "text-buffer": "^3.2.8",
     "theorist": "^1.0.2",
@@ -83,21 +84,21 @@
     "dev-live-reload": "0.34.0",
     "exception-reporting": "0.20.0",
     "feedback": "0.33.0",
-    "find-and-replace": "0.139.0",
+    "find-and-replace": "0.140.0",
     "fuzzy-finder": "0.58.0",
     "git-diff": "0.39.0",
     "go-to-line": "0.25.0",
-    "grammar-selector": "0.34.0",
+    "grammar-selector": "0.35.0",
     "image-view": "0.37.0",
-    "incompatible-packages": "0.9.0",
+    "incompatible-packages": "0.10.0",
     "keybinding-resolver": "0.20.0",
     "link": "0.25.0",
-    "markdown-preview": "0.103.0",
+    "markdown-preview": "0.104.0",
     "metrics": "0.36.0",
     "open-on-github": "0.30.0",
     "package-generator": "0.31.0",
     "release-notes": "0.36.0",
-    "settings-view": "0.149.0",
+    "settings-view": "0.152.0",
     "snippets": "0.55.0",
     "spell-check": "0.42.0",
     "status-bar": "0.46.0",
@@ -105,14 +106,14 @@
     "symbols-view": "0.66.0",
     "tabs": "0.54.0",
     "timecop": "0.22.0",
-    "tree-view": "0.128.0",
+    "tree-view": "0.131.0",
     "update-package-dependencies": "0.6.0",
-    "welcome": "0.18.0",
+    "welcome": "0.19.0",
     "whitespace": "0.25.0",
-    "wrap-guide": "0.22.0",
+    "wrap-guide": "0.23.0",
     "language-c": "0.28.0",
     "language-coffee-script": "0.35.0",
-    "language-css": "0.18.0",
+    "language-css": "0.21.0",
     "language-gfm": "0.51.0",
     "language-git": "0.9.0",
     "language-go": "0.18.0",
@@ -128,7 +129,7 @@
     "language-perl": "0.9.0",
     "language-php": "0.16.0",
     "language-property-list": "0.7.0",
-    "language-python": "0.19.0",
+    "language-python": "0.20.0",
     "language-ruby": "0.39.0",
     "language-ruby-on-rails": "0.18.0",
     "language-sass": "0.22.0",
@@ -136,9 +137,9 @@
     "language-source": "0.8.0",
     "language-sql": "0.11.0",
     "language-text": "0.6.0",
-    "language-todo": "0.12.0",
+    "language-todo": "0.13.0",
     "language-toml": "0.12.0",
-    "language-xml": "0.22.0",
+    "language-xml": "0.24.0",
     "language-yaml": "0.18.0"
   },
   "private": true,

script/copy-folder.cmd

@@ -15,4 +15,4 @@ if [%2] == [] (
 if exist %2 rmdir %2 /s /q
 
 :: cp -rf %1 %2
-xcopy %1 %2 /e /h /c /i /y /r
+(robocopy %1 %2 /e) ^& IF %ERRORLEVEL% LEQ 1 exit 0

spec/command-registry-spec.coffee

@@ -14,9 +14,12 @@ describe "CommandRegistry", ->
     parent.appendChild(child)
     document.querySelector('#jasmine-content').appendChild(parent)
 
-    registry = new CommandRegistry(parent)
+    registry = new CommandRegistry
 
-  describe "command dispatch", ->
+  afterEach ->
+    registry.destroy()
+
+  describe "when a command event is dispatched on an element", ->
     it "invokes callbacks with selectors matching the target", ->
       called = false
       registry.add '.grandchild', 'command', (event) ->
@@ -48,6 +51,16 @@ describe "CommandRegistry", ->
       grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
       expect(calls).toEqual ['child', 'parent']
 
+    it "invokes inline listeners prior to listeners applied via selectors", ->
+      calls = []
+      registry.add '.grandchild', 'command', -> calls.push('grandchild')
+      registry.add child, 'command', -> calls.push('child-inline')
+      registry.add '.child', 'command', -> calls.push('child')
+      registry.add '.parent', 'command', -> calls.push('parent')
+
+      grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
+      expect(calls).toEqual ['grandchild', 'child-inline', 'child', 'parent']
+
     it "orders multiple matching listeners for an element by selector specificity", ->
       child.classList.add('foo', 'bar')
       calls = []
@@ -86,8 +99,6 @@ describe "CommandRegistry", ->
       expect(dispatchedEvent.stopImmediatePropagation).toHaveBeenCalled()
 
     it "forwards .preventDefault() calls from the synthetic event to the original", ->
-      calls = []
-
       registry.add '.child', 'command', (event) -> event.preventDefault()
 
       dispatchedEvent = new CustomEvent('command', bubbles: true)
@@ -95,6 +106,14 @@ describe "CommandRegistry", ->
       grandchild.dispatchEvent(dispatchedEvent)
       expect(dispatchedEvent.preventDefault).toHaveBeenCalled()
 
+    it "forwards .abortKeyBinding() calls from the synthetic event to the original", ->
+      registry.add '.child', 'command', (event) -> event.abortKeyBinding()
+
+      dispatchedEvent = new CustomEvent('command', bubbles: true)
+      dispatchedEvent.abortKeyBinding = jasmine.createSpy('abortKeyBinding')
+      grandchild.dispatchEvent(dispatchedEvent)
+      expect(dispatchedEvent.abortKeyBinding).toHaveBeenCalled()
+
     it "allows listeners to be removed via a disposable returned by ::add", ->
       calls = []
 

spec/config-spec.coffee

@@ -200,7 +200,7 @@ describe "Config", ->
 
         expect(CSON.writeFileSync.argsForCall[0][0]).toBe(path.join(atom.config.configDirPath, "atom.config.json"))
         writtenConfig = CSON.writeFileSync.argsForCall[0][1]
-        expect(writtenConfig).toBe atom.config.settings
+        expect(writtenConfig).toEqual global: atom.config.settings
 
     describe "when ~/.atom/config.json doesn't exist", ->
       it "writes any non-default properties to ~/.atom/config.cson", ->
@@ -214,9 +214,29 @@ describe "Config", ->
         atom.config.save()
 
         expect(CSON.writeFileSync.argsForCall[0][0]).toBe(path.join(atom.config.configDirPath, "atom.config.cson"))
-        CoffeeScript = require 'coffee-script'
         writtenConfig = CSON.writeFileSync.argsForCall[0][1]
-        expect(writtenConfig).toEqual atom.config.settings
+        expect(writtenConfig).toEqual global: atom.config.settings
+
+    describe "when scoped settings are defined", ->
+      it 'writes out explicitly set config settings', ->
+        atom.config.set('.source.ruby', 'foo.bar', 'ruby')
+        atom.config.set('.source.ruby', 'foo.omg', 'wow')
+        atom.config.set('.source.coffee', 'foo.bar', 'coffee')
+
+        CSON.writeFileSync.reset()
+        atom.config.save()
+
+        writtenConfig = CSON.writeFileSync.argsForCall[0][1]
+        expect(writtenConfig).toEqualJson
+          global:
+            atom.config.settings
+          '.ruby.source':
+            foo:
+              bar: 'ruby'
+              omg: 'wow'
+          '.coffee.source':
+            foo:
+              bar: 'coffee'
 
   describe ".setDefaults(keyPath, defaults)", ->
     it "assigns any previously-unassigned keys to the object at the key path", ->
@@ -320,6 +340,14 @@ describe "Config", ->
       atom.config.set('foo.bar.baz', "value 2")
       expect(observeHandler).not.toHaveBeenCalled()
 
+    it 'does not fire the callback for a similarly named keyPath', ->
+      bazCatHandler = jasmine.createSpy("bazCatHandler")
+      observeSubscription = atom.config.observe "foo.bar.bazCat", bazCatHandler
+
+      bazCatHandler.reset()
+      atom.config.set('foo.bar.baz', "value 10")
+      expect(bazCatHandler).not.toHaveBeenCalled()
+
   describe ".initializeConfigDirectory()", ->
     beforeEach ->
       if fs.existsSync(dotAtomPath)
@@ -356,6 +384,23 @@ describe "Config", ->
     afterEach ->
       fs.removeSync(dotAtomPath)
 
+    describe "when the config file contains scoped settings", ->
+      beforeEach ->
+        fs.writeFileSync atom.config.configFilePath, """
+          global:
+            foo:
+              bar: 'baz'
+
+          '.source.ruby':
+            foo:
+              bar: 'more-specific'
+        """
+        atom.config.loadUserConfig()
+
+      it "updates the config data based on the file contents", ->
+        expect(atom.config.get("foo.bar")).toBe 'baz'
+        expect(atom.config.get(['.source.ruby'], "foo.bar")).toBe 'more-specific'
+
     describe "when the config file contains valid cson", ->
       beforeEach ->
         fs.writeFileSync(atom.config.configFilePath, "foo: bar: 'baz'")
@@ -430,7 +475,15 @@ describe "Config", ->
       atom.config.configDirPath = dotAtomPath
       atom.config.configFilePath = path.join(atom.config.configDirPath, "atom.config.cson")
       expect(fs.existsSync(atom.config.configDirPath)).toBeFalsy()
-      fs.writeFileSync(atom.config.configFilePath, "foo: bar: 'baz'")
+      fs.writeFileSync atom.config.configFilePath, """
+        global:
+          foo:
+            bar: 'baz'
+            scoped: false
+        '.source.ruby':
+          foo:
+            scoped: true
+      """
       atom.config.loadUserConfig()
       atom.config.observeUserConfig()
       updatedHandler = jasmine.createSpy("updatedHandler")
@@ -474,6 +527,38 @@ describe "Config", ->
             expect(atom.config.get('foo.bar')).toEqual ['baz', 'ok']
             expect(atom.config.get('foo.omg')).toBe 'another'
 
+      describe 'when scoped settings are used', ->
+        it "fires a change event for scoped settings that are removed", ->
+          atom.config.onDidChange ['.source.ruby'], 'foo.scoped', scopedSpy = jasmine.createSpy()
+
+          fs.writeFileSync atom.config.configFilePath, """
+            global:
+              foo:
+                scoped: false
+          """
+          waitsFor 'update event', -> updatedHandler.callCount > 0
+          runs ->
+            expect(scopedSpy).toHaveBeenCalled()
+            expect(atom.config.get(['.source.ruby'], 'foo.scoped')).toBe false
+
+        it "does not fire a change event for paths that did not change", ->
+          atom.config.onDidChange ['.source.ruby'], 'foo.scoped', noChangeSpy = jasmine.createSpy()
+
+          fs.writeFileSync atom.config.configFilePath, """
+            global:
+              foo:
+                bar: 'baz'
+            '.source.ruby':
+              foo:
+                scoped: true
+          """
+          waitsFor 'update event', -> updatedHandler.callCount > 0
+          runs ->
+            expect(noChangeSpy).not.toHaveBeenCalled()
+            expect(atom.config.get(['.source.ruby'], 'foo.bar')).toBe 'baz'
+            expect(atom.config.get(['.source.ruby'], 'foo.scoped')).toBe true
+
+
     describe "when the config file changes to omit a setting with a default", ->
       it "resets the setting back to the default", ->
         fs.writeFileSync(atom.config.configFilePath, "foo: { baz: 'new'}")
@@ -866,9 +951,9 @@ describe "Config", ->
   describe "scoped settings", ->
     describe ".get(scopeDescriptor, keyPath)", ->
       it "returns the property with the most specific scope selector", ->
-        atom.config.addScopedSettings(".source.coffee .string.quoted.double.coffee", foo: bar: baz: 42)
-        atom.config.addScopedSettings(".source .string.quoted.double", foo: bar: baz: 22)
-        atom.config.addScopedSettings(".source", foo: bar: baz: 11)
+        atom.config.addScopedSettings("config", ".source.coffee .string.quoted.double.coffee", foo: bar: baz: 42)
+        atom.config.addScopedSettings("config", ".source .string.quoted.double", foo: bar: baz: 22)
+        atom.config.addScopedSettings("config", ".source", foo: bar: baz: 11)
 
         expect(atom.config.get([".source.coffee", ".string.quoted.double.coffee"], "foo.bar.baz")).toBe 42
         expect(atom.config.get([".source.js", ".string.quoted.double.js"], "foo.bar.baz")).toBe 22
@@ -876,8 +961,8 @@ describe "Config", ->
         expect(atom.config.get([".text"], "foo.bar.baz")).toBeUndefined()
 
       it "favors the most recently added properties in the event of a specificity tie", ->
-        atom.config.addScopedSettings(".source.coffee .string.quoted.single", foo: bar: baz: 42)
-        atom.config.addScopedSettings(".source.coffee .string.quoted.double", foo: bar: baz: 22)
+        atom.config.addScopedSettings("config", ".source.coffee .string.quoted.single", foo: bar: baz: 42)
+        atom.config.addScopedSettings("config", ".source.coffee .string.quoted.double", foo: bar: baz: 22)
 
         expect(atom.config.get([".source.coffee", ".string.quoted.single"], "foo.bar.baz")).toBe 42
         expect(atom.config.get([".source.coffee", ".string.quoted.single.double"], "foo.bar.baz")).toBe 22
@@ -889,9 +974,9 @@ describe "Config", ->
 
     describe ".set(scope, keyPath, value)", ->
       it "sets the value and overrides the others", ->
-        atom.config.addScopedSettings(".source.coffee .string.quoted.double.coffee", foo: bar: baz: 42)
-        atom.config.addScopedSettings(".source .string.quoted.double", foo: bar: baz: 22)
-        atom.config.addScopedSettings(".source", foo: bar: baz: 11)
+        atom.config.addScopedSettings("config", ".source.coffee .string.quoted.double.coffee", foo: bar: baz: 42)
+        atom.config.addScopedSettings("config", ".source .string.quoted.double", foo: bar: baz: 22)
+        atom.config.addScopedSettings("config", ".source", foo: bar: baz: 11)
 
         expect(atom.config.get([".source.coffee", ".string.quoted.double.coffee"], "foo.bar.baz")).toBe 42
 
@@ -917,11 +1002,11 @@ describe "Config", ->
         expect(changeSpy).toHaveBeenCalledWith(12)
         changeSpy.reset()
 
-        disposable1 = atom.config.addScopedSettings(".source .string.quoted.double", foo: bar: baz: 22)
+        disposable1 = atom.config.addScopedSettings("a", ".source .string.quoted.double", foo: bar: baz: 22)
         expect(changeSpy).toHaveBeenCalledWith(22)
         changeSpy.reset()
 
-        disposable2 = atom.config.addScopedSettings("a", ".source.coffee .string.quoted.double.coffee", foo: bar: baz: 42)
+        disposable2 = atom.config.addScopedSettings("b", ".source.coffee .string.quoted.double.coffee", foo: bar: baz: 42)
         expect(changeSpy).toHaveBeenCalledWith(42)
         changeSpy.reset()
 
@@ -946,11 +1031,11 @@ describe "Config", ->
         expect(changeSpy).toHaveBeenCalledWith({oldValue: undefined, newValue: 12, keyPath})
         changeSpy.reset()
 
-        disposable1 = atom.config.addScopedSettings(".source .string.quoted.double", foo: bar: baz: 22)
+        disposable1 = atom.config.addScopedSettings("a", ".source .string.quoted.double", foo: bar: baz: 22)
         expect(changeSpy).toHaveBeenCalledWith({oldValue: 12, newValue: 22, keyPath})
         changeSpy.reset()
 
-        disposable2 = atom.config.addScopedSettings("a", ".source.coffee .string.quoted.double.coffee", foo: bar: baz: 42)
+        disposable2 = atom.config.addScopedSettings("b", ".source.coffee .string.quoted.double.coffee", foo: bar: baz: 42)
         expect(changeSpy).toHaveBeenCalledWith({oldValue: 22, newValue: 42, keyPath})
         changeSpy.reset()
 

spec/fixtures/packages/package-with-activation-commands/index.coffee

@@ -6,7 +6,7 @@ module.exports =
   activate: ->
     @activateCallCount++
 
-    atom.commands.add '.workspace', 'activation-command', =>
+    atom.commands.add 'atom-workspace', 'activation-command', =>
       @activationCommandCallCount++
 
     atom.workspaceView.getActiveView()?.command 'activation-command', =>

spec/fixtures/packages/package-with-empty-activation-commands/package.json

@@ -1,5 +1,5 @@
 {
   "name": "no events",
   "version": "0.1.0",
-  "activationCommands": {".workspace": []}
+  "activationCommands": {"atom-workspace": []}
 }

spec/fixtures/packages/theme-with-incomplete-ui-variables/stylesheets/editor.less

@@ -1,6 +1,6 @@
 @import "ui-variables";
 
-.editor {
+atom-text-editor {
   padding-top: @component-padding;
   padding-right: @component-padding;
   padding-bottom: @component-padding;

spec/fixtures/packages/theme-with-index-css/index.css

@@ -1,3 +1,3 @@
-.editor {
+atom-text-editor {
   padding-top: 1234px;
 }

spec/fixtures/packages/theme-with-index-less/index.less

@@ -1,5 +1,5 @@
 @padding: 4321px;
 
-.editor {
+atom-text-editor {
   padding-top: @padding;
 }

spec/fixtures/packages/theme-with-package-file/stylesheets/first.css

@@ -1,4 +1,4 @@
-.editor {
+atom-text-editor {
   padding-top: 101px;
   padding-right: 101px;
   padding-bottom: 101px;

spec/fixtures/packages/theme-with-package-file/stylesheets/last.css

@@ -1,4 +1,4 @@
-.editor {
+atom-text-editor {
 /*  padding-top: 103px;
   padding-right: 103px;*/
   padding-bottom: 103px;

spec/fixtures/packages/theme-with-package-file/stylesheets/second.less

@@ -1,6 +1,6 @@
 @number: 102px;
 
-.editor {
+atom-text-editor {
 /*  padding-top: 102px;*/
   padding-right: @number;
   padding-bottom: @number;

spec/fixtures/packages/theme-with-ui-variables/stylesheets/editor.less

@@ -1,6 +1,6 @@
 @import "ui-variables";
 
-.editor {
+atom-text-editor {
   padding-top: @component-padding;
   padding-right: @component-padding;
   padding-bottom: @component-padding;

spec/fixtures/packages/theme-without-package-file/stylesheets/a.css

@@ -1,4 +1,4 @@
-.editor {
+atom-text-editor {
   padding-top: 10px;
   padding-right: 10px;
   padding-bottom: 10px;

spec/fixtures/packages/theme-without-package-file/stylesheets/b.css

@@ -1,4 +1,4 @@
-.editor {
+atom-text-editor {
   padding-right: 20px;
   padding-bottom: 20px;
 }

spec/fixtures/packages/theme-without-package-file/stylesheets/c.less

@@ -1,5 +1,5 @@
 @number: 30px;
 
-.editor {
+atom-text-editor {
   padding-bottom: @number;
 }

spec/fixtures/packages/theme-without-package-file/stylesheets/d.csv

@@ -1,4 +1,4 @@
-.editor {
+atom-text-editor {
   padding-top: 100px;
   padding-right: 100px;
   padding-bottom: 100px;

spec/package-manager-spec.coffee

@@ -138,7 +138,7 @@ describe "PackageManager", ->
               legacyCommandListener = jasmine.createSpy("legacyCommandListener")
               editorView.command 'activation-command', legacyCommandListener
               editorCommandListener = jasmine.createSpy("editorCommandListener")
-              atom.commands.add '.editor', 'activation-command', editorCommandListener
+              atom.commands.add 'atom-text-editor', 'activation-command', editorCommandListener
               editorView[0].dispatchEvent(new CustomEvent('activation-command', bubbles: true))
               expect(mainModule.activate.callCount).toBe 1
               expect(mainModule.legacyActivationCommandCallCount).toBe 1

spec/package-spec.coffee

@@ -38,51 +38,51 @@ describe "Package", ->
     theme = null
 
     beforeEach ->
-      $("#jasmine-content").append $("<div class='editor'></div>")
+      $("#jasmine-content").append $("<atom-text-editor></atom-text-editor>")
 
     afterEach ->
       theme.deactivate() if theme?
 
     describe "when the theme contains a single style file", ->
       it "loads and applies css", ->
-        expect($(".editor").css("padding-bottom")).not.toBe "1234px"
+        expect($("atom-text-editor").css("padding-bottom")).not.toBe "1234px"
         themePath = atom.project.resolve('packages/theme-with-index-css')
         theme = new ThemePackage(themePath)
         theme.activate()
-        expect($(".editor").css("padding-top")).toBe "1234px"
+        expect($("atom-text-editor").css("padding-top")).toBe "1234px"
 
       it "parses, loads and applies less", ->
-        expect($(".editor").css("padding-bottom")).not.toBe "1234px"
+        expect($("atom-text-editor").css("padding-bottom")).not.toBe "1234px"
         themePath = atom.project.resolve('packages/theme-with-index-less')
         theme = new ThemePackage(themePath)
         theme.activate()
-        expect($(".editor").css("padding-top")).toBe "4321px"
+        expect($("atom-text-editor").css("padding-top")).toBe "4321px"
 
     describe "when the theme contains a package.json file", ->
       it "loads and applies stylesheets from package.json in the correct order", ->
-        expect($(".editor").css("padding-top")).not.toBe("101px")
-        expect($(".editor").css("padding-right")).not.toBe("102px")
-        expect($(".editor").css("padding-bottom")).not.toBe("103px")
+        expect($("atom-text-editor").css("padding-top")).not.toBe("101px")
+        expect($("atom-text-editor").css("padding-right")).not.toBe("102px")
+        expect($("atom-text-editor").css("padding-bottom")).not.toBe("103px")
 
         themePath = atom.project.resolve('packages/theme-with-package-file')
         theme = new ThemePackage(themePath)
         theme.activate()
-        expect($(".editor").css("padding-top")).toBe("101px")
-        expect($(".editor").css("padding-right")).toBe("102px")
-        expect($(".editor").css("padding-bottom")).toBe("103px")
+        expect($("atom-text-editor").css("padding-top")).toBe("101px")
+        expect($("atom-text-editor").css("padding-right")).toBe("102px")
+        expect($("atom-text-editor").css("padding-bottom")).toBe("103px")
 
     describe "when the theme does not contain a package.json file and is a directory", ->
       it "loads all stylesheet files in the directory", ->
-        expect($(".editor").css("padding-top")).not.toBe "10px"
-        expect($(".editor").css("padding-right")).not.toBe "20px"
-        expect($(".editor").css("padding-bottom")).not.toBe "30px"
+        expect($("atom-text-editor").css("padding-top")).not.toBe "10px"
+        expect($("atom-text-editor").css("padding-right")).not.toBe "20px"
+        expect($("atom-text-editor").css("padding-bottom")).not.toBe "30px"
 
         themePath = atom.project.resolve('packages/theme-without-package-file')
         theme = new ThemePackage(themePath)
         theme.activate()
-        expect($(".editor").css("padding-top")).toBe "10px"
-        expect($(".editor").css("padding-right")).toBe "20px"
-        expect($(".editor").css("padding-bottom")).toBe "30px"
+        expect($("atom-text-editor").css("padding-top")).toBe "10px"
+        expect($("atom-text-editor").css("padding-right")).toBe "20px"
+        expect($("atom-text-editor").css("padding-bottom")).toBe "30px"
 
     describe "reloading a theme", ->
       beforeEach ->

spec/pane-container-view-spec.coffee

@@ -74,13 +74,13 @@ describe "PaneContainerView", ->
   describe "serialization", ->
     it "can be serialized and deserialized, and correctly adjusts dimensions of deserialized panes after attach", ->
       newContainer = atom.workspace.getView(container.model.testSerialization()).__spacePenView
-      expect(newContainer.find('.pane-row > :contains(1)')).toExist()
-      expect(newContainer.find('.pane-row > .pane-column > :contains(2)')).toExist()
-      expect(newContainer.find('.pane-row > .pane-column > :contains(3)')).toExist()
+      expect(newContainer.find('atom-pane-axis.horizontal > :contains(1)')).toExist()
+      expect(newContainer.find('atom-pane-axis.horizontal > atom-pane-axis.vertical > :contains(2)')).toExist()
+      expect(newContainer.find('atom-pane-axis.horizontal > atom-pane-axis.vertical > :contains(3)')).toExist()
 
       newContainer.height(200).width(300).attachToDom()
-      expect(newContainer.find('.pane-row > :contains(1)').width()).toBe 150
-      expect(newContainer.find('.pane-row > .pane-column > :contains(2)').height()).toBe 100
+      expect(newContainer.find('atom-pane-axis.horizontal > :contains(1)').width()).toBe 150
+      expect(newContainer.find('atom-pane-axis.horizontal > atom-pane-axis.vertical > :contains(2)').height()).toBe 100
 
     describe "if there are empty panes after deserialization", ->
       beforeEach ->
@@ -90,14 +90,14 @@ describe "PaneContainerView", ->
       describe "if the 'core.destroyEmptyPanes' config option is false (the default)", ->
         it "leaves the empty panes intact", ->
           newContainer = atom.workspace.getView(container.model.testSerialization()).__spacePenView
-          expect(newContainer.find('.pane-row > :contains(1)')).toExist()
-          expect(newContainer.find('.pane-row > .pane-column > .pane').length).toBe 2
+          expect(newContainer.find('atom-pane-axis.horizontal > :contains(1)')).toExist()
+          expect(newContainer.find('atom-pane-axis.horizontal > atom-pane-axis.vertical > atom-pane').length).toBe 2
 
       describe "if the 'core.destroyEmptyPanes' config option is true", ->
         it "removes empty panes on deserialization", ->
           atom.config.set('core.destroyEmptyPanes', true)
           newContainer = atom.workspace.getView(container.model.testSerialization()).__spacePenView
-          expect(newContainer.find('.pane-row, .pane-column')).not.toExist()
+          expect(newContainer.find('atom-pane-axis.horizontal, atom-pane-axis.vertical')).not.toExist()
           expect(newContainer.find('> :contains(1)')).toExist()
 
   describe "pane-container:active-pane-item-changed", ->

spec/pane-view-spec.coffee

@@ -131,9 +131,9 @@ describe "PaneView", ->
     describe "when the destroyed item is a model", ->
       it "removes the associated view", ->
         paneModel.activateItem(editor1)
-        expect(pane.itemViews.find('.editor').length).toBe 1
+        expect(pane.itemViews.find('atom-text-editor').length).toBe 1
         pane.destroyItem(editor1)
-        expect(pane.itemViews.find('.editor').length).toBe 0
+        expect(pane.itemViews.find('atom-text-editor').length).toBe 0
 
   describe "when an item is moved within the same pane", ->
     it "emits a 'pane:item-moved' event with the item and the new index", ->
@@ -289,7 +289,7 @@ describe "PaneView", ->
       expect(paneModel.isActive()).toBe true
 
   describe "when a pane is split", ->
-    it "builds the appropriate pane-row and pane-column views", ->
+    it "builds the appropriateatom-pane-axis.horizontal and pane-column views", ->
       pane1 = pane
       pane1Model = pane.getModel()
       pane.activateItem(editor1)
@@ -300,11 +300,11 @@ describe "PaneView", ->
       pane2 = containerModel.getView(pane2Model).__spacePenView
       pane3 = containerModel.getView(pane3Model).__spacePenView
 
-      expect(container.find('> .pane-row > .pane').toArray()).toEqual [pane1[0]]
-      expect(container.find('> .pane-row > .pane-column > .pane').toArray()).toEqual [pane2[0], pane3[0]]
+      expect(container.find('> atom-pane-axis.horizontal > atom-pane').toArray()).toEqual [pane1[0]]
+      expect(container.find('> atom-pane-axis.horizontal > atom-pane-axis.vertical > atom-pane').toArray()).toEqual [pane2[0], pane3[0]]
 
       pane1Model.destroy()
-      expect(container.find('> .pane-column > .pane').toArray()).toEqual [pane2[0], pane3[0]]
+      expect(container.find('> atom-pane-axis.vertical > atom-pane').toArray()).toEqual [pane2[0], pane3[0]]
 
   describe "serialization", ->
     it "focuses the pane after attach only if had focus when serialized", ->

spec/spec-helper.coffee

@@ -2,6 +2,7 @@ require '../src/window'
 atom.initialize()
 atom.restoreWindowDimensions()
 
+require 'jasmine-json'
 require '../vendor/jasmine-jquery'
 path = require 'path'
 _ = require 'underscore-plus'
@@ -72,7 +73,6 @@ beforeEach ->
   atom.project = new Project(paths: [projectPath])
   atom.workspace = new Workspace()
   atom.keymaps.keyBindings = _.clone(keyBindingsToRestore)
-  atom.commands.setRootNode(document.body)
   atom.commands.restoreSnapshot(commandsToRestore)
 
   window.resetTimeouts()

spec/text-editor-component-spec.coffee

@@ -277,7 +277,7 @@ describe "TextEditorComponent", ->
         expect(leafNodes[0].classList.contains('invisible-character')).toBe true
         expect(leafNodes[leafNodes.length - 1].classList.contains('invisible-character')).toBe true
 
-      it "displays newlines as their own token outside of the other tokens' scopes", ->
+      it "displays newlines as their own token outside of the other tokens' scopeDescriptor", ->
         editor.setText "var\n"
         nextAnimationFrame()
         expect(component.lineNodeForScreenRow(0).innerHTML).toBe "<span class=\"source js\"><span class=\"storage modifier js\">var</span></span><span class=\"invisible-character\">#{invisibles.eol}</span>"
@@ -446,12 +446,6 @@ describe "TextEditorComponent", ->
         foldedLineNode = component.lineNodeForScreenRow(4)
         expect(foldedLineNode.querySelector('.fold-marker')).toBeFalsy()
 
-    getLeafNodes = (node) ->
-      if node.children.length > 0
-        flatten(toArray(node.children).map(getLeafNodes))
-      else
-        [node]
-
   describe "gutter rendering", ->
     [gutter] = []
 
@@ -2214,7 +2208,6 @@ describe "TextEditorComponent", ->
     it "does not render invisible characters", ->
       atom.config.set('editor.invisibles', eol: 'E')
       atom.config.set('editor.showInvisibles', true)
-      nextAnimationFrame()
       expect(component.lineNodeForScreenRow(0).textContent).toBe 'var quicksort = function () {'
 
     it "does not assign an explicit line-height on the editor contents", ->
@@ -2268,6 +2261,140 @@ describe "TextEditorComponent", ->
 
       expect(editor.getCursorBufferPosition()).toEqual [0, 1]
 
+  describe 'scoped config settings', ->
+    [coffeeEditor, coffeeComponent] = []
+
+    beforeEach ->
+      waitsForPromise ->
+        atom.packages.activatePackage('language-coffee-script')
+      waitsForPromise ->
+        atom.project.open('coffee.coffee', autoIndent: false).then (o) -> coffeeEditor = o
+
+    afterEach: ->
+      atom.packages.deactivatePackages()
+      atom.packages.unloadPackages()
+
+    describe 'soft wrap settings', ->
+      beforeEach ->
+        atom.config.set '.source.coffee', 'editor.softWrap', true
+        atom.config.set '.source.coffee', 'editor.preferredLineLength', 17
+        atom.config.set '.source.coffee', 'editor.softWrapAtPreferredLineLength', true
+
+        editor.setEditorWidthInChars(20)
+        coffeeEditor.setEditorWidthInChars(20)
+
+      it "wraps lines when editor.softWrap is true for a matching scope", ->
+        expect(editor.lineTextForScreenRow(2)).toEqual '    if (items.length <= 1) return items;'
+        expect(coffeeEditor.lineTextForScreenRow(3)).toEqual '    return items '
+
+      it 'updates the wrapped lines when editor.preferredLineLength changes', ->
+        atom.config.set '.source.coffee', 'editor.preferredLineLength', 20
+        expect(coffeeEditor.lineTextForScreenRow(2)).toEqual '    return items if '
+
+      it 'updates the wrapped lines when editor.softWrapAtPreferredLineLength changes', ->
+        atom.config.set '.source.coffee', 'editor.softWrapAtPreferredLineLength', false
+        expect(coffeeEditor.lineTextForScreenRow(2)).toEqual '    return items if '
+
+      it 'updates the wrapped lines when editor.softWrap changes', ->
+        atom.config.set '.source.coffee', 'editor.softWrap', false
+        expect(coffeeEditor.lineTextForScreenRow(2)).toEqual '    return items if items.length <= 1'
+
+        atom.config.set '.source.coffee', 'editor.softWrap', true
+        expect(coffeeEditor.lineTextForScreenRow(3)).toEqual '    return items '
+
+      it 'updates the wrapped lines when the grammar changes', ->
+        editor.setGrammar(coffeeEditor.getGrammar())
+        expect(editor.isSoftWrapped()).toBe true
+        expect(editor.lineTextForScreenRow(0)).toEqual 'var quicksort = '
+
+      describe '::isSoftWrapped()', ->
+        it 'returns the correct value based on the scoped settings', ->
+          expect(editor.isSoftWrapped()).toBe false
+          expect(coffeeEditor.isSoftWrapped()).toBe true
+
+    describe 'invisibles settings', ->
+      [jsInvisibles, coffeeInvisibles] = []
+      beforeEach ->
+        jsInvisibles =
+          eol: 'J'
+          space: 'A'
+          tab: 'V'
+          cr: 'A'
+
+        coffeeInvisibles =
+          eol: 'C'
+          space: 'O'
+          tab: 'F'
+          cr: 'E'
+
+        atom.config.set '.source.js', 'editor.showInvisibles', true
+        atom.config.set '.source.js', 'editor.invisibles', jsInvisibles
+
+        atom.config.set '.source.coffee', 'editor.showInvisibles', false
+        atom.config.set '.source.coffee', 'editor.invisibles', coffeeInvisibles
+
+        editor.setText " a line with tabs\tand spaces \n"
+        nextAnimationFrame()
+
+      it "renders the invisibles when editor.showInvisibles is true for a given grammar", ->
+        expect(component.lineNodeForScreenRow(0).textContent).toBe "#{jsInvisibles.space}a line with tabs#{jsInvisibles.tab}and spaces#{jsInvisibles.space}#{jsInvisibles.eol}"
+
+      it "does not render the invisibles when editor.showInvisibles is false for a given grammar", ->
+        editor.setGrammar(coffeeEditor.getGrammar())
+        nextAnimationFrame()
+        expect(component.lineNodeForScreenRow(0).textContent).toBe " a line with tabs and spaces "
+
+      it "re-renders the invisibles when the invisible settings change", ->
+        jsGrammar = editor.getGrammar()
+        editor.setGrammar(coffeeEditor.getGrammar())
+        atom.config.set '.source.coffee', 'editor.showInvisibles', true
+        nextAnimationFrame()
+        expect(component.lineNodeForScreenRow(0).textContent).toBe "#{coffeeInvisibles.space}a line with tabs#{coffeeInvisibles.tab}and spaces#{coffeeInvisibles.space}#{coffeeInvisibles.eol}"
+
+        newInvisibles =
+          eol: 'N'
+          space: 'E'
+          tab: 'W'
+          cr: 'I'
+        atom.config.set '.source.coffee', 'editor.invisibles', newInvisibles
+        nextAnimationFrame()
+        expect(component.lineNodeForScreenRow(0).textContent).toBe "#{newInvisibles.space}a line with tabs#{newInvisibles.tab}and spaces#{newInvisibles.space}#{newInvisibles.eol}"
+
+        editor.setGrammar(jsGrammar)
+        nextAnimationFrame()
+        expect(component.lineNodeForScreenRow(0).textContent).toBe "#{jsInvisibles.space}a line with tabs#{jsInvisibles.tab}and spaces#{jsInvisibles.space}#{jsInvisibles.eol}"
+
+    describe 'editor.showIndentGuide', ->
+      beforeEach ->
+        atom.config.set '.source.js', 'editor.showIndentGuide', true
+        atom.config.set '.source.coffee', 'editor.showIndentGuide', false
+
+      it "has an 'indent-guide' class when scoped editor.showIndentGuide is true, but not when scoped editor.showIndentGuide is false", ->
+        line1LeafNodes = getLeafNodes(component.lineNodeForScreenRow(1))
+        expect(line1LeafNodes[0].textContent).toBe '  '
+        expect(line1LeafNodes[0].classList.contains('indent-guide')).toBe true
+        expect(line1LeafNodes[1].classList.contains('indent-guide')).toBe false
+
+        editor.setGrammar(coffeeEditor.getGrammar())
+
+        line1LeafNodes = getLeafNodes(component.lineNodeForScreenRow(1))
+        expect(line1LeafNodes[0].textContent).toBe '  '
+        expect(line1LeafNodes[0].classList.contains('indent-guide')).toBe false
+        expect(line1LeafNodes[1].classList.contains('indent-guide')).toBe false
+
+      it "removes the 'indent-guide' class when editor.showIndentGuide to false", ->
+        line1LeafNodes = getLeafNodes(component.lineNodeForScreenRow(1))
+        expect(line1LeafNodes[0].textContent).toBe '  '
+        expect(line1LeafNodes[0].classList.contains('indent-guide')).toBe true
+        expect(line1LeafNodes[1].classList.contains('indent-guide')).toBe false
+
+        atom.config.set '.source.js', 'editor.showIndentGuide', false
+
+        line1LeafNodes = getLeafNodes(component.lineNodeForScreenRow(1))
+        expect(line1LeafNodes[0].textContent).toBe '  '
+        expect(line1LeafNodes[0].classList.contains('indent-guide')).toBe false
+        expect(line1LeafNodes[1].classList.contains('indent-guide')).toBe false
+
   buildMouseEvent = (type, properties...) ->
     properties = extend({bubbles: true, cancelable: true}, properties...)
     properties.detail ?= 1
@@ -2304,3 +2431,9 @@ describe "TextEditorComponent", ->
 
   lineHasClass = (screenRow, klass) ->
     component.lineNodeForScreenRow(screenRow).classList.contains(klass)
+
+  getLeafNodes = (node) ->
+    if node.children.length > 0
+      flatten(toArray(node.children).map(getLeafNodes))
+    else
+      [node]

spec/text-editor-element-spec.coffee

@@ -0,0 +1,36 @@
+TextEditorElement = require '../src/text-editor-element'
+
+# The rest of text-editor-component-spec will be moved to this file when React
+# is eliminated. This covers only concerns related to the wrapper element for now
+describe "TextEditorElement", ->
+  jasmineContent = null
+
+  beforeEach ->
+    jasmineContent = document.body.querySelector('#jasmine-content')
+
+  describe "instantiation", ->
+    it "honors the mini attribute", ->
+      jasmineContent.innerHTML = "<atom-text-editor mini>"
+      element = jasmineContent.firstChild
+      expect(element.getModel().isMini()).toBe true
+
+    it "honors the placeholder-text attribute", ->
+      jasmineContent.innerHTML = "<atom-text-editor placeholder-text='testing'>"
+      element = jasmineContent.firstChild
+      expect(element.getModel().getPlaceholderText()).toBe 'testing'
+
+  describe "::focus()", ->
+    it "transfers focus to the hidden text area and does not emit 'focusout' or 'blur' events", ->
+      element = new TextEditorElement
+      jasmineContent.appendChild(element)
+
+      focusoutCalled = false
+      element.addEventListener 'focusout', -> focusoutCalled = true
+      blurCalled = false
+      element.addEventListener 'blur', -> blurCalled = true
+
+      element.focus()
+      expect(focusoutCalled).toBe false
+      expect(blurCalled).toBe false
+      expect(element.hasFocus()).toBe true
+      expect(element.querySelector('input')).toBe document.activeElement

spec/text-editor-spec.coffee

@@ -1259,7 +1259,6 @@ describe "TextEditor", ->
           editor.selectWordsContainingCursors()
           expect(editor.getSelectedText()).toBe 'var'
 
-
       describe "when the cursor is inside a region of whitespace", ->
         it "selects the whitespace region", ->
           editor.setCursorScreenPosition([5, 2])
@@ -1277,6 +1276,29 @@ describe "TextEditor", ->
           editor.selectWordsContainingCursors()
           expect(editor.getSelectedBufferRange()).toEqual [[12, 2], [12, 6]]
 
+      describe 'when editor.nonWordCharacters is set scoped to a grammar', ->
+        coffeeEditor = null
+        beforeEach ->
+          waitsForPromise ->
+            atom.packages.activatePackage('language-coffee-script')
+          waitsForPromise ->
+            atom.project.open('coffee.coffee', autoIndent: false).then (o) -> coffeeEditor = o
+
+        it 'selects the correct surrounding word for the given scoped setting', ->
+          coffeeEditor.setCursorBufferPosition [0, 9] # in the middle of quicksort
+          coffeeEditor.selectWordsContainingCursors()
+          expect(coffeeEditor.getSelectedBufferRange()).toEqual [[0, 6], [0, 15]]
+
+          atom.config.set '.source.coffee', 'editor.nonWordCharacters', 'qusort'
+
+          coffeeEditor.setCursorBufferPosition [0, 9]
+          coffeeEditor.selectWordsContainingCursors()
+          expect(coffeeEditor.getSelectedBufferRange()).toEqual [[0, 8], [0, 11]]
+
+          editor.setCursorBufferPosition [0, 7]
+          editor.selectWordsContainingCursors()
+          expect(editor.getSelectedBufferRange()).toEqual [[0, 4], [0, 13]]
+
     describe ".selectToFirstCharacterOfLine()", ->
       it "moves to the first character of the current line or the beginning of the line if it's already on the first character", ->
         editor.setCursorScreenPosition [0,5]
@@ -3038,6 +3060,51 @@ describe "TextEditor", ->
         atom.workspace.open(null, softTabs: false).then (editor) ->
           expect(editor.getSoftTabs()).toBeFalsy()
 
+  describe '.getTabLength()', ->
+    describe 'when scoped settings are used', ->
+      coffeeEditor = null
+      beforeEach ->
+        waitsForPromise ->
+          atom.packages.activatePackage('language-coffee-script')
+        waitsForPromise ->
+          atom.project.open('coffee.coffee', autoIndent: false).then (o) -> coffeeEditor = o
+
+      afterEach: ->
+        atom.packages.deactivatePackages()
+        atom.packages.unloadPackages()
+
+      it 'returns correct values based on the scope of the set grammars', ->
+        atom.config.set '.source.coffee', 'editor.tabLength', 6
+
+        expect(editor.getTabLength()).toBe 2
+        expect(coffeeEditor.getTabLength()).toBe 6
+
+      it 'retokenizes when the tab length is updated via .setTabLength()', ->
+        expect(editor.getTabLength()).toBe 2
+        expect(editor.tokenizedLineForScreenRow(5).tokens[0].firstNonWhitespaceIndex).toBe 2
+
+        editor.setTabLength(6)
+        expect(editor.getTabLength()).toBe 6
+        expect(editor.tokenizedLineForScreenRow(5).tokens[0].firstNonWhitespaceIndex).toBe 6
+
+      it 'retokenizes when the editor.tabLength setting is updated', ->
+        expect(editor.getTabLength()).toBe 2
+        expect(editor.tokenizedLineForScreenRow(5).tokens[0].firstNonWhitespaceIndex).toBe 2
+
+        atom.config.set '.source.js', 'editor.tabLength', 6
+        expect(editor.getTabLength()).toBe 6
+        expect(editor.tokenizedLineForScreenRow(5).tokens[0].firstNonWhitespaceIndex).toBe 6
+
+      it 'updates the tab length when the grammar changes', ->
+        atom.config.set '.source.coffee', 'editor.tabLength', 6
+
+        expect(editor.getTabLength()).toBe 2
+        expect(editor.tokenizedLineForScreenRow(5).tokens[0].firstNonWhitespaceIndex).toBe 2
+
+        editor.setGrammar(coffeeEditor.getGrammar())
+        expect(editor.getTabLength()).toBe 6
+        expect(editor.tokenizedLineForScreenRow(5).tokens[0].firstNonWhitespaceIndex).toBe 6
+
   describe ".indentLevelForLine(line)", ->
     it "returns the indent level when the line has only leading whitespace", ->
       expect(editor.indentLevelForLine("    hello")).toBe(2)
@@ -3077,14 +3144,15 @@ describe "TextEditor", ->
         expect(editor.tokenizedLineForScreenRow(0).tokens.length).toBeGreaterThan 1
 
   describe "auto-indent", ->
-    copyText = (text, {startColumn}={}) ->
+    copyText = (text, {startColumn, textEditor}={}) ->
       startColumn ?= 0
-      editor.setCursorBufferPosition([0, 0])
-      editor.insertText(text)
+      textEditor ?= editor
+      textEditor.setCursorBufferPosition([0, 0])
+      textEditor.insertText(text)
       numberOfNewlines = text.match(/\n/g)?.length
       endColumn = text.match(/[^\n]*$/)[0]?.length
-      editor.getLastSelection().setBufferRange([[0,startColumn], [numberOfNewlines,endColumn]])
-      editor.cutSelectedText()
+      textEditor.getLastSelection().setBufferRange([[0,startColumn], [numberOfNewlines,endColumn]])
+      textEditor.cutSelectedText()
 
     describe "editor.autoIndent", ->
       describe "when editor.autoIndent is false (default)", ->
@@ -3191,6 +3259,31 @@ describe "TextEditor", ->
             editor.insertText('foo')
             expect(editor.indentationForBufferRow(2)).toBe editor.indentationForBufferRow(1) + 1
 
+      describe 'when scoped settings are used', ->
+        coffeeEditor = null
+        beforeEach ->
+          waitsForPromise ->
+            atom.packages.activatePackage('language-coffee-script')
+          waitsForPromise ->
+            atom.project.open('coffee.coffee', autoIndent: false).then (o) -> coffeeEditor = o
+
+          runs ->
+            atom.config.set('.source.js', 'editor.autoIndent', true)
+            atom.config.set('.source.coffee', 'editor.autoIndent', false)
+
+        afterEach: ->
+          atom.packages.deactivatePackages()
+          atom.packages.unloadPackages()
+
+        it "does not auto-indent the line for javascript files", ->
+          editor.setCursorBufferPosition([1, 30])
+          editor.insertText("\n")
+          expect(editor.lineTextForBufferRow(2)).toBe "    "
+
+          coffeeEditor.setCursorBufferPosition([1, 18])
+          coffeeEditor.insertText("\n")
+          expect(coffeeEditor.lineTextForBufferRow(2)).toBe ""
+
     describe "editor.normalizeIndentOnPaste", ->
       beforeEach ->
         atom.config.set('editor.normalizeIndentOnPaste', true)
@@ -3240,6 +3333,37 @@ describe "TextEditor", ->
             expect(editor.lineTextForBufferRow(3)).toBe "  }"
             expect(editor.lineTextForBufferRow(4)).toBe ""
 
+      describe 'when scoped settings are used', ->
+        coffeeEditor = null
+        beforeEach ->
+          waitsForPromise ->
+            atom.packages.activatePackage('language-coffee-script')
+          waitsForPromise ->
+            atom.project.open('coffee.coffee', autoIndent: false).then (o) -> coffeeEditor = o
+
+          runs ->
+            atom.config.set('.source.js', 'editor.normalizeIndentOnPaste', true)
+            atom.config.set('.source.coffee', 'editor.normalizeIndentOnPaste', false)
+
+        afterEach: ->
+          atom.packages.deactivatePackages()
+          atom.packages.unloadPackages()
+
+        it "normalizes the indentation level based on scoped settings", ->
+          copyText("    while (true) {\n      foo();\n    }\n", {startColumn: 2, textEditor: coffeeEditor})
+          coffeeEditor.setCursorBufferPosition([4, 4])
+          coffeeEditor.pasteText()
+          expect(coffeeEditor.lineTextForBufferRow(4)).toBe "      while (true) {"
+          expect(coffeeEditor.lineTextForBufferRow(5)).toBe "      foo();"
+          expect(coffeeEditor.lineTextForBufferRow(6)).toBe "    }"
+
+          copyText("    while (true) {\n      foo();\n    }\n", {startColumn: 2})
+          editor.setCursorBufferPosition([3, 4])
+          editor.pasteText()
+          expect(editor.lineTextForBufferRow(3)).toBe "    while (true) {"
+          expect(editor.lineTextForBufferRow(4)).toBe "      foo();"
+          expect(editor.lineTextForBufferRow(5)).toBe "    }"
+
     it "autoIndentSelectedRows auto-indents the selection", ->
       editor.setCursorBufferPosition([2, 0])
       editor.insertText("function() {\ninside=true\n}\n  i=1\n")
@@ -3252,10 +3376,18 @@ describe "TextEditor", ->
       expect(editor.lineTextForBufferRow(5)).toBe "    i=1"
 
   describe "soft and hard tabs", ->
+    afterEach ->
+      atom.packages.deactivatePackages()
+      atom.packages.unloadPackages()
+
     it "resets the tab style when tokenization is complete", ->
       editor.destroy()
-      atom.project.open('sample-with-tabs-and-leading-comment.coffee').then (o) -> editor = o
-      expect(editor.softTabs).toBe true
+
+      waitsForPromise ->
+        atom.project.open('sample-with-tabs-and-leading-comment.coffee').then (o) -> editor = o
+
+      runs ->
+        expect(editor.softTabs).toBe true
 
       waitsForPromise ->
         atom.packages.activatePackage('language-coffee-script')
@@ -3263,9 +3395,6 @@ describe "TextEditor", ->
       runs ->
         expect(editor.softTabs).toBe false
 
-        atom.packages.deactivatePackage('language-coffee-script')
-        atom.packages.unloadPackage('language-coffee-script')
-
   describe ".destroy()", ->
     it "destroys all markers associated with the edit session", ->
       expect(buffer.getMarkerCount()).toBeGreaterThan 0
@@ -3521,10 +3650,10 @@ describe "TextEditor", ->
         {tokens} = grammar.tokenizeLine("var i; // http://github.com")
 
         expect(tokens[0].value).toBe "var"
-        expect(tokens[0].scopes).toEqual ["source.js", "storage.modifier.js"]
+        expect(tokens[0].scopeDescriptor).toEqual ["source.js", "storage.modifier.js"]
 
         expect(tokens[6].value).toBe "http://github.com"
-        expect(tokens[6].scopes).toEqual ["source.js", "comment.line.double-slash.js", "markup.underline.link.http.hyperlink"]
+        expect(tokens[6].scopeDescriptor).toEqual ["source.js", "comment.line.double-slash.js", "markup.underline.link.http.hyperlink"]
 
     describe "when the grammar is added", ->
       it "retokenizes existing buffers that contain tokens that match the injection selector", ->
@@ -3536,7 +3665,7 @@ describe "TextEditor", ->
 
           {tokens} = editor.tokenizedLineForScreenRow(0)
           expect(tokens[1].value).toBe " http://github.com"
-          expect(tokens[1].scopes).toEqual ["source.js", "comment.line.double-slash.js"]
+          expect(tokens[1].scopeDescriptor).toEqual ["source.js", "comment.line.double-slash.js"]
 
         waitsForPromise ->
           atom.packages.activatePackage('language-hyperlink')
@@ -3544,7 +3673,7 @@ describe "TextEditor", ->
         runs ->
           {tokens} = editor.tokenizedLineForScreenRow(0)
           expect(tokens[2].value).toBe "http://github.com"
-          expect(tokens[2].scopes).toEqual ["source.js", "comment.line.double-slash.js", "markup.underline.link.http.hyperlink"]
+          expect(tokens[2].scopeDescriptor).toEqual ["source.js", "comment.line.double-slash.js", "markup.underline.link.http.hyperlink"]
 
       describe "when the grammar is updated", ->
         it "retokenizes existing buffers that contain tokens that match the injection selector", ->
@@ -3556,7 +3685,7 @@ describe "TextEditor", ->
 
             {tokens} = editor.tokenizedLineForScreenRow(0)
             expect(tokens[1].value).toBe " SELECT * FROM OCTOCATS"
-            expect(tokens[1].scopes).toEqual ["source.js", "comment.line.double-slash.js"]
+            expect(tokens[1].scopeDescriptor).toEqual ["source.js", "comment.line.double-slash.js"]
 
           waitsForPromise ->
             atom.packages.activatePackage('package-with-injection-selector')
@@ -3564,7 +3693,7 @@ describe "TextEditor", ->
           runs ->
             {tokens} = editor.tokenizedLineForScreenRow(0)
             expect(tokens[1].value).toBe " SELECT * FROM OCTOCATS"
-            expect(tokens[1].scopes).toEqual ["source.js", "comment.line.double-slash.js"]
+            expect(tokens[1].scopeDescriptor).toEqual ["source.js", "comment.line.double-slash.js"]
 
           waitsForPromise ->
             atom.packages.activatePackage('language-sql')
@@ -3572,7 +3701,7 @@ describe "TextEditor", ->
           runs ->
             {tokens} = editor.tokenizedLineForScreenRow(0)
             expect(tokens[2].value).toBe "SELECT"
-            expect(tokens[2].scopes).toEqual ["source.js", "comment.line.double-slash.js", "keyword.other.DML.sql"]
+            expect(tokens[2].scopeDescriptor).toEqual ["source.js", "comment.line.double-slash.js", "keyword.other.DML.sql"]
 
   describe ".normalizeTabsInBufferRange()", ->
     it "normalizes tabs depending on the editor's soft tab/tab length settings", ->

spec/theme-manager-spec.coffee

@@ -209,7 +209,7 @@ describe "ThemeManager", ->
   describe "base stylesheet loading", ->
     beforeEach ->
       atom.workspaceView = atom.workspace.getView(atom.workspace).__spacePenView
-      atom.workspaceView.append $$ -> @div class: 'editor'
+      atom.workspaceView.append $('<atom-text-editor>')
       atom.workspaceView.attachToDom()
 
       waitsForPromise ->
@@ -227,9 +227,9 @@ describe "ThemeManager", ->
         expect(atom.workspaceView.css("background-color")).toBe "rgb(0, 0, 255)"
 
         # from within the theme itself
-        expect($(".editor").css("padding-top")).toBe "150px"
-        expect($(".editor").css("padding-right")).toBe "150px"
-        expect($(".editor").css("padding-bottom")).toBe "150px"
+        expect($("atom-text-editor").css("padding-top")).toBe "150px"
+        expect($("atom-text-editor").css("padding-right")).toBe "150px"
+        expect($("atom-text-editor").css("padding-bottom")).toBe "150px"
 
     describe "when there is a theme with incomplete variables", ->
       it "loads the correct values from the fallback ui-variables", ->
@@ -244,7 +244,7 @@ describe "ThemeManager", ->
           expect(atom.workspaceView.css("background-color")).toBe "rgb(0, 0, 255)"
 
           # from within the theme itself
-          expect($(".editor").css("background-color")).toBe "rgb(0, 152, 255)"
+          expect($("atom-text-editor").css("background-color")).toBe "rgb(0, 152, 255)"
 
     describe "theme classes on the workspace", ->
       it 'adds theme-* classes to the workspace for each active theme', ->

spec/tokenized-buffer-spec.coffee

@@ -51,12 +51,12 @@ describe "TokenizedBuffer", ->
       it "initially creates un-tokenized screen lines, then tokenizes lines chunk at a time in the background", ->
         line0 = tokenizedBuffer.tokenizedLineForRow(0)
         expect(line0.tokens.length).toBe 1
-        expect(line0.tokens[0]).toEqual(value: line0.text, scopes: ['source.js'])
+        expect(line0.tokens[0]).toEqual(value: line0.text, scopeDescriptor: ['source.js'])
 
         line11 = tokenizedBuffer.tokenizedLineForRow(11)
         expect(line11.tokens.length).toBe 2
-        expect(line11.tokens[0]).toEqual(value: "  ", scopes: ['source.js'], isAtomic: true)
-        expect(line11.tokens[1]).toEqual(value: "return sort(Array.apply(this, arguments));", scopes: ['source.js'])
+        expect(line11.tokens[0]).toEqual(value: "  ", scopeDescriptor: ['source.js'], isAtomic: true)
+        expect(line11.tokens[1]).toEqual(value: "return sort(Array.apply(this, arguments));", scopeDescriptor: ['source.js'])
 
         # background tokenization has not begun
         expect(tokenizedBuffer.tokenizedLineForRow(0).ruleStack).toBeUndefined()
@@ -149,10 +149,10 @@ describe "TokenizedBuffer", ->
           it "updates tokens to reflect the change", ->
             buffer.setTextInRange([[0, 0], [2, 0]], "foo()\n7\n")
 
-            expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[1]).toEqual(value: '(', scopes: ['source.js', 'meta.brace.round.js'])
-            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0]).toEqual(value: '7', scopes: ['source.js', 'constant.numeric.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[1]).toEqual(value: '(', scopeDescriptor: ['source.js', 'meta.brace.round.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0]).toEqual(value: '7', scopeDescriptor: ['source.js', 'constant.numeric.js'])
             # line 2 is unchanged
-            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[2]).toEqual(value: 'if', scopes: ['source.js', 'keyword.control.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[2]).toEqual(value: 'if', scopeDescriptor: ['source.js', 'keyword.control.js'])
 
             expect(changeHandler).toHaveBeenCalled()
             [event] = changeHandler.argsForCall[0]
@@ -164,7 +164,7 @@ describe "TokenizedBuffer", ->
               buffer.insert([5, 30], '/* */')
               changeHandler.reset()
               buffer.insert([2, 0], '/*')
-              expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0].scopes).toEqual ['source.js']
+              expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0].scopeDescriptor).toEqual ['source.js']
               expect(changeHandler).toHaveBeenCalled()
               [event] = changeHandler.argsForCall[0]
               delete event.bufferChange
@@ -172,9 +172,9 @@ describe "TokenizedBuffer", ->
               changeHandler.reset()
 
               advanceClock()
-              expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
-              expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
-              expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
+              expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0].scopeDescriptor).toEqual ['source.js', 'comment.block.js']
+              expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[0].scopeDescriptor).toEqual ['source.js', 'comment.block.js']
+              expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[0].scopeDescriptor).toEqual ['source.js', 'comment.block.js']
               expect(changeHandler).toHaveBeenCalled()
               [event] = changeHandler.argsForCall[0]
               delete event.bufferChange
@@ -185,23 +185,23 @@ describe "TokenizedBuffer", ->
             buffer.insert([5, 0], '*/')
 
             buffer.insert([1, 0], 'var ')
-            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0].scopeDescriptor).toEqual ['source.js', 'comment.block.js']
 
         describe "when lines are both updated and removed", ->
           it "updates tokens to reflect the change", ->
             buffer.setTextInRange([[1, 0], [3, 0]], "foo()")
 
             # previous line 0 remains
-            expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[0]).toEqual(value: 'var', scopes: ['source.js', 'storage.modifier.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[0]).toEqual(value: 'var', scopeDescriptor: ['source.js', 'storage.modifier.js'])
 
             # previous line 3 should be combined with input to form line 1
-            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0]).toEqual(value: 'foo', scopes: ['source.js'])
-            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[6]).toEqual(value: '=', scopes: ['source.js', 'keyword.operator.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0]).toEqual(value: 'foo', scopeDescriptor: ['source.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[6]).toEqual(value: '=', scopeDescriptor: ['source.js', 'keyword.operator.js'])
 
             # lines below deleted regions should be shifted upward
-            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[2]).toEqual(value: 'while', scopes: ['source.js', 'keyword.control.js'])
-            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[4]).toEqual(value: '=', scopes: ['source.js', 'keyword.operator.js'])
-            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[4]).toEqual(value: '<', scopes: ['source.js', 'keyword.operator.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[2]).toEqual(value: 'while', scopeDescriptor: ['source.js', 'keyword.control.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[4]).toEqual(value: '=', scopeDescriptor: ['source.js', 'keyword.operator.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[4]).toEqual(value: '<', scopeDescriptor: ['source.js', 'keyword.operator.js'])
 
             expect(changeHandler).toHaveBeenCalled()
             [event] = changeHandler.argsForCall[0]
@@ -214,8 +214,8 @@ describe "TokenizedBuffer", ->
             changeHandler.reset()
 
             buffer.setTextInRange([[2, 0], [3, 0]], '/*')
-            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[0].scopes).toEqual ['source.js', 'comment.block.js', 'punctuation.definition.comment.js']
-            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0].scopes).toEqual ['source.js']
+            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[0].scopeDescriptor).toEqual ['source.js', 'comment.block.js', 'punctuation.definition.comment.js']
+            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0].scopeDescriptor).toEqual ['source.js']
             expect(changeHandler).toHaveBeenCalled()
             [event] = changeHandler.argsForCall[0]
             delete event.bufferChange
@@ -223,8 +223,8 @@ describe "TokenizedBuffer", ->
             changeHandler.reset()
 
             advanceClock()
-            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
-            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0].scopeDescriptor).toEqual ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[0].scopeDescriptor).toEqual ['source.js', 'comment.block.js']
             expect(changeHandler).toHaveBeenCalled()
             [event] = changeHandler.argsForCall[0]
             delete event.bufferChange
@@ -235,19 +235,19 @@ describe "TokenizedBuffer", ->
             buffer.setTextInRange([[1, 0], [2, 0]], "foo()\nbar()\nbaz()\nquux()")
 
             # previous line 0 remains
-            expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[0]).toEqual( value: 'var', scopes: ['source.js', 'storage.modifier.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[0]).toEqual( value: 'var', scopeDescriptor: ['source.js', 'storage.modifier.js'])
 
             # 3 new lines inserted
-            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0]).toEqual(value: 'foo', scopes: ['source.js'])
-            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[0]).toEqual(value: 'bar', scopes: ['source.js'])
-            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0]).toEqual(value: 'baz', scopes: ['source.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0]).toEqual(value: 'foo', scopeDescriptor: ['source.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[0]).toEqual(value: 'bar', scopeDescriptor: ['source.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0]).toEqual(value: 'baz', scopeDescriptor: ['source.js'])
 
             # previous line 2 is joined with quux() on line 4
-            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[0]).toEqual(value: 'quux', scopes: ['source.js'])
-            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[4]).toEqual(value: 'if', scopes: ['source.js', 'keyword.control.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[0]).toEqual(value: 'quux', scopeDescriptor: ['source.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[4]).toEqual(value: 'if', scopeDescriptor: ['source.js', 'keyword.control.js'])
 
             # previous line 3 is pushed down to become line 5
-            expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[4]).toEqual(value: '=', scopes: ['source.js', 'keyword.operator.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[4]).toEqual(value: '=', scopeDescriptor: ['source.js', 'keyword.operator.js'])
 
             expect(changeHandler).toHaveBeenCalled()
             [event] = changeHandler.argsForCall[0]
@@ -264,17 +264,17 @@ describe "TokenizedBuffer", ->
             [event] = changeHandler.argsForCall[0]
             delete event.bufferChange
             expect(event).toEqual(start: 2, end: 2, delta: 2)
-            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[0].scopes).toEqual ['source.js', 'comment.block.js', 'punctuation.definition.comment.js']
-            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
-            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
-            expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[0].scopes).toEqual ['source.js']
+            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[0].scopeDescriptor).toEqual ['source.js', 'comment.block.js', 'punctuation.definition.comment.js']
+            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0].scopeDescriptor).toEqual ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[0].scopeDescriptor).toEqual ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[0].scopeDescriptor).toEqual ['source.js']
             changeHandler.reset()
 
             advanceClock() # tokenize invalidated lines in background
-            expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
-            expect(tokenizedBuffer.tokenizedLineForRow(6).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
-            expect(tokenizedBuffer.tokenizedLineForRow(7).tokens[0].scopes).toEqual ['source.js', 'comment.block.js']
-            expect(tokenizedBuffer.tokenizedLineForRow(8).tokens[0].scopes).not.toBe ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.tokenizedLineForRow(5).tokens[0].scopeDescriptor).toEqual ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.tokenizedLineForRow(6).tokens[0].scopeDescriptor).toEqual ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.tokenizedLineForRow(7).tokens[0].scopeDescriptor).toEqual ['source.js', 'comment.block.js']
+            expect(tokenizedBuffer.tokenizedLineForRow(8).tokens[0].scopeDescriptor).not.toBe ['source.js', 'comment.block.js']
 
             expect(changeHandler).toHaveBeenCalled()
             [event] = changeHandler.argsForCall[0]
@@ -343,7 +343,7 @@ describe "TokenizedBuffer", ->
         expect(tokens[0].value).toBe "#"
         expect(tokens[1].value).toBe " Econ 101"
         expect(tokens[2].value).toBe tabAsSpaces
-        expect(tokens[2].scopes).toEqual tokens[1].scopes
+        expect(tokens[2].scopeDescriptor).toEqual tokens[1].scopeDescriptor
         expect(tokens[2].isAtomic).toBeTruthy()
         expect(tokens[3].value).toBe ""
 
@@ -526,7 +526,7 @@ describe "TokenizedBuffer", ->
         fullyTokenize(tokenizedBuffer)
 
         {tokens} = tokenizedBuffer.tokenizedLineForRow(0)
-        expect(tokens[0]).toEqual value: "<div class='name'>", scopes: ["text.html.ruby"]
+        expect(tokens[0]).toEqual value: "<div class='name'>", scopeDescriptor: ["text.html.ruby"]
 
       waitsForPromise ->
         atom.packages.activatePackage('language-html')
@@ -534,7 +534,7 @@ describe "TokenizedBuffer", ->
       runs ->
         fullyTokenize(tokenizedBuffer)
         {tokens} = tokenizedBuffer.tokenizedLineForRow(0)
-        expect(tokens[0]).toEqual value: '<', scopes: ["text.html.ruby","meta.tag.block.any.html","punctuation.definition.tag.begin.html"]
+        expect(tokens[0]).toEqual value: '<', scopeDescriptor: ["text.html.ruby","meta.tag.block.any.html","punctuation.definition.tag.begin.html"]
 
   describe ".tokenForPosition(position)", ->
     afterEach ->
@@ -545,9 +545,9 @@ describe "TokenizedBuffer", ->
       buffer = atom.project.bufferForPathSync('sample.js')
       tokenizedBuffer = new TokenizedBuffer({buffer})
       fullyTokenize(tokenizedBuffer)
-      expect(tokenizedBuffer.tokenForPosition([1,0]).scopes).toEqual ["source.js"]
-      expect(tokenizedBuffer.tokenForPosition([1,1]).scopes).toEqual ["source.js"]
-      expect(tokenizedBuffer.tokenForPosition([1,2]).scopes).toEqual ["source.js", "storage.modifier.js"]
+      expect(tokenizedBuffer.tokenForPosition([1,0]).scopeDescriptor).toEqual ["source.js"]
+      expect(tokenizedBuffer.tokenForPosition([1,1]).scopeDescriptor).toEqual ["source.js"]
+      expect(tokenizedBuffer.tokenForPosition([1,2]).scopeDescriptor).toEqual ["source.js", "storage.modifier.js"]
 
   describe ".bufferRangeForScopeAtPosition(selector, position)", ->
     beforeEach ->

spec/tokenized-line-spec.coffee

@@ -19,16 +19,16 @@ describe "TokenizedLine", ->
       expect(editor.tokenizedLineForScreenRow(2).isOnlyWhitespace()).toBe false
 
   describe "::getScopeTree()", ->
-    it "returns a tree whose inner nodes are scopes and whose leaf nodes are tokens in those scopes", ->
+    it "returns a tree whose inner nodes are scopeDescriptor and whose leaf nodes are tokens in those scopeDescriptor", ->
       [tokens, tokenIndex] = []
 
-      ensureValidScopeTree = (scopeTree, scopes=[]) ->
+      ensureValidScopeTree = (scopeTree, scopeDescriptor=[]) ->
         if scopeTree.children?
           for child in scopeTree.children
-            ensureValidScopeTree(child, scopes.concat([scopeTree.scope]))
+            ensureValidScopeTree(child, scopeDescriptor.concat([scopeTree.scope]))
         else
           expect(scopeTree).toBe tokens[tokenIndex++]
-          expect(scopes).toEqual scopeTree.scopes
+          expect(scopeDescriptor).toEqual scopeTree.scopeDescriptor
 
       waitsForPromise ->
         atom.project.open('coffee.coffee').then (o) -> editor = o

spec/window-spec.coffee

@@ -47,14 +47,6 @@ describe "Window", ->
       $(window).trigger 'window:close'
       expect(atom.close).toHaveBeenCalled()
 
-    it "emits the beforeunload event", ->
-      $(window).off 'beforeunload'
-      beforeunload = jasmine.createSpy('beforeunload').andReturn(false)
-      $(window).on 'beforeunload', beforeunload
-
-      $(window).trigger 'window:close'
-      expect(beforeunload).toHaveBeenCalled()
-
   describe "beforeunload event", ->
     [beforeUnloadEvent] = []
 
@@ -122,7 +114,7 @@ describe "Window", ->
         buffer = atom.workspace.getActivePaneItem().buffer
         pane = atom.workspaceView.getActivePaneView()
         pane.splitRight(pane.copyActiveItem())
-        expect(atom.workspaceView.find('.editor').length).toBe 2
+        expect(atom.workspaceView.find('atom-text-editor').length).toBe 2
 
         atom.removeEditorWindow()
 

spec/workspace-spec.coffee

@@ -376,7 +376,7 @@ describe "Workspace", ->
     describe "when the project has no path", ->
       it "sets the title to 'untitled'", ->
         atom.project.setPath(undefined)
-        expect(document.title).toBe 'untitled'
+        expect(document.title).toBe 'untitled - Atom'
 
     describe "when the project has a path", ->
       beforeEach ->
@@ -386,25 +386,25 @@ describe "Workspace", ->
       describe "when there is an active pane item", ->
         it "sets the title to the pane item's title plus the project path", ->
           item = atom.workspace.getActivePaneItem()
-          expect(document.title).toBe "#{item.getTitle()} - #{atom.project.getPaths()[0]}"
+          expect(document.title).toBe "#{item.getTitle()} - #{atom.project.getPaths()[0]} - Atom"
 
       describe "when the title of the active pane item changes", ->
         it "updates the window title based on the item's new title", ->
           editor = atom.workspace.getActivePaneItem()
           editor.buffer.setPath(path.join(temp.dir, 'hi'))
-          expect(document.title).toBe "#{editor.getTitle()} - #{atom.project.getPaths()[0]}"
+          expect(document.title).toBe "#{editor.getTitle()} - #{atom.project.getPaths()[0]} - Atom"
 
       describe "when the active pane's item changes", ->
         it "updates the title to the new item's title plus the project path", ->
           atom.workspace.getActivePane().activateNextItem()
           item = atom.workspace.getActivePaneItem()
-          expect(document.title).toBe "#{item.getTitle()} - #{atom.project.getPaths()[0]}"
+          expect(document.title).toBe "#{item.getTitle()} - #{atom.project.getPaths()[0]} - Atom"
 
       describe "when the last pane item is removed", ->
         it "updates the title to contain the project's path", ->
           atom.workspace.getActivePane().destroy()
           expect(atom.workspace.getActivePaneItem()).toBeUndefined()
-          expect(document.title).toBe atom.project.getPaths()[0]
+          expect(document.title).toBe "#{atom.project.getPaths()[0]} - Atom"
 
       describe "when an inactive pane's item changes", ->
         it "does not update the title", ->
@@ -422,7 +422,7 @@ describe "Workspace", ->
         document.title = null
         workspace2 = atom.workspace.testSerialization()
         item = atom.workspace.getActivePaneItem()
-        expect(document.title).toBe "#{item.getTitle()} - #{atom.project.getPaths()[0]}"
+        expect(document.title).toBe "#{item.getTitle()} - #{atom.project.getPaths()[0]} - Atom"
         workspace2.destroy()
 
   describe "document edited status", ->

spec/workspace-view-spec.coffee

@@ -49,7 +49,7 @@ describe "WorkspaceView", ->
 
           expect(atom.workspaceView.getEditorViews().length).toBe 2
           expect(atom.workspaceView.getActivePaneView()).toBe atom.workspaceView.getPaneViews()[1]
-          expect(document.title).toBe "untitled - #{atom.project.getPaths()[0]}"
+          expect(document.title).toBe "untitled - #{atom.project.getPaths()[0]} - Atom"
 
     describe "when there are open editors", ->
       it "constructs the view with the same panes", ->
@@ -82,10 +82,10 @@ describe "WorkspaceView", ->
           simulateReload()
 
           expect(atom.workspaceView.getEditorViews().length).toBe 4
-          editorView1 = atom.workspaceView.panes.find('.pane-row > .pane .editor:eq(0)').view()
-          editorView3 = atom.workspaceView.panes.find('.pane-row > .pane .editor:eq(1)').view()
-          editorView2 = atom.workspaceView.panes.find('.pane-row > .pane-column > .pane .editor:eq(0)').view()
-          editorView4 = atom.workspaceView.panes.find('.pane-row > .pane-column > .pane .editor:eq(1)').view()
+          editorView1 = atom.workspaceView.panes.find('atom-pane-axis.horizontal > atom-pane atom-text-editor:eq(0)').view()
+          editorView3 = atom.workspaceView.panes.find('atom-pane-axis.horizontal > atom-pane atom-text-editor:eq(1)').view()
+          editorView2 = atom.workspaceView.panes.find('atom-pane-axis.horizontal > atom-pane-axis.vertical > atom-pane atom-text-editor:eq(0)').view()
+          editorView4 = atom.workspaceView.panes.find('atom-pane-axis.horizontal > atom-pane-axis.vertical > atom-pane atom-text-editor:eq(1)').view()
 
           expect(editorView1.getEditor().getPath()).toBe atom.project.resolve('a')
           expect(editorView2.getEditor().getPath()).toBe atom.project.resolve('b')
@@ -106,7 +106,7 @@ describe "WorkspaceView", ->
           expect(editorView3).not.toHaveFocus()
           expect(editorView4).not.toHaveFocus()
 
-          expect(document.title).toBe "#{path.basename(editorView2.getEditor().getPath())} - #{atom.project.getPaths()[0]}"
+          expect(document.title).toBe "#{path.basename(editorView2.getEditor().getPath())} - #{atom.project.getPaths()[0]} - Atom"
 
     describe "where there are no open editors", ->
       it "constructs the view with no open editors", ->
@@ -127,15 +127,11 @@ describe "WorkspaceView", ->
       expect(activePane).toHaveFocus()
 
   describe "keymap wiring", ->
-    commandHandler = null
-    beforeEach ->
-      commandHandler = jasmine.createSpy('commandHandler')
-      atom.workspaceView.on('foo-command', commandHandler)
-
-      atom.keymaps.add('name', '*': {'x': 'foo-command'})
-
     describe "when a keydown event is triggered in the WorkspaceView", ->
       it "triggers matching keybindings for that event", ->
+        commandHandler = jasmine.createSpy('commandHandler')
+        atom.workspaceView.on('foo-command', commandHandler)
+        atom.keymaps.add('name', '*': {'x': 'foo-command'})
         event = keydownEvent 'x', target: atom.workspaceView[0]
 
         atom.workspaceView.trigger(event)
@@ -252,8 +248,8 @@ describe "WorkspaceView", ->
 
     beforeEach ->
       atom.workspaceView.attachToDom()
-      editorNode = atom.workspaceView.find('.editor')[0]
-      editor = atom.workspaceView.find('.editor').view().getEditor()
+      editorNode = atom.workspaceView.find('atom-text-editor')[0]
+      editor = atom.workspaceView.find('atom-text-editor').view().getEditor()
 
     it "updates the font-size based on the 'editor.fontSize' config value", ->
       initialCharWidth = editor.getDefaultCharWidth()

src/command-registry.coffee

@@ -1,4 +1,4 @@
-{Disposable, CompositeDisposable} = require 'event-kit'
+{Emitter, Disposable, CompositeDisposable} = require 'event-kit'
 {specificity} = require 'clear-cut'
 _ = require 'underscore-plus'
 {$} = require './space-pen-extensions'
@@ -35,7 +35,7 @@ module.exports =
 # Here is a command that inserts the current date in an editor:
 #
 # ```coffee
-# atom.commands.add '.editor',
+# atom.commands.add 'atom-text-editor',
 #   'user:insert-date': (event) ->
 #     editor = $(this).view().getModel()
 #     # soon the above above line will be:
@@ -44,17 +44,14 @@ module.exports =
 # ```
 class CommandRegistry
   constructor: (@rootNode) ->
-    @listenersByCommandName = {}
+    @registeredCommands = {}
+    @selectorBasedListenersByCommandName = {}
+    @inlineListenersByCommandName = {}
+    @emitter = new Emitter
 
-  getRootNode: -> @rootNode
-
-  setRootNode: (newRootNode) ->
-    oldRootNode = @rootNode
-    @rootNode = newRootNode
-
-    for commandName of @listenersByCommandName
-      @removeCommandListener(oldRootNode, commandName)
-      @addCommandListener(newRootNode, commandName)
+  destroy: ->
+    for commandName of @registeredCommands
+      window.removeEventListener(commandName, @handleCommandEvent, true)
 
   # Public: Add one or more command listeners associated with a selector.
   #
@@ -81,27 +78,46 @@ class CommandRegistry
   #
   # Returns a {Disposable} on which `.dispose()` can be called to remove the
   # added command handler(s).
-  add: (selector, commandName, callback) ->
+  add: (target, commandName, callback) ->
     if typeof commandName is 'object'
       commands = commandName
       disposable = new CompositeDisposable
       for commandName, callback of commands
-        disposable.add @add(selector, commandName, callback)
+        disposable.add @add(target, commandName, callback)
       return disposable
 
-    unless @listenersByCommandName[commandName]?
-      @addCommandListener(@rootNode, commandName)
-      @listenersByCommandName[commandName] = []
+    if typeof target is 'string'
+      @addSelectorBasedListener(target, commandName, callback)
+    else
+      @addInlineListener(target, commandName, callback)
 
-    listener = new CommandListener(selector, callback)
-    listenersForCommand = @listenersByCommandName[commandName]
+  addSelectorBasedListener: (selector, commandName, callback) ->
+    @selectorBasedListenersByCommandName[commandName] ?= []
+    listenersForCommand = @selectorBasedListenersByCommandName[commandName]
+    listener = new SelectorBasedListener(selector, callback)
     listenersForCommand.push(listener)
 
+    @commandRegistered(commandName)
+
     new Disposable =>
       listenersForCommand.splice(listenersForCommand.indexOf(listener), 1)
-      if listenersForCommand.length is 0
-        delete @listenersByCommandName[commandName]
-        @removeCommandListener(@rootNode, commandName)
+      delete @selectorBasedListenersByCommandName[commandName] if listenersForCommand.length is 0
+
+  addInlineListener: (element, commandName, callback) ->
+    @inlineListenersByCommandName[commandName] ?= new WeakMap
+
+    listenersForCommand = @inlineListenersByCommandName[commandName]
+    unless listenersForElement = listenersForCommand.get(element)
+      listenersForElement = []
+      listenersForCommand.set(element, listenersForElement)
+    listener = new InlineListener(callback)
+    listenersForElement.push(listener)
+
+    @commandRegistered(commandName)
+
+    new Disposable ->
+      listenersForElement.splice(listenersForElement.indexOf(listener), 1)
+      listenersForCommand.delete(element) if listenersForElement.length is 0
 
   # Public: Find all registered commands matching a query.
   #
@@ -116,12 +132,11 @@ class CommandRegistry
   #    `$::command` method.
   findCommands: ({target}) ->
     commands = []
-    target = @rootNode unless @rootNode.contains(target)
     currentTarget = target
     loop
-      for commandName, listeners of @listenersByCommandName
+      for commandName, listeners of @selectorBasedListenersByCommandName
         for listener in listeners
-          if currentTarget.webkitMatchesSelector(listener.selector)
+          if currentTarget.webkitMatchesSelector?(listener.selector)
             commands.push
               name: commandName
               displayName: _.humanizeEventName(commandName)
@@ -147,37 +162,40 @@ class CommandRegistry
   #
   # * `target` The DOM node at which to start bubbling the command event.
   # * `commandName` {String} indicating the name of the command to dispatch.
-  dispatch: (target, commandName) ->
-    event = new CustomEvent(commandName, bubbles: true)
-    eventWithTarget = Object.create(event, target: value: target)
+  dispatch: (target, commandName, detail) ->
+    event = new CustomEvent(commandName, {bubbles: true, detail})
+    eventWithTarget = Object.create event,
+      target: value: target
+      preventDefault: value: ->
+      stopPropagation: value: ->
+      stopImmediatePropagation: value: ->
     @handleCommandEvent(eventWithTarget)
 
+  onWillDispatch: (callback) ->
+    @emitter.on 'will-dispatch', callback
+
   getSnapshot: ->
     snapshot = {}
-    for commandName, listeners of @listenersByCommandName
+    for commandName, listeners of @selectorBasedListenersByCommandName
       snapshot[commandName] = listeners.slice()
     snapshot
 
   restoreSnapshot: (snapshot) ->
-    rootNode = @getRootNode()
-    @setRootNode(null) # clear listeners for current commands
-    @listenersByCommandName = {}
+    @selectorBasedListenersByCommandName = {}
     for commandName, listeners of snapshot
-      @listenersByCommandName[commandName] = listeners.slice()
-    @setRootNode(rootNode) # restore listeners for commands in snapshot
+      @selectorBasedListenersByCommandName[commandName] = listeners.slice()
 
   handleCommandEvent: (originalEvent) =>
-    originalEvent.__handledByCommandRegistry = true
-
     propagationStopped = false
     immediatePropagationStopped = false
     matched = false
     currentTarget = originalEvent.target
-    invokedListeners = []
 
     syntheticEvent = Object.create originalEvent,
       eventPhase: value: Event.BUBBLING_PHASE
       currentTarget: get: -> currentTarget
+      preventDefault: value: ->
+        originalEvent.preventDefault()
       stopPropagation: value: ->
         originalEvent.stopPropagation()
         propagationStopped = true
@@ -185,44 +203,38 @@ class CommandRegistry
         originalEvent.stopImmediatePropagation()
         propagationStopped = true
         immediatePropagationStopped = true
-      disableInvokedListeners: value: ->
-        listener.enabled = false for listener in invokedListeners
-        -> listener.enabled = true for listener in invokedListeners
+      abortKeyBinding: value: ->
+        originalEvent.abortKeyBinding?()
+
+    @emitter.emit 'will-dispatch', syntheticEvent
 
     loop
-      matchingListeners =
-        (@listenersByCommandName[originalEvent.type] ? [])
-          .filter (listener) -> currentTarget.webkitMatchesSelector(listener.selector)
-          .sort (a, b) -> a.compare(b)
+      listeners = @inlineListenersByCommandName[originalEvent.type]?.get(currentTarget) ? []
+      if currentTarget.webkitMatchesSelector?
+        selectorBasedListeners =
+          (@selectorBasedListenersByCommandName[originalEvent.type] ? [])
+            .filter (listener) -> currentTarget.webkitMatchesSelector(listener.selector)
+            .sort (a, b) -> a.compare(b)
+        listeners = listeners.concat(selectorBasedListeners)
 
-      matched = true if matchingListeners.length > 0
+      matched = true if listeners.length > 0
 
-      for listener in matchingListeners when listener.enabled
+      for listener in listeners
         break if immediatePropagationStopped
-        invokedListeners.push(listener)
         listener.callback.call(currentTarget, syntheticEvent)
 
-      break if currentTarget is @rootNode
+      break if currentTarget is window
       break if propagationStopped
-      currentTarget = currentTarget.parentNode
-      break unless currentTarget?
+      currentTarget = currentTarget.parentNode ? window
 
     matched
 
-  handleJQueryCommandEvent: (event) =>
-    @handleCommandEvent(event) unless event.originalEvent?.__handledByCommandRegistry
-
-  addCommandListener: (node, commandName, listener) ->
-    node?.addEventListener(commandName, @handleCommandEvent, true)
-    $(node).on commandName, @handleJQueryCommandEvent
-
-  removeCommandListener: (node, commandName) ->
-    node?.removeEventListener(commandName, @handleCommandEvent, true)
-    $(node).off commandName, @handleJQueryCommandEvent
-
-class CommandListener
-  enabled: true
+  commandRegistered: (commandName) ->
+    unless @registeredCommands[commandName]
+      window.addEventListener(commandName, @handleCommandEvent, true)
+      @registeredCommands[commandName] = true
 
+class SelectorBasedListener
   constructor: (@selector, @callback) ->
     @specificity = (SpecificityCache[@selector] ?= specificity(@selector))
     @sequenceNumber = SequenceCount++
@@ -230,3 +242,6 @@ class CommandListener
   compare: (other) ->
     other.specificity - @specificity  or
       other.sequenceNumber - @sequenceNumber
+
+class InlineListener
+  constructor: (@callback) ->

src/config.coffee

@@ -1,7 +1,7 @@
 _ = require 'underscore-plus'
 fs = require 'fs-plus'
 EmitterMixin = require('emissary').Emitter
-{Disposable, Emitter} = require 'event-kit'
+{CompositeDisposable, Disposable, Emitter} = require 'event-kit'
 CSON = require 'season'
 path = require 'path'
 async = require 'async'
@@ -312,6 +312,7 @@ class Config
     @defaultSettings = {}
     @settings = {}
     @scopedSettingsStore = new ScopedPropertyStore
+    @usersScopedSettings = new CompositeDisposable
     @configFileHasErrors = false
     @configFilePath = fs.resolve(@configDirPath, 'config', ['json', 'cson'])
     @configFilePath ?= path.join(@configDirPath, 'config.cson')
@@ -336,7 +337,7 @@ class Config
   #
   # * `scopeDescriptor` (optional) {Array} of {String}s describing a path from
   #   the root of the syntax tree to a token. Get one by calling
-  #   {TextEditor::scopesAtCursor}. See {::get} for examples.
+  #   {editor.getLastCursor().getScopeDescriptor()}. See {::get} for examples.
   # * `keyPath` {String} name of the key to observe
   # * `callback` {Function} to call when the value of the key changes.
   #   * `value` the new value of the key
@@ -372,7 +373,7 @@ class Config
   #
   # * `scopeDescriptor` (optional) {Array} of {String}s describing a path from
   #   the root of the syntax tree to a token. Get one by calling
-  #   {TextEditor::scopesAtCursor}. See {::get} for examples.
+  #   {editor.getLastCursor().getScopeDescriptor()}. See {::get} for examples.
   # * `keyPath` (optional) {String} name of the key to observe. Must be
   #   specified if `scopeDescriptor` is specified.
   # * `callback` {Function} to call when the value of the key changes.
@@ -424,30 +425,37 @@ class Config
   # atom.config.get(['source.ruby'], 'editor.tabLength') # => 2
   # ```
   #
+  # You can get the language scope descriptor via
+  # {TextEditor::getRootScopeDescriptor}. This will get the setting specifically
+  # for the editor's language.
+  #
+  # ```coffee
+  # atom.config.get(@editor.getRootScopeDescriptor(), 'editor.tabLength') # => 2
+  # ```
+  #
   # Additionally, you can get the setting at the specific cursor position.
   #
   # ```coffee
-  # scopeDescriptor = @editor.scopesAtCursor()
+  # scopeDescriptor = @editor.getLastCursor().getScopeDescriptor()
   # atom.config.get(scopeDescriptor, 'editor.tabLength') # => 2
   # ```
   #
   # * `scopeDescriptor` (optional) {Array} of {String}s describing a path from
   #   the root of the syntax tree to a token. Get one by calling
-  #   {TextEditor::scopesAtCursor}
+  #   {editor.getLastCursor().getScopeDescriptor()}
   # * `keyPath` The {String} name of the key to retrieve.
   #
   # Returns the value from Atom's default settings, the user's configuration
   # file in the type specified by the configuration schema.
   get: (scopeDescriptor, keyPath) ->
     if arguments.length == 1
-      keyPath = scopeDescriptor
-      scopeDescriptor = undefined
-
-    if scopeDescriptor?
+      # cannot assign to keyPath for the sake of v8 optimization
+      globalKeyPath = scopeDescriptor
+      @getRawValue(globalKeyPath)
+    else
       value = @getRawScopedValue(scopeDescriptor, keyPath)
-      return value if value?
-
-    @getRawValue(keyPath)
+      value ?= @getRawValue(keyPath)
+      value
 
   # Essential: Sets the value for a configuration setting.
   #
@@ -658,7 +666,7 @@ class Config
 
     try
       userConfig = CSON.readFileSync(@configFilePath)
-      @setAll(userConfig)
+      @resetUserSettings(userConfig)
       @configFileHasErrors = false
     catch error
       @configFileHasErrors = true
@@ -678,18 +686,26 @@ class Config
     @watchSubscription = null
 
   save: ->
-    CSON.writeFileSync(@configFilePath, @settings)
+    allSettings = global: @settings
+    allSettings = _.extend allSettings, @scopedSettingsStore.propertiesForSource('user-config')
+    CSON.writeFileSync(@configFilePath, allSettings)
 
   ###
   Section: Private methods managing global settings
   ###
 
-  setAll: (newSettings) ->
+  resetUserSettings: (newSettings) ->
     unless isPlainObject(newSettings)
       @settings = {}
       @emitter.emit 'did-change'
       return
 
+    if newSettings.global?
+      scopedSettings = newSettings
+      newSettings = newSettings.global
+      delete scopedSettings.global
+      @resetUserScopedSettings(scopedSettings)
+
     unsetUnspecifiedValues = (keyPath, value) =>
       if isPlainObject(value)
         keys = if keyPath? then keyPath.split('.') else []
@@ -739,12 +755,18 @@ class Config
 
   observeKeyPath: (keyPath, options, callback) ->
     callback(_.clone(@get(keyPath))) unless options.callNow == false
-    @emitter.on 'did-change', (event) ->
-      callback(event.newValue) if keyPath? and keyPath.indexOf(event?.keyPath) is 0
+    @emitter.on 'did-change', (event) =>
+      callback(event.newValue) if keyPath? and @isSubKeyPath(keyPath, event?.keyPath)
 
   onDidChangeKeyPath: (keyPath, callback) ->
-    @emitter.on 'did-change', (event) ->
-      callback(event) if not keyPath? or (keyPath? and keyPath.indexOf(event?.keyPath) is 0)
+    @emitter.on 'did-change', (event) =>
+      callback(event) if not keyPath? or (keyPath? and @isSubKeyPath(keyPath, event?.keyPath))
+
+  isSubKeyPath: (keyPath, subKeyPath) ->
+    return false unless keyPath? and subKeyPath?
+    pathSubTokens = subKeyPath.split('.')
+    pathTokens = keyPath.split('.').slice(0, pathSubTokens.length)
+    _.isEqual(pathTokens, pathSubTokens)
 
   setRawDefault: (keyPath, value) ->
     oldValue = _.clone(@get(keyPath))
@@ -782,12 +804,13 @@ class Config
   Section: Private Scoped Settings
   ###
 
-  addScopedSettings: (name, selector, value) ->
-    if arguments.length < 3
-      value = selector
-      selector = name
-      name = null
+  resetUserScopedSettings: (newScopedSettings) ->
+    @usersScopedSettings?.dispose()
+    @usersScopedSettings = new CompositeDisposable
+    @usersScopedSettings.add @scopedSettingsStore.addProperties('user-config', newScopedSettings)
+    @emitter.emit 'did-change'
 
+  addScopedSettings: (name, selector, value) ->
     settingsBySelector = {}
     settingsBySelector[selector] = value
     disposable = @scopedSettingsStore.addProperties(name, settingsBySelector)
@@ -801,7 +824,11 @@ class Config
       newValue = {}
       _.setValueForKeyPath(newValue, keyPath, value)
       value = newValue
-    @addScopedSettings(null, selector, value)
+
+    settingsBySelector = {}
+    settingsBySelector[selector] = value
+    @usersScopedSettings.add @scopedSettingsStore.addProperties('user-config', settingsBySelector)
+    @emitter.emit 'did-change'
 
   getRawScopedValue: (scopeDescriptor, keyPath) ->
     scopeChain = scopeDescriptor

src/context-menu-manager.coffee

@@ -42,8 +42,8 @@ class ContextMenuManager
   #
   # ```coffee
   # atom.contextMenu.add {
-  #   '.workspace': [{label: 'Help', command: 'application:open-documentation'}]
-  #   '.editor':    [{
+  #   'atom-workspace': [{label: 'Help', command: 'application:open-documentation'}]
+  #   'atom-text-editor': [{
   #     label: 'History',
   #     submenu: [
   #       {label: 'Undo': command:'core:undo'}
@@ -117,7 +117,7 @@ class ContextMenuManager
           if typeof item.shouldDisplay is 'function'
             continue unless item.shouldDisplay(event)
           item.created?(event)
-          MenuHelpers.merge(currentTargetItems, MenuHelpers.cloneMenuItem(item), itemSet.specificity)
+          MenuHelpers.merge(currentTargetItems, item, itemSet.specificity)
 
       for item in currentTargetItems
         MenuHelpers.merge(template, item, false)
@@ -161,7 +161,7 @@ class ContextMenuManager
   clear: ->
     @activeElement = null
     @itemSets = []
-    @add '.workspace': [{
+    @add 'atom-workspace': [{
       label: 'Inspect Element'
       command: 'application:inspect'
       devMode: true

src/cursor.coffee

@@ -198,7 +198,7 @@ class Cursor extends Model
     [before, after] = @editor.getTextInBufferRange(range)
     return false if /\s/.test(before) or /\s/.test(after)
 
-    nonWordCharacters = atom.config.get('editor.nonWordCharacters').split('')
+    nonWordCharacters = atom.config.get(@getScopeDescriptor(), 'editor.nonWordCharacters').split('')
     _.contains(nonWordCharacters, before) isnt _.contains(nonWordCharacters, after)
 
   # Public: Returns whether this cursor is between a word's start and end.
@@ -214,11 +214,14 @@ class Cursor extends Model
     else
       @getBufferColumn()
 
-  # Public: Retrieves the grammar's token scopes for the line.
+  # Public: Retrieves the scope descriptor for the cursor's current position.
   #
   # Returns an {Array} of {String}s.
+  getScopeDescriptor: ->
+    @editor.scopeDescriptorForBufferPosition(@getBufferPosition())
   getScopes: ->
-    @editor.scopesForBufferPosition(@getBufferPosition())
+    Grim.deprecate 'Use Cursor::getScopeDescriptor() instead'
+    @getScopeDescriptor()
 
   # Public: Returns true if this cursor has no non-whitespace characters before
   # its current position.
@@ -617,7 +620,7 @@ class Cursor extends Model
   # Returns a {RegExp}.
   wordRegExp: ({includeNonWordCharacters}={}) ->
     includeNonWordCharacters ?= true
-    nonWordCharacters = atom.config.get('editor.nonWordCharacters')
+    nonWordCharacters = atom.config.get(@getScopeDescriptor(), 'editor.nonWordCharacters')
     segments = ["^[\t ]*$"]
     segments.push("[^\\s#{_.escapeRegExp(nonWordCharacters)}]+")
     if includeNonWordCharacters

src/display-buffer.coffee

@@ -3,7 +3,7 @@ EmitterMixin = require('emissary').Emitter
 guid = require 'guid'
 Serializable = require 'serializable'
 {Model} = require 'theorist'
-{Emitter} = require 'event-kit'
+{CompositeDisposable, Emitter} = require 'event-kit'
 {Point, Range} = require 'text-buffer'
 TokenizedBuffer = require './tokenized-buffer'
 RowMap = require './row-map'
@@ -45,7 +45,6 @@ class DisplayBuffer extends Model
 
     @emitter = new Emitter
 
-    @softWrapped ?= atom.config.get('editor.softWrap') ? false
     @tokenizedBuffer ?= new TokenizedBuffer({tabLength, buffer, @invisibles})
     @buffer = @tokenizedBuffer.buffer
     @charWidthsByScope = {}
@@ -53,19 +52,42 @@ class DisplayBuffer extends Model
     @foldsByMarkerId = {}
     @decorationsById = {}
     @decorationsByMarkerId = {}
-    @updateAllScreenLines()
-    @createFoldForMarker(marker) for marker in @buffer.findMarkers(@getFoldMarkerAttributes())
+    @subscribe @tokenizedBuffer.observeGrammar @subscribeToScopedConfigSettings
     @subscribe @tokenizedBuffer.onDidChange @handleTokenizedBufferChange
     @subscribe @buffer.onDidUpdateMarkers @handleBufferMarkersUpdated
     @subscribe @buffer.onDidCreateMarker @handleBufferMarkerCreated
+    @updateAllScreenLines()
+    @createFoldForMarker(marker) for marker in @buffer.findMarkers(@getFoldMarkerAttributes())
 
-    @subscribe atom.config.onDidChange 'editor.preferredLineLength', =>
-      @updateWrappedScreenLines() if @isSoftWrapped() and atom.config.get('editor.softWrapAtPreferredLineLength')
+  subscribeToScopedConfigSettings: =>
+    @scopedConfigSubscriptions?.dispose()
+    @scopedConfigSubscriptions = subscriptions = new CompositeDisposable
 
-    @subscribe atom.config.onDidChange 'editor.softWrapAtPreferredLineLength', =>
+    scopeDescriptor = @getRootScopeDescriptor()
+
+    oldConfigSettings = @configSettings
+    @configSettings =
+      scrollPastEnd: atom.config.get(scopeDescriptor, 'editor.scrollPastEnd')
+      softWrap: atom.config.get(scopeDescriptor, 'editor.softWrap')
+      softWrapAtPreferredLineLength: atom.config.get(scopeDescriptor, 'editor.softWrapAtPreferredLineLength')
+      preferredLineLength: atom.config.get(scopeDescriptor, 'editor.preferredLineLength')
+
+    subscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.softWrap', ({newValue}) =>
+      @configSettings.softWrap = newValue
+      @updateWrappedScreenLines()
+
+    subscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.softWrapAtPreferredLineLength', ({newValue}) =>
+      @configSettings.softWrapAtPreferredLineLength = newValue
       @updateWrappedScreenLines() if @isSoftWrapped()
 
-    @updateAllScreenLines()
+    subscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.preferredLineLength', ({newValue}) =>
+      @configSettings.preferredLineLength = newValue
+      @updateWrappedScreenLines() if @isSoftWrapped() and atom.config.get(scopeDescriptor, 'editor.softWrapAtPreferredLineLength')
+
+    subscriptions.add atom.config.observe scopeDescriptor, 'editor.scrollPastEnd', (value) =>
+      @configSettings.scrollPastEnd = value
+
+    @updateWrappedScreenLines() if oldConfigSettings? and not _.isEqual(oldConfigSettings, @configSettings)
 
   serializeParams: ->
     id: @id
@@ -319,7 +341,7 @@ class DisplayBuffer extends Model
     return 0 unless lineHeight > 0
 
     scrollHeight = @getLineCount() * lineHeight
-    if @height? and atom.config.get('editor.scrollPastEnd')
+    if @height? and @configSettings.scrollPastEnd
       scrollHeight = scrollHeight + @height - (lineHeight * 3)
 
     scrollHeight
@@ -412,11 +434,15 @@ class DisplayBuffer extends Model
     if softWrapped isnt @softWrapped
       @softWrapped = softWrapped
       @updateWrappedScreenLines()
-      @emit 'soft-wrap-changed', @softWrapped
-      @emitter.emit 'did-change-soft-wrapped', @softWrapped
-    @softWrapped
+      softWrapped = @isSoftWrapped()
+      @emit 'soft-wrap-changed', softWrapped
+      @emitter.emit 'did-change-soft-wrapped', softWrapped
+      softWrapped
+    else
+      @isSoftWrapped()
 
-  isSoftWrapped: -> @softWrapped
+  isSoftWrapped: ->
+    @softWrapped ? @configSettings.softWrap ? false
 
   # Set the number of characters that fit horizontally in the editor.
   #
@@ -438,8 +464,8 @@ class DisplayBuffer extends Model
       @editorWidthInChars
 
   getSoftWrapColumn: ->
-    if atom.config.get('editor.softWrapAtPreferredLineLength')
-      Math.min(@getEditorWidthInChars(), atom.config.get('editor.preferredLineLength'))
+    if @configSettings.softWrapAtPreferredLineLength
+      Math.min(@getEditorWidthInChars(), @configSettings.preferredLineLength)
     else
       @getEditorWidthInChars()
 
@@ -624,7 +650,7 @@ class DisplayBuffer extends Model
     left = 0
     column = 0
     for token in @tokenizedLineForScreenRow(targetRow).tokens
-      charWidths = @getScopedCharWidths(token.scopes)
+      charWidths = @getScopedCharWidths(token.scopeDescriptor)
       for char in token.value
         return {top, left} if column is targetColumn
         left += charWidths[char] ? defaultCharWidth unless char is '\0'
@@ -642,7 +668,7 @@ class DisplayBuffer extends Model
     left = 0
     column = 0
     for token in @tokenizedLineForScreenRow(row).tokens
-      charWidths = @getScopedCharWidths(token.scopes)
+      charWidths = @getScopedCharWidths(token.scopeDescriptor)
       for char in token.value
         charWidth = charWidths[char] ? defaultCharWidth
         break if targetLeft <= left + (charWidth / 2)
@@ -726,13 +752,13 @@ class DisplayBuffer extends Model
     [bufferRow] = @rowMap.bufferRowRangeForScreenRow(row)
     new Point(bufferRow, @screenLines[row].bufferColumnForScreenColumn(column))
 
-  # Retrieves the grammar's token scopes for a buffer position.
+  # Retrieves the grammar's token scopeDescriptor for a buffer position.
   #
   # bufferPosition - A {Point} in the {TextBuffer}
   #
   # Returns an {Array} of {String}s.
-  scopesForBufferPosition: (bufferPosition) ->
-    @tokenizedBuffer.scopesForPosition(bufferPosition)
+  scopeDescriptorForBufferPosition: (bufferPosition) ->
+    @tokenizedBuffer.scopeDescriptorForPosition(bufferPosition)
 
   bufferRangeForScopeAtPosition: (selector, position) ->
     @tokenizedBuffer.bufferRangeForScopeAtPosition(selector, position)
@@ -1034,6 +1060,9 @@ class DisplayBuffer extends Model
       line = @tokenizedLineForScreenRow(row).text
       console.log row, @bufferRowForScreenRow(row), line, line.length
 
+  getRootScopeDescriptor: ->
+    @tokenizedBuffer.rootScopeDescriptor
+
   handleTokenizedBufferChange: (tokenizedBufferChange) =>
     {start, end, delta, bufferChange} = tokenizedBufferChange
     @updateScreenLines(start, end + 1, delta, delayChangeEvent: bufferChange?)

src/language-mode.coffee

@@ -29,8 +29,8 @@ class LanguageMode
   #
   # Returns an {Array} of the commented {Ranges}.
   toggleLineCommentsForBufferRows: (start, end) ->
-    scopes = @editor.scopesForBufferPosition([start, 0])
-    properties = atom.config.settingsForScopeDescriptor(scopes, 'editor.commentStart')[0]
+    scopeDescriptor = @editor.scopeDescriptorForBufferPosition([start, 0])
+    properties = atom.config.settingsForScopeDescriptor(scopeDescriptor, 'editor.commentStart')[0]
     return unless properties
 
     commentStartString = _.valueForKeyPath(properties, 'editor.commentStart')
@@ -168,12 +168,12 @@ class LanguageMode
     return null unless @isFoldableAtBufferRow(bufferRow)
 
     startIndentLevel = @editor.indentationForBufferRow(bufferRow)
-    scopes = @editor.scopesForBufferPosition([bufferRow, 0])
+    scopeDescriptor = @editor.scopeDescriptorForBufferPosition([bufferRow, 0])
     for row in [(bufferRow + 1)..@editor.getLastBufferRow()]
       continue if @editor.isBufferRowBlank(row)
       indentation = @editor.indentationForBufferRow(row)
       if indentation <= startIndentLevel
-        includeRowInFold = indentation == startIndentLevel and @foldEndRegexForScopes(scopes)?.searchSync(@editor.lineTextForBufferRow(row))
+        includeRowInFold = indentation == startIndentLevel and @foldEndRegexForScopeDescriptor(scopeDescriptor)?.searchSync(@editor.lineTextForBufferRow(row))
         foldEndRow = row if includeRowInFold
         break
 
@@ -246,8 +246,8 @@ class LanguageMode
   # Returns a {Number}.
   suggestedIndentForBufferRow: (bufferRow) ->
     currentIndentLevel = @editor.indentationForBufferRow(bufferRow)
-    scopes = @editor.scopesForBufferPosition([bufferRow, 0])
-    return currentIndentLevel unless increaseIndentRegex = @increaseIndentRegexForScopes(scopes)
+    scopeDescriptor = @editor.scopeDescriptorForBufferPosition([bufferRow, 0])
+    return currentIndentLevel unless increaseIndentRegex = @increaseIndentRegexForScopeDescriptor(scopeDescriptor)
 
     currentLine = @buffer.lineForRow(bufferRow)
     precedingRow = if bufferRow > 0 then bufferRow - 1 else null
@@ -257,7 +257,7 @@ class LanguageMode
     desiredIndentLevel = @editor.indentationForBufferRow(precedingRow)
     desiredIndentLevel += 1 if increaseIndentRegex.testSync(precedingLine) and not @editor.isBufferRowCommented(precedingRow)
 
-    return desiredIndentLevel unless decreaseIndentRegex = @decreaseIndentRegexForScopes(scopes)
+    return desiredIndentLevel unless decreaseIndentRegex = @decreaseIndentRegexForScopeDescriptor(scopeDescriptor)
     desiredIndentLevel -= 1 if decreaseIndentRegex.testSync(currentLine)
 
     Math.max(desiredIndentLevel, 0)
@@ -292,9 +292,9 @@ class LanguageMode
   #
   # bufferRow - The row {Number}
   autoDecreaseIndentForBufferRow: (bufferRow) ->
-    scopes = @editor.scopesForBufferPosition([bufferRow, 0])
-    increaseIndentRegex = @increaseIndentRegexForScopes(scopes)
-    decreaseIndentRegex = @decreaseIndentRegexForScopes(scopes)
+    scopeDescriptor = @editor.scopeDescriptorForBufferPosition([bufferRow, 0])
+    increaseIndentRegex = @increaseIndentRegexForScopeDescriptor(scopeDescriptor)
+    decreaseIndentRegex = @decreaseIndentRegexForScopeDescriptor(scopeDescriptor)
     return unless increaseIndentRegex and decreaseIndentRegex
 
     line = @buffer.lineForRow(bufferRow)
@@ -311,15 +311,15 @@ class LanguageMode
     if desiredIndentLevel >= 0 and desiredIndentLevel < currentIndentLevel
       @editor.setIndentationForBufferRow(bufferRow, desiredIndentLevel)
 
-  getRegexForProperty: (scopes, property) ->
-    if pattern = atom.config.get(scopes, property)
+  getRegexForProperty: (scopeDescriptor, property) ->
+    if pattern = atom.config.get(scopeDescriptor, property)
       new OnigRegExp(pattern)
 
-  increaseIndentRegexForScopes: (scopes) ->
-    @getRegexForProperty(scopes, 'editor.increaseIndentPattern')
+  increaseIndentRegexForScopeDescriptor: (scopeDescriptor) ->
+    @getRegexForProperty(scopeDescriptor, 'editor.increaseIndentPattern')
 
-  decreaseIndentRegexForScopes: (scopes) ->
-    @getRegexForProperty(scopes, 'editor.decreaseIndentPattern')
+  decreaseIndentRegexForScopeDescriptor: (scopeDescriptor) ->
+    @getRegexForProperty(scopeDescriptor, 'editor.decreaseIndentPattern')
 
-  foldEndRegexForScopes: (scopes) ->
-    @getRegexForProperty(scopes, 'editor.foldEndPattern')
+  foldEndRegexForScopeDescriptor: (scopeDescriptor) ->
+    @getRegexForProperty(scopeDescriptor, 'editor.foldEndPattern')

src/lines-component.coffee

@@ -200,7 +200,7 @@ LinesComponent = React.createClass
     firstTrailingWhitespacePosition = text.search(/\s*$/)
     lineIsWhitespaceOnly = firstTrailingWhitespacePosition is 0
     for token in tokens
-      innerHTML += @updateScopeStack(scopeStack, token.scopes)
+      innerHTML += @updateScopeStack(scopeStack, token.scopeDescriptor)
       hasIndentGuide = not mini and showIndentGuide and (token.hasLeadingWhitespace() or (token.hasTrailingWhitespace() and lineIsWhitespaceOnly))
       innerHTML += token.getValueAsHtml({hasIndentGuide})
 
@@ -217,20 +217,20 @@ LinesComponent = React.createClass
         html += "<span class='invisible-character'>#{invisible}</span>"
     html
 
-  updateScopeStack: (scopeStack, desiredScopes) ->
+  updateScopeStack: (scopeStack, desiredScopeDescriptor) ->
     html = ""
 
     # Find a common prefix
-    for scope, i in desiredScopes
-      break unless scopeStack[i] is desiredScopes[i]
+    for scope, i in desiredScopeDescriptor
+      break unless scopeStack[i] is desiredScopeDescriptor[i]
 
-    # Pop scopes until we're at the common prefx
+    # Pop scopeDescriptor until we're at the common prefx
     until scopeStack.length is i
       html += @popScope(scopeStack)
 
-    # Push onto common prefix until scopeStack equals desiredScopes
-    for j in [i...desiredScopes.length]
-      html += @pushScope(scopeStack, desiredScopes[j])
+    # Push onto common prefix until scopeStack equals desiredScopeDescriptor
+    for j in [i...desiredScopeDescriptor.length]
+      html += @pushScope(scopeStack, desiredScopeDescriptor[j])
 
     html
 
@@ -308,8 +308,8 @@ LinesComponent = React.createClass
     iterator = null
     charIndex = 0
 
-    for {value, scopes}, tokenIndex in tokenizedLine.tokens
-      charWidths = editor.getScopedCharWidths(scopes)
+    for {value, scopeDescriptor}, tokenIndex in tokenizedLine.tokens
+      charWidths = editor.getScopedCharWidths(scopeDescriptor)
 
       for char in value
         continue if char is '\0'
@@ -331,7 +331,7 @@ LinesComponent = React.createClass
           rangeForMeasurement.setStart(textNode, i)
           rangeForMeasurement.setEnd(textNode, i + 1)
           charWidth = rangeForMeasurement.getBoundingClientRect().width
-          editor.setScopedCharWidth(scopes, char, charWidth)
+          editor.setScopedCharWidth(scopeDescriptor, char, charWidth)
 
         charIndex++
 

src/menu-helpers.coffee

@@ -3,6 +3,7 @@ _ = require 'underscore-plus'
 ItemSpecificities = new WeakMap
 
 merge = (menu, item, itemSpecificity=Infinity) ->
+  item = cloneMenuItem(item)
   ItemSpecificities.set(item, itemSpecificity) if itemSpecificity
   matchingItemIndex = findMatchingItemIndex(menu, item)
   matchingItem = menu[matchingItemIndex] unless matchingItemIndex is - 1

src/menu-manager.coffee

@@ -63,14 +63,14 @@ class MenuManager
       # Selector isn't valid
       return false
 
-    # Simulate an .editor element attached to a .workspace element attached to
-    # a body element that has the same classes as the current body element.
+    # Simulate an atom-text-editor element attached to a atom-workspace element attached
+    # to a body element that has the same classes as the current body element.
     unless @testEditor?
       testBody = document.createElement('body')
       testBody.classList.add(@classesForElement(document.body)...)
 
       testWorkspace = document.createElement('div')
-      workspaceClasses = @classesForElement(document.body.querySelector('.workspace'))
+      workspaceClasses = @classesForElement(document.body.querySelector('atom-workspace'))
       workspaceClasses = ['workspace'] if workspaceClasses.length is 0
       testWorkspace.classList.add(workspaceClasses...)
 

src/package-manager.coffee

@@ -256,7 +256,7 @@ class PackageManager
     metadata?.engines?.atom?
 
   unobserveDisabledPackages: ->
-    @disabledPackagesSubscription?.off()
+    @disabledPackagesSubscription?.dispose()
     @disabledPackagesSubscription = null
 
   observeDisabledPackages: ->

src/package.coffee

@@ -162,9 +162,10 @@ class Package
     @stylesheetsActivated = true
 
   activateResources: ->
-    atom.keymaps.add(keymapPath, map) for [keymapPath, map] in @keymaps
-    atom.contextMenu.add(map['context-menu']) for [menuPath, map] in @menus
-    atom.menu.add(map.menu) for [menuPath, map] in @menus when map.menu
+    @activationDisposables = new CompositeDisposable
+    @activationDisposables.add(atom.keymaps.add(keymapPath, map)) for [keymapPath, map] in @keymaps
+    @activationDisposables.add(atom.contextMenu.add(map['context-menu'])) for [menuPath, map] in @menus
+    @activationDisposables.add(atom.menu.add(map.menu)) for [menuPath, map] in @menus when map.menu
 
     unless @grammarsActivated
       grammar.activate() for grammar in @grammars
@@ -294,8 +295,8 @@ class Package
   deactivateResources: ->
     grammar.deactivate() for grammar in @grammars
     scopedProperties.deactivate() for scopedProperties in @scopedProperties
-    atom.keymaps.remove(keymapPath) for [keymapPath] in @keymaps
     atom.themes.removeStylesheet(stylesheetPath) for [stylesheetPath] in @stylesheets
+    @activationDisposables?.dispose()
     @stylesheetsActivated = false
     @grammarsActivated = false
     @scopedPropertiesActivated = false
@@ -334,9 +335,18 @@ class Package
     @activationCommandSubscriptions = new CompositeDisposable
     for selector, commands of @getActivationCommands()
       for command in commands
-        @activationCommandSubscriptions.add(
-          atom.commands.add(selector, command, @handleActivationCommand)
-        )
+        do (selector, command) =>
+          atom.commands.commandRegistered(command)
+          @activationCommandSubscriptions.add(atom.commands.onWillDispatch (event) =>
+            return unless event.type is command
+            currentTarget = event.target
+            while currentTarget
+              if currentTarget.webkitMatchesSelector(selector)
+                @activationCommandSubscriptions.dispose()
+                @activateNow()
+                break
+              currentTarget = currentTarget.parentElement
+          )
 
   getActivationCommands: ->
     return @activationCommands if @activationCommands?
@@ -354,28 +364,20 @@ class Package
     if @metadata.activationEvents?
       if _.isArray(@metadata.activationEvents)
         for eventName in @metadata.activationEvents
-          @activationCommands['.workspace'] ?= []
-          @activationCommands['.workspace'].push(eventName)
+          @activationCommands['atom-workspace'] ?= []
+          @activationCommands['atom-workspace'].push(eventName)
       else if _.isString(@metadata.activationEvents)
         eventName = @metadata.activationEvents
-        @activationCommands['.workspace'] ?= []
-        @activationCommands['.workspace'].push(eventName)
+        @activationCommands['atom-workspace'] ?= []
+        @activationCommands['atom-workspace'].push(eventName)
       else
         for eventName, selector of @metadata.activationEvents
-          selector ?= '.workspace'
+          selector ?= 'atom-workspace'
           @activationCommands[selector] ?= []
           @activationCommands[selector].push(eventName)
 
     @activationCommands
 
-  handleActivationCommand: (event) =>
-    event.stopImmediatePropagation()
-    @activationCommandSubscriptions.dispose()
-    reenableInvokedListeners = event.disableInvokedListeners()
-    @activateNow()
-    event.target.dispatchEvent(new CustomEvent(event.type, bubbles: true))
-    reenableInvokedListeners()
-
   # Does the given module path contain native code?
   isNativeModule: (modulePath) ->
     try

src/pane-axis-element.coffee

@@ -17,9 +17,9 @@ class PaneAxisElement extends HTMLElement
 
     switch @model.getOrientation()
       when 'horizontal'
-        @classList.add('pane-row')
+        @classList.add('horizontal', 'pane-row')
       when 'vertical'
-        @classList.add('pane-column')
+        @classList.add('vertical', 'pane-column')
 
   childAdded: ({child, index}) ->
     view = @model.getView(child)
@@ -39,6 +39,4 @@ class PaneAxisElement extends HTMLElement
   hasFocus: ->
     this is document.activeElement or @contains(document.activeElement)
 
-module.exports = PaneAxisElement = document.registerElement 'atom-pane-axis',
-  prototype: PaneAxisElement.prototype
-  extends: 'div'
+module.exports = PaneAxisElement = document.registerElement 'atom-pane-axis', prototype: PaneAxisElement.prototype

src/pane-container-element.coffee

@@ -48,7 +48,7 @@ class PaneContainerElement extends HTMLElement
     paneView = @model.getView(@model.getActivePane())
     box = @boundingBoxForPaneView(paneView)
 
-    paneViews = _.toArray(@querySelectorAll('.pane'))
+    paneViews = _.toArray(@querySelectorAll('atom-pane'))
       .filter (otherPaneView) =>
         otherBox = @boundingBoxForPaneView(otherPaneView)
         switch direction
@@ -75,6 +75,4 @@ class PaneContainerElement extends HTMLElement
     top: {x: boundingBox.left, y: boundingBox.top}
     bottom: {x: boundingBox.left, y: boundingBox.bottom}
 
-module.exports = PaneContainerElement = document.registerElement 'atom-pane-container',
-  prototype: PaneContainerElement.prototype
-  extends: 'div'
+module.exports = PaneContainerElement = document.registerElement 'atom-pane-container', prototype: PaneContainerElement.prototype

src/pane-container-view.coffee

@@ -33,7 +33,7 @@ class PaneContainerView extends View
     @model.confirmClose()
 
   getPaneViews: ->
-    @find('.pane').views()
+    @find('atom-pane').views()
 
   indexOfPane: (paneView) ->
     @getPaneViews().indexOf(paneView.view())
@@ -48,7 +48,7 @@ class PaneContainerView extends View
     off: => @off 'pane:attached', paneViewAttached
 
   getFocusedPane: ->
-    @find('.pane:has(:focus)').view()
+    @find('atom-pane:has(:focus)').view()
 
   getActivePane: ->
     deprecate("Use PaneContainerView::getActivePaneView instead.")

src/pane-container.coffee

@@ -7,6 +7,8 @@ PaneElement = require './pane-element'
 PaneContainerElement = require './pane-container-element'
 PaneAxisElement = require './pane-axis-element'
 PaneAxis = require './pane-axis'
+TextEditor = require './text-editor'
+TextEditorElement = require './text-editor-element'
 ViewRegistry = require './view-registry'
 ItemRegistry = require './item-registry'
 
@@ -66,6 +68,10 @@ class PaneContainer extends Model
       modelConstructor: Pane
       viewConstructor: PaneElement
 
+    @viewRegistry.addViewProvider
+      modelConstructor: TextEditor
+      viewConstructor: TextEditorElement
+
   getView: (object) ->
     @viewRegistry.getView(object)
 

src/pane-element.coffee

@@ -1,5 +1,5 @@
 {CompositeDisposable} = require 'event-kit'
-{$} = require './space-pen-extensions'
+{$, callAttachHooks, callRemoveHooks} = require './space-pen-extensions'
 PaneView = require './pane-view'
 
 class PaneElement extends HTMLElement
@@ -8,6 +8,8 @@ class PaneElement extends HTMLElement
   createdCallback: ->
     @attached = false
     @subscriptions = new CompositeDisposable
+    @inlineDisplayStyles = new WeakMap
+
     @initializeContent()
     @subscribeToDOMEvents()
     @createSpacePenShim()
@@ -81,24 +83,37 @@ class PaneElement extends HTMLElement
   activeItemChanged: (item) ->
     return unless item?
 
-    $itemViews = $(@itemViews)
-    view = @model.getView(item).__spacePenView
-    otherView.hide() for otherView in $itemViews.children().not(view).views()
-    $itemViews.append(view) unless view.parent().is($itemViews)
-    view.show() if @attached
-    view.focus() if @hasFocus()
+    hasFocus = @hasFocus()
+    itemView = @model.getView(item)
+
+    for child in @itemViews.children
+      if child is itemView
+        @showItemView(child) if @attached
+      else
+        @hideItemView(child)
+
+    unless @itemViews.contains(itemView)
+      @itemViews.appendChild(itemView)
+      callAttachHooks(itemView)
+
+    itemView.focus() if hasFocus
+
+  showItemView: (itemView) ->
+    inlineDisplayStyle = @inlineDisplayStyles.get(itemView)
+    if inlineDisplayStyle?
+      itemView.style.display = inlineDisplayStyle
+    else
+      itemView.style.display = ''
+
+  hideItemView: (itemView) ->
+    inlineDisplayStyle = itemView.style.display
+    @inlineDisplayStyles.set(itemView, inlineDisplayStyle) if inlineDisplayStyle?
+    itemView.style.display = 'none'
 
   itemRemoved: ({item, index, destroyed}) ->
-    if item instanceof $
-      viewToRemove = item
-    else
-      viewToRemove = @model.getView(item).__spacePenView
-
-    if viewToRemove?
-      if destroyed
-        viewToRemove.remove()
-      else
-        viewToRemove.detach()
+    if viewToRemove = @model.getView(item)
+      callRemoveHooks(viewToRemove)
+      viewToRemove.remove()
 
   paneDestroyed: ->
     @subscriptions.dispose()
@@ -108,6 +123,4 @@ class PaneElement extends HTMLElement
   hasFocus: ->
     this is document.activeElement or @contains(document.activeElement)
 
-module.exports = PaneElement = document.registerElement 'atom-pane',
-  prototype: PaneElement.prototype
-  extends: 'div'
+module.exports = PaneElement = document.registerElement 'atom-pane', prototype: PaneElement.prototype

src/pane-view.coffee

@@ -43,7 +43,7 @@ class PaneView extends View
     @subscriptions.add @model.onDidDestroy(@onPaneDestroyed)
 
   afterAttach: ->
-    @container ?= @closest('.panes').view()
+    @container ?= @closest('atom-pane-container').view()
     @trigger('pane:attached', [this]) unless @attached
     @attached = true
 
@@ -169,7 +169,7 @@ class PaneView extends View
 
   splitDown: (items...) -> @model.getView(@model.splitDown({items})).__spacePenView
 
-  getContainer: -> @closest('.panes').view()
+  getContainer: -> @closest('atom-pane-container').view()
 
   focus: ->
     @element.focus()

src/space-pen-extensions.coffee

@@ -1,14 +1,81 @@
 _ = require 'underscore-plus'
-spacePen = require 'space-pen'
+SpacePen = require 'space-pen'
 {Subscriber} = require 'emissary'
 
-Subscriber.includeInto(spacePen.View)
+Subscriber.includeInto(SpacePen.View)
 
-jQuery = spacePen.jQuery
-originalCleanData = jQuery.cleanData
+jQuery = SpacePen.jQuery
+JQueryCleanData = jQuery.cleanData
 jQuery.cleanData = (elements) ->
   jQuery(element).view()?.unsubscribe() for element in elements
-  originalCleanData(elements)
+  JQueryCleanData(elements)
+
+SpacePenCallRemoveHooks = SpacePen.callRemoveHooks
+SpacePen.callRemoveHooks = (element) ->
+  view.unsubscribe() for view in SpacePen.viewsForElement(element)
+  SpacePenCallRemoveHooks(element)
+
+NativeEventNames = new Set
+NativeEventNames.add(nativeEvent) for nativeEvent in ["blur", "focus", "focusin",
+"focusout", "load", "resize", "scroll", "unload", "click", "dblclick", "mousedown",
+"mouseup", "mousemove", "mouseover", "mouseout", "mouseenter", "mouseleave", "change",
+"select", "submit", "keydown", "keypress", "keyup", "error", "contextmenu"]
+
+JQueryTrigger = jQuery.fn.trigger
+jQuery.fn.trigger = (eventName, data) ->
+  if NativeEventNames.has(eventName) or typeof eventName is 'object'
+    JQueryTrigger.call(this, eventName, data)
+  else
+    for element in this
+      atom.commands.dispatch(element, eventName, data)
+    this
+
+HandlersByOriginalHandler = new WeakMap
+CommandDisposablesByElement = new WeakMap
+
+AddEventListener = (element, type, listener) ->
+  if NativeEventNames.has(type)
+    element.addEventListener(type, listener)
+  else
+    disposable = atom.commands.add(element, type, listener)
+
+    unless disposablesByType = CommandDisposablesByElement.get(element)
+      disposablesByType = {}
+      CommandDisposablesByElement.set(element, disposablesByType)
+
+    unless disposablesByListener = disposablesByType[type]
+      disposablesByListener = new WeakMap
+      disposablesByType[type] = disposablesByListener
+
+    disposablesByListener.set(listener, disposable)
+
+RemoveEventListener = (element, type, listener) ->
+  if NativeEventNames.has(type)
+    element.removeEventListener(type, listener)
+  else
+    CommandDisposablesByElement.get(element)?[type]?.get(listener)?.dispose()
+
+JQueryEventAdd = jQuery.event.add
+jQuery.event.add = (elem, types, originalHandler, data, selector) ->
+  handler = (event) ->
+    if arguments.length is 1 and event.originalEvent?.detail?
+      {detail} = event.originalEvent
+      if Array.isArray(detail)
+        originalHandler.apply(this, [event].concat(detail))
+      else
+        originalHandler.call(this, event, detail)
+    else
+      originalHandler.apply(this, arguments)
+
+  HandlersByOriginalHandler.set(originalHandler, handler)
+
+  JQueryEventAdd.call(this, elem, types, handler, data, selector, AddEventListener if atom?.commands?)
+
+JQueryEventRemove = jQuery.event.remove
+jQuery.event.remove = (elem, types, originalHandler, selector, mappedTypes) ->
+  if originalHandler?
+    handler = HandlersByOriginalHandler.get(originalHandler) ? originalHandler
+  JQueryEventRemove(elem, types, handler, selector, mappedTypes, RemoveEventListener if atom?.commands?)
 
 tooltipDefaults =
   delay:
@@ -71,4 +138,4 @@ jQuery.fn.setTooltip.humanizeKeystrokes = humanizeKeystrokes
 
 Object.defineProperty jQuery.fn, 'element', get: -> @[0]
 
-module.exports = spacePen
+module.exports = SpacePen

src/syntax.coffee

@@ -32,7 +32,7 @@ class Syntax extends GrammarRegistry
   serialize: ->
     {deserializer: @constructor.name, @grammarOverridesByPath}
 
-  createToken: (value, scopes) -> new Token({value, scopes})
+  createToken: (value, scopeDescriptor) -> new Token({value, scopeDescriptor})
 
   # Deprecated: Used by settings-view to display snippets for packages
   @::accessor 'propertyStore', ->
@@ -40,6 +40,7 @@ class Syntax extends GrammarRegistry
     atom.config.scopedSettingsStore
 
   addProperties: (args...) ->
+    args.unshift(null) if args.length == 2
     deprecate 'Consider using atom.config.set() instead. A direct (but private) replacement is available at atom.config.addScopedSettings().'
     atom.config.addScopedSettings(args...)
 

src/task.coffee

@@ -98,8 +98,7 @@ class Task
     taskPath = taskPath.replace(/\\/g, "\\\\")
 
     env = _.extend({}, process.env, {taskPath, userAgent: navigator.userAgent})
-    args = [bootstrap, '--harmony_collections']
-    @childProcess = child_process.fork '--eval', args, {env, cwd: __dirname}
+    @childProcess = child_process.fork '--eval', [bootstrap], {env, cwd: __dirname}
 
     @on "task:log", -> console.log(arguments...)
     @on "task:warn", -> console.warn(arguments...)

src/text-editor-component.coffee

@@ -5,6 +5,7 @@ React = require 'react-atom-fork'
 scrollbarStyle = require 'scrollbar-style'
 {Range, Point} = require 'text-buffer'
 grim = require 'grim'
+{CompositeDisposable} = require 'event-kit'
 
 GutterComponent = require './gutter-component'
 InputComponent = require './input-component'
@@ -176,7 +177,6 @@ TextEditorComponent = React.createClass
 
     @observeEditor()
     @listenForDOMEvents()
-    @listenForCommands()
 
     @subscribe atom.themes.onDidAddStylesheet @onStylesheetsChanged
     @subscribe atom.themes.onDidUpdateStylesheet @onStylesheetsChanged
@@ -193,7 +193,7 @@ TextEditorComponent = React.createClass
   componentWillUnmount: ->
     {editor, parentView} = @props
 
-    parentView.trigger 'editor:will-be-removed', [parentView]
+    parentView.__spacePenView.trigger 'editor:will-be-removed', [parentView.__spacePenView]
     @unsubscribe()
     window.removeEventListener 'resize', @requestHeightAndWidthMeasurement
     clearInterval(@domPollingIntervalId)
@@ -212,9 +212,9 @@ TextEditorComponent = React.createClass
     if @props.editor.isAlive()
       @updateParentViewFocusedClassIfNeeded(prevState)
       @updateParentViewMiniClassIfNeeded(prevState)
-      @props.parentView.trigger 'cursor:moved' if cursorMoved
-      @props.parentView.trigger 'selection:changed' if selectionChanged
-      @props.parentView.trigger 'editor:display-updated'
+      @props.parentView.__spacePenView.trigger 'cursor:moved' if cursorMoved
+      @props.parentView.__spacePenView.trigger 'selection:changed' if selectionChanged
+      @props.parentView.__spacePenView.trigger 'editor:display-updated'
 
   becameVisible: ->
     @updatesPaused = true
@@ -255,7 +255,7 @@ TextEditorComponent = React.createClass
         @forceUpdate()
 
   getTopmostDOMNode: ->
-    @props.parentView.element
+    @props.parentView
 
   getRenderedRowRange: ->
     {editor, lineOverdrawMargin} = @props
@@ -353,6 +353,7 @@ TextEditorComponent = React.createClass
   observeEditor: ->
     {editor} = @props
     @subscribe editor.onDidChange(@onScreenLinesChanged)
+    @subscribe editor.observeGrammar(@onGrammarChanged)
     @subscribe editor.observeCursors(@onCursorAdded)
     @subscribe editor.observeSelections(@onSelectionAdded)
     @subscribe editor.observeDecorations(@onDecorationAdded)
@@ -406,129 +407,21 @@ TextEditorComponent = React.createClass
       editor.insertText(selectedText, select: true, undo: 'skip')
       event.target.value = ''
 
-  listenForCommands: ->
-    {parentView, editor, mini} = @props
-
-    @addCommandListeners
-      'core:move-left': -> editor.moveLeft()
-      'core:move-right': -> editor.moveRight()
-      'core:select-left': -> editor.selectLeft()
-      'core:select-right': -> editor.selectRight()
-      'core:select-all': -> editor.selectAll()
-      'core:backspace': -> editor.backspace()
-      'core:delete': -> editor.delete()
-      'core:undo': -> editor.undo()
-      'core:redo': -> editor.redo()
-      'core:cut': -> editor.cutSelectedText()
-      'core:copy': -> editor.copySelectedText()
-      'core:paste': -> editor.pasteText()
-      'editor:move-to-previous-word': -> editor.moveToPreviousWord()
-      'editor:select-word': -> editor.selectWordsContainingCursors()
-      'editor:consolidate-selections': @consolidateSelections
-      'editor:delete-to-beginning-of-word': -> editor.deleteToBeginningOfWord()
-      'editor:delete-to-beginning-of-line': -> editor.deleteToBeginningOfLine()
-      'editor:delete-to-end-of-line': -> editor.deleteToEndOfLine()
-      'editor:delete-to-end-of-word': -> editor.deleteToEndOfWord()
-      'editor:delete-line': -> editor.deleteLine()
-      'editor:cut-to-end-of-line': -> editor.cutToEndOfLine()
-      'editor:move-to-beginning-of-next-paragraph': -> editor.moveToBeginningOfNextParagraph()
-      'editor:move-to-beginning-of-previous-paragraph': -> editor.moveToBeginningOfPreviousParagraph()
-      'editor:move-to-beginning-of-screen-line': -> editor.moveToBeginningOfScreenLine()
-      'editor:move-to-beginning-of-line': -> editor.moveToBeginningOfLine()
-      'editor:move-to-end-of-screen-line': -> editor.moveToEndOfScreenLine()
-      'editor:move-to-end-of-line': -> editor.moveToEndOfLine()
-      'editor:move-to-first-character-of-line': -> editor.moveToFirstCharacterOfLine()
-      'editor:move-to-beginning-of-word': -> editor.moveToBeginningOfWord()
-      'editor:move-to-end-of-word': -> editor.moveToEndOfWord()
-      'editor:move-to-beginning-of-next-word': -> editor.moveToBeginningOfNextWord()
-      'editor:move-to-previous-word-boundary': -> editor.moveToPreviousWordBoundary()
-      'editor:move-to-next-word-boundary': -> editor.moveToNextWordBoundary()
-      'editor:select-to-beginning-of-next-paragraph': -> editor.selectToBeginningOfNextParagraph()
-      'editor:select-to-beginning-of-previous-paragraph': -> editor.selectToBeginningOfPreviousParagraph()
-      'editor:select-to-end-of-line': -> editor.selectToEndOfLine()
-      'editor:select-to-beginning-of-line': -> editor.selectToBeginningOfLine()
-      'editor:select-to-end-of-word': -> editor.selectToEndOfWord()
-      'editor:select-to-beginning-of-word': -> editor.selectToBeginningOfWord()
-      'editor:select-to-beginning-of-next-word': -> editor.selectToBeginningOfNextWord()
-      'editor:select-to-next-word-boundary': -> editor.selectToNextWordBoundary()
-      'editor:select-to-previous-word-boundary': -> editor.selectToPreviousWordBoundary()
-      'editor:select-to-first-character-of-line': -> editor.selectToFirstCharacterOfLine()
-      'editor:select-line': -> editor.selectLinesContainingCursors()
-      'editor:transpose': -> editor.transpose()
-      'editor:upper-case': -> editor.upperCase()
-      'editor:lower-case': -> editor.lowerCase()
-
-    unless mini
-      @addCommandListeners
-        'core:move-up': -> editor.moveUp()
-        'core:move-down': -> editor.moveDown()
-        'core:move-to-top': -> editor.moveToTop()
-        'core:move-to-bottom': -> editor.moveToBottom()
-        'core:page-up': -> editor.pageUp()
-        'core:page-down': -> editor.pageDown()
-        'core:select-up': -> editor.selectUp()
-        'core:select-down': -> editor.selectDown()
-        'core:select-to-top': -> editor.selectToTop()
-        'core:select-to-bottom': -> editor.selectToBottom()
-        'core:select-page-up': -> editor.selectPageUp()
-        'core:select-page-down': -> editor.selectPageDown()
-        'editor:indent': -> editor.indent()
-        'editor:auto-indent': -> editor.autoIndentSelectedRows()
-        'editor:indent-selected-rows': -> editor.indentSelectedRows()
-        'editor:outdent-selected-rows': -> editor.outdentSelectedRows()
-        'editor:newline': -> editor.insertNewline()
-        'editor:newline-below': -> editor.insertNewlineBelow()
-        'editor:newline-above': -> editor.insertNewlineAbove()
-        'editor:add-selection-below': -> editor.addSelectionBelow()
-        'editor:add-selection-above': -> editor.addSelectionAbove()
-        'editor:split-selections-into-lines': -> editor.splitSelectionsIntoLines()
-        'editor:toggle-soft-tabs': -> editor.toggleSoftTabs()
-        'editor:toggle-soft-wrap': -> editor.toggleSoftWrapped()
-        'editor:fold-all': -> editor.foldAll()
-        'editor:unfold-all': -> editor.unfoldAll()
-        'editor:fold-current-row': -> editor.foldCurrentRow()
-        'editor:unfold-current-row': -> editor.unfoldCurrentRow()
-        'editor:fold-selection': -> editor.foldSelectedLines()
-        'editor:fold-at-indent-level-1': -> editor.foldAllAtIndentLevel(0)
-        'editor:fold-at-indent-level-2': -> editor.foldAllAtIndentLevel(1)
-        'editor:fold-at-indent-level-3': -> editor.foldAllAtIndentLevel(2)
-        'editor:fold-at-indent-level-4': -> editor.foldAllAtIndentLevel(3)
-        'editor:fold-at-indent-level-5': -> editor.foldAllAtIndentLevel(4)
-        'editor:fold-at-indent-level-6': -> editor.foldAllAtIndentLevel(5)
-        'editor:fold-at-indent-level-7': -> editor.foldAllAtIndentLevel(6)
-        'editor:fold-at-indent-level-8': -> editor.foldAllAtIndentLevel(7)
-        'editor:fold-at-indent-level-9': -> editor.foldAllAtIndentLevel(8)
-        'editor:toggle-line-comments': -> editor.toggleLineCommentsInSelection()
-        'editor:log-cursor-scope': -> editor.logCursorScope()
-        'editor:checkout-head-revision': -> atom.project.getRepositories()[0]?.checkoutHeadForEditor(editor)
-        'editor:copy-path': -> editor.copyPathToClipboard()
-        'editor:move-line-up': -> editor.moveLineUp()
-        'editor:move-line-down': -> editor.moveLineDown()
-        'editor:duplicate-lines': -> editor.duplicateLines()
-        'editor:join-lines': -> editor.joinLines()
-        'editor:toggle-indent-guide': -> atom.config.set('editor.showIndentGuide', not atom.config.get('editor.showIndentGuide'))
-        'editor:toggle-line-numbers': ->  atom.config.set('editor.showLineNumbers', not atom.config.get('editor.showLineNumbers'))
-        'editor:scroll-to-cursor': -> editor.scrollToCursorPosition()
-        'benchmark:scroll': @runScrollBenchmark
-
-  addCommandListeners: (listenersByCommandName) ->
-    {parentView} = @props
-
-    addListener = (command, listener) =>
-      @subscribe parentView.command command, (event) ->
-        event.stopPropagation()
-        listener(event)
-
-    addListener(command, listener) for command, listener of listenersByCommandName
-
-    return
-
   observeConfig: ->
-    @subscribe atom.config.observe 'editor.showIndentGuide', @setShowIndentGuide
-    @subscribe atom.config.observe 'editor.showLineNumbers', @setShowLineNumbers
-    @subscribe atom.config.observe 'editor.scrollSensitivity', @setScrollSensitivity
     @subscribe atom.config.observe 'editor.useHardwareAcceleration', @setUseHardwareAcceleration
 
+  onGrammarChanged: ->
+    {editor} = @props
+
+    @scopedConfigSubscriptions?.dispose()
+    @scopedConfigSubscriptions = subscriptions = new CompositeDisposable
+
+    scopeDescriptor = editor.getRootScopeDescriptor()
+
+    subscriptions.add atom.config.observe scopeDescriptor, 'editor.showIndentGuide', @setShowIndentGuide
+    subscriptions.add atom.config.observe scopeDescriptor, 'editor.showLineNumbers', @setShowLineNumbers
+    subscriptions.add atom.config.observe scopeDescriptor, 'editor.scrollSensitivity', @setScrollSensitivity
+
   onFocus: ->
     @refs.input.focus() if @isMounted()
 
@@ -553,7 +446,6 @@ TextEditorComponent = React.createClass
 
     inputNode.value = event.data if editor.insertText(event.data)
 
-
   onInputFocused: ->
     @setState(focused: true)
 
@@ -864,10 +756,9 @@ TextEditorComponent = React.createClass
     return unless @isMounted()
 
     {editor, parentView} = @props
-    parentNode = parentView.element
     scrollViewNode = @refs.scrollView.getDOMNode()
-    {position} = getComputedStyle(parentNode)
-    {height} = parentNode.style
+    {position} = getComputedStyle(parentView)
+    {height} = parentView.style
 
     if position is 'absolute' or height
       if @autoHeight
@@ -901,7 +792,7 @@ TextEditorComponent = React.createClass
   sampleBackgroundColors: (suppressUpdate) ->
     {parentView} = @props
     {showLineNumbers} = @state
-    {backgroundColor} = getComputedStyle(parentView.element)
+    {backgroundColor} = getComputedStyle(parentView)
 
     if backgroundColor isnt @backgroundColor
       @backgroundColor = backgroundColor
@@ -1070,11 +961,11 @@ TextEditorComponent = React.createClass
 
   updateParentViewFocusedClassIfNeeded: (prevState) ->
     if prevState.focused isnt @state.focused
-      @props.parentView.toggleClass('is-focused', @props.focused)
+      @props.parentView.classList.toggle('is-focused', @state.focused)
 
   updateParentViewMiniClassIfNeeded: (prevProps) ->
     if prevProps.mini isnt @props.mini
-      @props.parentView.toggleClass('mini', @props.mini)
+      @props.parentView.classList.toggle('mini', @props.mini)
 
   runScrollBenchmark: ->
     unless process.env.NODE_ENV is 'production'

src/text-editor-element.coffee

@@ -0,0 +1,204 @@
+{View, $} = require 'space-pen'
+React = require 'react-atom-fork'
+{defaults} = require 'underscore-plus'
+TextBuffer = require 'text-buffer'
+TextEditor = require './text-editor'
+TextEditorComponent = require './text-editor-component'
+TextEditorView = null
+
+class TextEditorElement extends HTMLElement
+  model: null
+  componentDescriptor: null
+  component: null
+  lineOverdrawMargin: null
+  focusOnAttach: false
+
+  createdCallback: ->
+    @subscriptions =
+    @initializeContent()
+    @createSpacePenShim()
+    @addEventListener 'focus', @focused.bind(this)
+    @addEventListener 'focusout', @focusedOut.bind(this)
+    @addEventListener 'blur', @blurred.bind(this)
+
+  initializeContent: (attributes) ->
+    @classList.add('editor', 'react', 'editor-colors')
+    @setAttribute('tabindex', -1)
+
+  createSpacePenShim: ->
+    TextEditorView ?= require './text-editor-view'
+    @__spacePenView = new TextEditorView(this)
+
+  attachedCallback: ->
+    @buildModel() unless @getModel()?
+    @mountComponent() unless @component?.isMounted()
+    @component.checkForVisibilityChange()
+    @focus() if @focusOnAttach
+
+  setModel: (model) ->
+    throw new Error("Model already assigned on TextEditorElement") if @model?
+    @model = model
+    @mountComponent()
+    @addGrammarScopeAttribute()
+    @model.onDidChangeGrammar => @addGrammarScopeAttribute()
+    @__spacePenView.setModel(@model)
+    @model
+
+  getModel: ->
+    @model ? @buildModel()
+
+  buildModel: ->
+    @setModel(new TextEditor(
+      buffer: new TextBuffer
+      softWrapped: false
+      tabLength: 2
+      softTabs: true
+      mini: @hasAttribute('mini')
+      placeholderText: @getAttribute('placeholder-text')
+    ))
+
+  mountComponent: ->
+    @componentDescriptor ?= TextEditorComponent(
+      parentView: this
+      editor: @model
+      mini: @model.mini
+      lineOverdrawMargin: @lineOverdrawMargin
+    )
+    @component = React.renderComponent(@componentDescriptor, this)
+
+  unmountComponent: ->
+    return unless @component?.isMounted()
+    React.unmountComponentAtNode(this)
+    @component = null
+
+  focused: ->
+    if @component?
+      @component.onFocus()
+    else
+      @focusOnAttach = true
+
+  focusedOut: (event) ->
+    event.stopImmediatePropagation() if @contains(event.relatedTarget)
+
+  blurred: (event) ->
+    event.stopImmediatePropagation() if @contains(event.relatedTarget)
+
+  addGrammarScopeAttribute: ->
+    grammarScope = @model.getGrammar()?.scopeName?.replace(/\./g, ' ')
+    @setAttribute('data-grammar', grammarScope)
+
+  hasFocus: ->
+    this is document.activeElement or @contains(document.activeElement)
+
+stopCommandEventPropagation = (commandListeners) ->
+  newCommandListeners = {}
+  for commandName, commandListener of commandListeners
+    do (commandListener) ->
+      newCommandListeners[commandName] = (event) ->
+        event.stopPropagation()
+        commandListener.call(this, event)
+  newCommandListeners
+
+atom.commands.add 'atom-text-editor', stopCommandEventPropagation(
+  'core:move-left': -> @getModel().moveLeft()
+  'core:move-right': -> @getModel().moveRight()
+  'core:select-left': -> @getModel().selectLeft()
+  'core:select-right': -> @getModel().selectRight()
+  'core:select-all': -> @getModel().selectAll()
+  'core:backspace': -> @getModel().backspace()
+  'core:delete': -> @getModel().delete()
+  'core:undo': -> @getModel().undo()
+  'core:redo': -> @getModel().redo()
+  'core:cut': -> @getModel().cutSelectedText()
+  'core:copy': -> @getModel().copySelectedText()
+  'core:paste': -> @getModel().pasteText()
+  'editor:move-to-previous-word': -> @getModel().moveToPreviousWord()
+  'editor:select-word': -> @getModel().selectWordsContainingCursors()
+  'editor:consolidate-selections': (event) -> event.abortKeyBinding() unless @getModel().consolidateSelections()
+  'editor:delete-to-beginning-of-word': -> @getModel().deleteToBeginningOfWord()
+  'editor:delete-to-beginning-of-line': -> @getModel().deleteToBeginningOfLine()
+  'editor:delete-to-end-of-line': -> @getModel().deleteToEndOfLine()
+  'editor:delete-to-end-of-word': -> @getModel().deleteToEndOfWord()
+  'editor:delete-line': -> @getModel().deleteLine()
+  'editor:cut-to-end-of-line': -> @getModel().cutToEndOfLine()
+  'editor:move-to-beginning-of-next-paragraph': -> @getModel().moveToBeginningOfNextParagraph()
+  'editor:move-to-beginning-of-previous-paragraph': -> @getModel().moveToBeginningOfPreviousParagraph()
+  'editor:move-to-beginning-of-screen-line': -> @getModel().moveToBeginningOfScreenLine()
+  'editor:move-to-beginning-of-line': -> @getModel().moveToBeginningOfLine()
+  'editor:move-to-end-of-screen-line': -> @getModel().moveToEndOfScreenLine()
+  'editor:move-to-end-of-line': -> @getModel().moveToEndOfLine()
+  'editor:move-to-first-character-of-line': -> @getModel().moveToFirstCharacterOfLine()
+  'editor:move-to-beginning-of-word': -> @getModel().moveToBeginningOfWord()
+  'editor:move-to-end-of-word': -> @getModel().moveToEndOfWord()
+  'editor:move-to-beginning-of-next-word': -> @getModel().moveToBeginningOfNextWord()
+  'editor:move-to-previous-word-boundary': -> @getModel().moveToPreviousWordBoundary()
+  'editor:move-to-next-word-boundary': -> @getModel().moveToNextWordBoundary()
+  'editor:select-to-beginning-of-next-paragraph': -> @getModel().selectToBeginningOfNextParagraph()
+  'editor:select-to-beginning-of-previous-paragraph': -> @getModel().selectToBeginningOfPreviousParagraph()
+  'editor:select-to-end-of-line': -> @getModel().selectToEndOfLine()
+  'editor:select-to-beginning-of-line': -> @getModel().selectToBeginningOfLine()
+  'editor:select-to-end-of-word': -> @getModel().selectToEndOfWord()
+  'editor:select-to-beginning-of-word': -> @getModel().selectToBeginningOfWord()
+  'editor:select-to-beginning-of-next-word': -> @getModel().selectToBeginningOfNextWord()
+  'editor:select-to-next-word-boundary': -> @getModel().selectToNextWordBoundary()
+  'editor:select-to-previous-word-boundary': -> @getModel().selectToPreviousWordBoundary()
+  'editor:select-to-first-character-of-line': -> @getModel().selectToFirstCharacterOfLine()
+  'editor:select-line': -> @getModel().selectLinesContainingCursors()
+  'editor:transpose': -> @getModel().transpose()
+  'editor:upper-case': -> @getModel().upperCase()
+  'editor:lower-case': -> @getModel().lowerCase()
+)
+
+atom.commands.add 'atom-text-editor:not(.mini)', stopCommandEventPropagation(
+  'core:move-up': -> @getModel().moveUp()
+  'core:move-down': -> @getModel().moveDown()
+  'core:move-to-top': -> @getModel().moveToTop()
+  'core:move-to-bottom': -> @getModel().moveToBottom()
+  'core:page-up': -> @getModel().pageUp()
+  'core:page-down': -> @getModel().pageDown()
+  'core:select-up': -> @getModel().selectUp()
+  'core:select-down': -> @getModel().selectDown()
+  'core:select-to-top': -> @getModel().selectToTop()
+  'core:select-to-bottom': -> @getModel().selectToBottom()
+  'core:select-page-up': -> @getModel().selectPageUp()
+  'core:select-page-down': -> @getModel().selectPageDown()
+  'editor:indent': -> @getModel().indent()
+  'editor:auto-indent': -> @getModel().autoIndentSelectedRows()
+  'editor:indent-selected-rows': -> @getModel().indentSelectedRows()
+  'editor:outdent-selected-rows': -> @getModel().outdentSelectedRows()
+  'editor:newline': -> @getModel().insertNewline()
+  'editor:newline-below': -> @getModel().insertNewlineBelow()
+  'editor:newline-above': -> @getModel().insertNewlineAbove()
+  'editor:add-selection-below': -> @getModel().addSelectionBelow()
+  'editor:add-selection-above': -> @getModel().addSelectionAbove()
+  'editor:split-selections-into-lines': -> @getModel().splitSelectionsIntoLines()
+  'editor:toggle-soft-tabs': -> @getModel().toggleSoftTabs()
+  'editor:toggle-soft-wrap': -> @getModel().toggleSoftWrapped()
+  'editor:fold-all': -> @getModel().foldAll()
+  'editor:unfold-all': -> @getModel().unfoldAll()
+  'editor:fold-current-row': -> @getModel().foldCurrentRow()
+  'editor:unfold-current-row': -> @getModel().unfoldCurrentRow()
+  'editor:fold-selection': -> @getModel().foldSelectedLines()
+  'editor:fold-at-indent-level-1': -> @getModel().foldAllAtIndentLevel(0)
+  'editor:fold-at-indent-level-2': -> @getModel().foldAllAtIndentLevel(1)
+  'editor:fold-at-indent-level-3': -> @getModel().foldAllAtIndentLevel(2)
+  'editor:fold-at-indent-level-4': -> @getModel().foldAllAtIndentLevel(3)
+  'editor:fold-at-indent-level-5': -> @getModel().foldAllAtIndentLevel(4)
+  'editor:fold-at-indent-level-6': -> @getModel().foldAllAtIndentLevel(5)
+  'editor:fold-at-indent-level-7': -> @getModel().foldAllAtIndentLevel(6)
+  'editor:fold-at-indent-level-8': -> @getModel().foldAllAtIndentLevel(7)
+  'editor:fold-at-indent-level-9': -> @getModel().foldAllAtIndentLevel(8)
+  'editor:toggle-line-comments': -> @getModel().toggleLineCommentsInSelection()
+  'editor:log-cursor-scope': -> @getModel().logCursorScope()
+  'editor:checkout-head-revision': -> atom.project.getRepositories()[0]?.checkoutHeadForEditor(@getModel())
+  'editor:copy-path': -> @getModel().copyPathToClipboard()
+  'editor:move-line-up': -> @getModel().moveLineUp()
+  'editor:move-line-down': -> @getModel().moveLineDown()
+  'editor:duplicate-lines': -> @getModel().duplicateLines()
+  'editor:join-lines': -> @getModel().joinLines()
+  'editor:toggle-indent-guide': -> atom.config.set('editor.showIndentGuide', not atom.config.get('editor.showIndentGuide'))
+  'editor:toggle-line-numbers': -> atom.config.set('editor.showLineNumbers', not atom.config.get('editor.showLineNumbers'))
+  'editor:scroll-to-cursor': -> @getModel().scrollToCursorPosition()
+)
+
+module.exports = TextEditorElement = document.registerElement 'atom-text-editor', prototype: TextEditorElement.prototype

src/text-editor-view.coffee

@@ -3,6 +3,7 @@ React = require 'react-atom-fork'
 {defaults} = require 'underscore-plus'
 TextBuffer = require 'text-buffer'
 TextEditor = require './text-editor'
+TextEditorElement = require './text-editor-element'
 TextEditorComponent = require './text-editor-component'
 {deprecate} = require 'grim'
 
@@ -37,51 +38,48 @@ TextEditorComponent = require './text-editor-component'
 # ```
 module.exports =
 class TextEditorView extends View
-  @content: (params) ->
-    attributes = params.attributes ? {}
-    attributes.class = 'editor react editor-colors'
-    attributes.tabIndex = -1
-    @div attributes
-
-  focusOnAttach: false
-
   # The constructor for setting up an `TextEditorView` instance.
   #
-  # * `editorOrParams` Either an {TextEditor}, or an object with one property, `mini`.
+  # * `modelOrParams` Either an {TextEditor}, or an object with one property, `mini`.
   #    If `mini` is `true`, a "miniature" `TextEditor` is constructed.
   #    Typically, this is ideal for scenarios where you need an Atom editor,
   #    but without all the chrome, like scrollbars, gutter, _e.t.c._.
   #
-  constructor: (editorOrParams, props) ->
+  constructor: (modelOrParams, props) ->
+    # Handle direct construction with an editor or params
+    unless modelOrParams instanceof HTMLElement
+      if modelOrParams instanceof TextEditor
+        model = modelOrParams
+      else
+        {editor, mini, placeholderText, attributes} = modelOrParams
+        model = editor ? new TextEditor
+          buffer: new TextBuffer
+          softWrapped: false
+          tabLength: 2
+          softTabs: true
+          mini: mini
+          placeholderText: placeholderText
+
+      element = new TextEditorElement
+      element.lineOverdrawMargin = props?.lineOverdrawMargin
+      element.setAttribute(name, value) for name, value of attributes if attributes?
+      element.setModel(model)
+      return element.__spacePenView
+
+    # Handle construction with an element
+    @element = modelOrParams
     super
 
-    if editorOrParams instanceof TextEditor
-      @editor = editorOrParams
-    else
-      {@editor, mini, placeholderText} = editorOrParams
-      props ?= {}
-      props.mini = mini
-      @editor ?= new TextEditor
-        buffer: new TextBuffer
-        softWrapped: false
-        tabLength: 2
-        softTabs: true
-        mini: mini
-        placeholderText: placeholderText
+  setModel: (@model) ->
+    @editor = @model
 
-    props = defaults({@editor, parentView: this}, props)
-    @componentDescriptor = TextEditorComponent(props)
-    @component = React.renderComponent(@componentDescriptor, @element)
-
-    node = @component.getDOMNode()
-
-    @scrollView = $(node).find('.scroll-view')
-    @underlayer = $(node).find('.highlights').addClass('underlayer')
-    @overlayer = $(node).find('.lines').addClass('overlayer')
-    @hiddenInput = $(node).find('.hidden-input')
+    @scrollView = @find('.scroll-view')
+    @underlayer = @find('.highlights').addClass('underlayer')
+    @overlayer = @find('.lines').addClass('overlayer')
+    @hiddenInput = @.find('.hidden-input')
 
     @subscribe atom.config.observe 'editor.showLineNumbers', =>
-      @gutter = $(node).find('.gutter')
+      @gutter = @find('.gutter')
 
       @gutter.removeClassFromAllLines = (klass) =>
         deprecate('Use decorations instead: http://blog.atom.io/2014/07/24/decorations.html')
@@ -97,99 +95,77 @@ class TextEditorView extends View
         lines.addClass(klass)
         lines.length > 0
 
-    @on 'focus', =>
-      if @component?
-        @component.onFocus()
-      else
-        @focusOnAttach = true
-
   # Public: Get the underlying editor model for this view.
   #
   # Returns an {TextEditor}
-  getModel: -> @editor
+  getModel: -> @model
 
-  getEditor: -> @editor
+  getEditor: -> @model
 
-  Object.defineProperty @::, 'lineHeight', get: -> @editor.getLineHeightInPixels()
-  Object.defineProperty @::, 'charWidth', get: -> @editor.getDefaultCharWidth()
+  Object.defineProperty @::, 'lineHeight', get: -> @model.getLineHeightInPixels()
+  Object.defineProperty @::, 'charWidth', get: -> @model.getDefaultCharWidth()
   Object.defineProperty @::, 'firstRenderedScreenRow', get: -> @component.getRenderedRowRange()[0]
   Object.defineProperty @::, 'lastRenderedScreenRow', get: -> @component.getRenderedRowRange()[1]
   Object.defineProperty @::, 'active', get: -> @is(@getPaneView()?.activeView)
   Object.defineProperty @::, 'isFocused', get: -> @component?.state.focused
   Object.defineProperty @::, 'mini', get: -> @component?.props.mini
+  Object.defineProperty @::, 'component', get: -> @element?.component
 
   afterAttach: (onDom) ->
     return unless onDom
     return if @attached
     @attached = true
-    @component = React.renderComponent(@componentDescriptor, @element) unless @component.isMounted()
-    @component.checkForVisibilityChange()
-
-    @focus() if @focusOnAttach
-
-    @addGrammarScopeAttribute()
-    @subscribe @editor.onDidChangeGrammar => @addGrammarScopeAttribute()
-
     @trigger 'editor:attached', [this]
 
-  addGrammarScopeAttribute: ->
-    grammarScope = @editor.getGrammar()?.scopeName?.replace(/\./g, ' ')
-    @attr('data-grammar', grammarScope)
+  beforeRemove: ->
+    @trigger 'editor:detached', [this]
+    @attached = false
+
+  remove: (selector, keepData) ->
+    @model.destroy() unless keepData
+    super
 
   scrollTop: (scrollTop) ->
     if scrollTop?
-      @editor.setScrollTop(scrollTop)
+      @model.setScrollTop(scrollTop)
     else
-      @editor.getScrollTop()
+      @model.getScrollTop()
 
   scrollLeft: (scrollLeft) ->
     if scrollLeft?
-      @editor.setScrollLeft(scrollLeft)
+      @model.setScrollLeft(scrollLeft)
     else
-      @editor.getScrollLeft()
+      @model.getScrollLeft()
 
   scrollToBottom: ->
     deprecate 'Use TextEditor::scrollToBottom instead. You can get the editor via editorView.getModel()'
-    @editor.setScrollBottom(Infinity)
+    @model.setScrollBottom(Infinity)
 
   scrollToScreenPosition: (screenPosition, options) ->
     deprecate 'Use TextEditor::scrollToScreenPosition instead. You can get the editor via editorView.getModel()'
-    @editor.scrollToScreenPosition(screenPosition, options)
+    @model.scrollToScreenPosition(screenPosition, options)
 
   scrollToBufferPosition: (bufferPosition, options) ->
     deprecate 'Use TextEditor::scrollToBufferPosition instead. You can get the editor via editorView.getModel()'
-    @editor.scrollToBufferPosition(bufferPosition, options)
+    @model.scrollToBufferPosition(bufferPosition, options)
 
   scrollToCursorPosition: ->
     deprecate 'Use TextEditor::scrollToCursorPosition instead. You can get the editor via editorView.getModel()'
-    @editor.scrollToCursorPosition()
+    @model.scrollToCursorPosition()
 
   pixelPositionForBufferPosition: (bufferPosition) ->
     deprecate 'Use TextEditor::pixelPositionForBufferPosition instead. You can get the editor via editorView.getModel()'
-    @editor.pixelPositionForBufferPosition(bufferPosition)
+    @model.pixelPositionForBufferPosition(bufferPosition)
 
   pixelPositionForScreenPosition: (screenPosition) ->
     deprecate 'Use TextEditor::pixelPositionForScreenPosition instead. You can get the editor via editorView.getModel()'
-    @editor.pixelPositionForScreenPosition(screenPosition)
+    @model.pixelPositionForScreenPosition(screenPosition)
 
   appendToLinesView: (view) ->
     view.css('position', 'absolute')
     view.css('z-index', 1)
     @find('.lines').prepend(view)
 
-  detach: ->
-    return unless @attached
-    super
-    @attached = false
-    @unmountComponent()
-
-  beforeRemove: ->
-    return unless @attached
-    @attached = false
-    @unmountComponent()
-    @editor.destroy()
-    @trigger 'editor:detached', this
-
   unmountComponent: ->
     React.unmountComponentAtNode(@element) if @component.isMounted()
 
@@ -233,7 +209,7 @@ class TextEditorView extends View
   #
   # Returns a {PaneView}
   getPaneView: ->
-    @parent('.item-views').parents('.pane').view()
+    @parent('.item-views').parents('atom-pane').view()
   getPane: ->
     deprecate 'Use TextEditorView::getPaneView() instead'
     @getPaneView()
@@ -248,19 +224,19 @@ class TextEditorView extends View
 
   pageDown: ->
     deprecate('Use editorView.getModel().pageDown()')
-    @editor.pageDown()
+    @model.pageDown()
 
   pageUp: ->
     deprecate('Use editorView.getModel().pageUp()')
-    @editor.pageUp()
+    @model.pageUp()
 
   getFirstVisibleScreenRow: ->
     deprecate 'Use TextEditor::getFirstVisibleScreenRow instead. You can get the editor via editorView.getModel()'
-    @editor.getFirstVisibleScreenRow()
+    @model.getFirstVisibleScreenRow()
 
   getLastVisibleScreenRow: ->
     deprecate 'Use TextEditor::getLastVisibleScreenRow instead. You can get the editor via editorView.getModel()'
-    @editor.getLastVisibleScreenRow()
+    @model.getLastVisibleScreenRow()
 
   getFontFamily: ->
     deprecate 'This is going away. Use atom.config.get("editor.fontFamily") instead'
@@ -283,7 +259,7 @@ class TextEditorView extends View
     @component.setLineHeight(lineHeight)
 
   setWidthInChars: (widthInChars) ->
-    @component.getDOMNode().style.width = (@editor.getDefaultCharWidth() * widthInChars) + 'px'
+    @component.getDOMNode().style.width = (@model.getDefaultCharWidth() * widthInChars) + 'px'
 
   setShowIndentGuide: (showIndentGuide) ->
     deprecate 'This is going away. Use atom.config.set("editor.showIndentGuide", true|false) instead'
@@ -291,20 +267,20 @@ class TextEditorView extends View
 
   setSoftWrap: (softWrapped) ->
     deprecate 'Use TextEditor::setSoftWrapped instead. You can get the editor via editorView.getModel()'
-    @editor.setSoftWrapped(softWrapped)
+    @model.setSoftWrapped(softWrapped)
 
   setShowInvisibles: (showInvisibles) ->
     deprecate 'This is going away. Use atom.config.set("editor.showInvisibles", true|false) instead'
     @component.setShowInvisibles(showInvisibles)
 
   getText: ->
-    @editor.getText()
+    @model.getText()
 
   setText: (text) ->
-    @editor.setText(text)
+    @model.setText(text)
 
   insertText: (text) ->
-    @editor.insertText(text)
+    @model.insertText(text)
 
   isInputEnabled: ->
     @component.isInputEnabled()
@@ -326,7 +302,7 @@ class TextEditorView extends View
 
   setPlaceholderText: (placeholderText) ->
     deprecate('Use TextEditor::setPlaceholderText instead. eg. editorView.getModel().setPlaceholderText(text)')
-    @getModel().setPlaceholderText(placeholderText)
+    @model.setPlaceholderText(placeholderText)
 
   lineElementForScreenRow: (screenRow) ->
     $(@component.lineNodeForScreenRow(screenRow))

src/text-editor.coffee

@@ -5,7 +5,7 @@ Delegator = require 'delegato'
 {deprecate} = require 'grim'
 {Model} = require 'theorist'
 EmitterMixin = require('emissary').Emitter
-{Emitter} = require 'event-kit'
+{CompositeDisposable, Emitter} = require 'event-kit'
 {Point, Range} = require 'text-buffer'
 LanguageMode = require './language-mode'
 DisplayBuffer = require './display-buffer'
@@ -84,14 +84,12 @@ class TextEditor extends Model
     @cursors = []
     @selections = []
 
-    if @shouldShowInvisibles()
-      invisibles = atom.config.get('editor.invisibles')
-
-    @displayBuffer?.setInvisibles(invisibles)
-    @displayBuffer ?= new DisplayBuffer({buffer, tabLength, softWrapped, invisibles})
+    @displayBuffer ?= new DisplayBuffer({buffer, tabLength, softWrapped})
     @buffer = @displayBuffer.buffer
     @softTabs = @usesSoftTabs() ? @softTabs ? atom.config.get('editor.softTabs') ? true
 
+    @updateInvisibles()
+
     for marker in @findMarkers(@getSelectionMarkerAttributes())
       marker.setProperties(preserveFolds: true)
       @addSelection(marker)
@@ -113,9 +111,6 @@ class TextEditor extends Model
       @emit 'scroll-left-changed', scrollLeft
       @emitter.emit 'did-change-scroll-left', scrollLeft
 
-    @subscribe atom.config.onDidChange 'editor.showInvisibles', => @updateInvisibles()
-    @subscribe atom.config.onDidChange 'editor.invisibles', => @updateInvisibles()
-
     atom.workspace?.editorAdded(this) if registerEditor
 
   serializeParams: ->
@@ -162,6 +157,17 @@ class TextEditor extends Model
     @subscribe @displayBuffer.onDidAddDecoration (decoration) => @emit 'decoration-added', decoration
     @subscribe @displayBuffer.onDidRemoveDecoration (decoration) => @emit 'decoration-removed', decoration
 
+    @subscribeToScopedConfigSettings()
+
+  subscribeToScopedConfigSettings: ->
+    @scopedConfigSubscriptions?.dispose()
+    @scopedConfigSubscriptions = subscriptions = new CompositeDisposable
+
+    scopeDescriptor = @getRootScopeDescriptor()
+
+    subscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.showInvisibles', => @updateInvisibles()
+    subscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.invisibles', => @updateInvisibles()
+
   getViewClass: ->
     require './text-editor-view'
 
@@ -254,10 +260,23 @@ class TextEditor extends Model
   onDidChangeSoftWrapped: (callback) ->
     @displayBuffer.onDidChangeSoftWrapped(callback)
 
-  # Extended: Calls your `callback` when the grammar that interprets and colorizes the text has
-  # been changed.
+  # Extended: Calls your `callback` when the grammar that interprets and
+  # colorizes the text has been changed. Immediately calls your callback with
+  # the current grammar.
   #
   # * `callback` {Function}
+  #   * `grammar` {Grammar}
+  #
+  # Returns a {Disposable} on which `.dispose()` can be called to unsubscribe.
+  observeGrammar: (callback) ->
+    callback(@getGrammar())
+    @onDidChangeGrammar(callback)
+
+  # Extended: Calls your `callback` when the grammar that interprets and
+  # colorizes the text has been changed.
+  #
+  # * `callback` {Function}
+  #   * `grammar` {Grammar}
   #
   # Returns a {Disposable} on which `.dispose()` can be called to unsubscribe.
   onDidChangeGrammar: (callback) ->
@@ -488,10 +507,9 @@ class TextEditor extends Model
 
   # Create an {TextEditor} with its initial state based on this object
   copy: ->
-    tabLength = @getTabLength()
     displayBuffer = @displayBuffer.copy()
     softTabs = @getSoftTabs()
-    newEditor = new TextEditor({@buffer, displayBuffer, tabLength, softTabs, suppressCursorCreation: true, registerEditor: true})
+    newEditor = new TextEditor({@buffer, displayBuffer, @tabLength, softTabs, suppressCursorCreation: true, registerEditor: true})
     for marker in @findMarkers(editorId: @id)
       marker.copy(editorId: newEditor.id, preserveFolds: true)
     newEditor
@@ -504,6 +522,8 @@ class TextEditor extends Model
       @mini = mini
       @updateInvisibles()
 
+  isMini: -> @mini
+
   # Set the number of characters that can be displayed horizontally in the
   # editor.
   #
@@ -2177,9 +2197,11 @@ class TextEditor extends Model
   # Returns a {Number}.
   getTabLength: -> @displayBuffer.getTabLength()
 
-  # Essential: Set the on-screen length of tab characters.
+  # Essential: Set the on-screen length of tab characters. Setting this to a
+  # {Number} This will override the `editor.tabLength` setting.
   #
-  # * `tabLength` {Number} length of a single tab
+  # * `tabLength` {Number} length of a single tab. Setting to `null` will
+  #   fallback to using the `editor.tabLength` config setting
   setTabLength: (tabLength) -> @displayBuffer.setTabLength(tabLength)
 
   # Extended: Determine if the buffer uses hard or soft tabs.
@@ -2348,17 +2370,14 @@ class TextEditor extends Model
   Section: Managing Syntax Scopes
   ###
 
-  # Public: Get the syntactic scopes for the most recently added cursor's
-  # position. See {::scopesForBufferPosition} for more information.
-  #
-  # Returns an {Array} of {String}s.
-  scopesAtCursor: -> @getLastCursor().getScopes()
-  getCursorScopes: ->
-    deprecate 'Use TextEditor::scopesAtCursor() instead'
-    @scopesAtCursor()
+  # Essential: Returns the scope descriptor that includes the language. eg.
+  # `['.source.ruby']`, or `['.source.coffee']`. You can use this with
+  # {Config::get} to get language specific config values.
+  getRootScopeDescriptor: ->
+    @displayBuffer.getRootScopeDescriptor()
 
-  # Essential: Get the syntactic scopes for the given position in buffer
-  # coordinates.
+  # Essential: Get the syntactic scopeDescriptor for the given position in buffer
+  # coordinates. Useful with {Config::get}.
   #
   # For example, if called with a position inside the parameter list of an
   # anonymous CoffeeScript function, the method returns the following array:
@@ -2367,7 +2386,10 @@ class TextEditor extends Model
   # * `bufferPosition` A {Point} or {Array} of [row, column].
   #
   # Returns an {Array} of {String}s.
-  scopesForBufferPosition: (bufferPosition) -> @displayBuffer.scopesForBufferPosition(bufferPosition)
+  scopeDescriptorForBufferPosition: (bufferPosition) -> @displayBuffer.scopeDescriptorForBufferPosition(bufferPosition)
+  scopesForBufferPosition: (bufferPosition) ->
+    deprecate 'Use ::scopeDescriptorForBufferPosition instead'
+    @scopeDescriptorForBufferPosition(bufferPosition)
 
   # Extended: Get the range in buffer coordinates of all tokens surrounding the
   # cursor that match the given scope selector.
@@ -2379,18 +2401,25 @@ class TextEditor extends Model
   bufferRangeForScopeAtCursor: (selector) ->
     @displayBuffer.bufferRangeForScopeAtPosition(selector, @getCursorBufferPosition())
 
+  # Extended: Determine if the given row is entirely a comment
+  isBufferRowCommented: (bufferRow) ->
+    if match = @lineTextForBufferRow(bufferRow).match(/\S/)
+      scopeDescriptor = @tokenForBufferPosition([bufferRow, match.index]).scopeDescriptor
+      @commentScopeSelector ?= new TextMateScopeSelector('comment.*')
+      @commentScopeSelector.matches(scopeDescriptor)
+
   logCursorScope: ->
-    console.log @scopesAtCursor()
+    console.log @getLastCursor().getScopeDescriptor()
 
   # {Delegates to: DisplayBuffer.tokenForBufferPosition}
   tokenForBufferPosition: (bufferPosition) -> @displayBuffer.tokenForBufferPosition(bufferPosition)
 
-  # Extended: Determine if the given row is entirely a comment
-  isBufferRowCommented: (bufferRow) ->
-    if match = @lineTextForBufferRow(bufferRow).match(/\S/)
-      scopes = @tokenForBufferPosition([bufferRow, match.index]).scopes
-      @commentScopeSelector ?= new TextMateScopeSelector('comment.*')
-      @commentScopeSelector.matches(scopes)
+  scopesAtCursor: ->
+    deprecate 'Use editor.getLastCursor().scopesAtCursor() instead'
+    @getLastCursor().getScopeDescriptor()
+  getCursorScopes: ->
+    deprecate 'Use editor.getLastCursor().scopesAtCursor() instead'
+    @scopesAtCursor()
 
   ###
   Section: Clipboard Operations
@@ -2430,7 +2459,7 @@ class TextEditor extends Model
 
       return
 
-    else if atom.config.get("editor.normalizeIndentOnPaste") and metadata?.indentBasis?
+    else if atom.config.get(@getLastCursor().getScopeDescriptor(), "editor.normalizeIndentOnPaste") and metadata?.indentBasis?
       if !@getLastCursor().hasPrecedingCharactersOnLine() or containsNewlines
         options.indentBasis ?= metadata.indentBasis
 
@@ -2648,14 +2677,14 @@ class TextEditor extends Model
   ###
 
   shouldAutoIndent: ->
-    atom.config.get("editor.autoIndent")
+    atom.config.get(@getRootScopeDescriptor(), "editor.autoIndent")
 
   shouldShowInvisibles: ->
-    not @mini and atom.config.get('editor.showInvisibles')
+    not @mini and atom.config.get(@getRootScopeDescriptor(), 'editor.showInvisibles')
 
   updateInvisibles: ->
     if @shouldShowInvisibles()
-      @displayBuffer.setInvisibles(atom.config.get('editor.invisibles'))
+      @displayBuffer.setInvisibles(atom.config.get(@getRootScopeDescriptor(), 'editor.invisibles'))
     else
       @displayBuffer.setInvisibles(null)
 
@@ -2667,6 +2696,8 @@ class TextEditor extends Model
     @softTabs = @usesSoftTabs() ? @softTabs
 
   handleGrammarChange: ->
+    @updateInvisibles()
+    @subscribeToScopedConfigSettings()
     @unfoldAll()
     @emit 'grammar-changed'
     @emitter.emit 'did-change-grammar'

src/theme-manager.coffee

@@ -361,7 +361,7 @@ class ThemeManager
 
   updateGlobalEditorStyle: (property, value) ->
     unless styleNode = @stylesheetElementForId('global-editor-styles')
-      @applyStylesheet('global-editor-styles', '.editor {}')
+      @applyStylesheet('global-editor-styles', 'atom-text-editor {}')
       styleNode = @stylesheetElementForId('global-editor-styles')
 
     {sheet} = styleNode

src/token.coffee

@@ -1,4 +1,5 @@
 _ = require 'underscore-plus'
+{deprecate} = require 'grim'
 textUtils = require './text-utils'
 
 WhitespaceRegexesByTabLength = {}
@@ -13,27 +14,35 @@ module.exports =
 class Token
   value: null
   hasPairedCharacter: false
-  scopes: null
+  scopeDescriptor: null
   isAtomic: null
   isHardTab: null
   firstNonWhitespaceIndex: null
   firstTrailingWhitespaceIndex: null
   hasInvisibleCharacters: false
 
-  constructor: ({@value, @scopes, @isAtomic, @bufferDelta, @isHardTab}) ->
+  Object.defineProperty @::, 'scopes', get: ->
+    deprecate 'Use ::scopeDescriptor instead'
+    @scopeDescriptor
+
+  constructor: ({@value, @scopeDescriptor, @isAtomic, @bufferDelta, @isHardTab}) ->
     @screenDelta = @value.length
     @bufferDelta ?= @screenDelta
     @hasPairedCharacter = textUtils.hasPairedCharacter(@value)
 
   isEqual: (other) ->
-    @value == other.value and _.isEqual(@scopes, other.scopes) and !!@isAtomic == !!other.isAtomic
+    # TODO: scopes is deprecated. This is here for the sake of lang package tests
+    scopeDescriptor = other.scopeDescriptor ? other.scopes
+    deprecate 'Test the Token for `scopeDescriptor` rather than `scopes`' if other.scopes?
+
+    @value == other.value and _.isEqual(@scopeDescriptor, scopeDescriptor) and !!@isAtomic == !!other.isAtomic
 
   isBracket: ->
-    /^meta\.brace\b/.test(_.last(@scopes))
+    /^meta\.brace\b/.test(_.last(@scopeDescriptor))
 
   splitAt: (splitIndex) ->
-    leftToken = new Token(value: @value.substring(0, splitIndex), scopes: @scopes)
-    rightToken = new Token(value: @value.substring(splitIndex), scopes: @scopes)
+    leftToken = new Token(value: @value.substring(0, splitIndex), scopeDescriptor: @scopeDescriptor)
+    rightToken = new Token(value: @value.substring(splitIndex), scopeDescriptor: @scopeDescriptor)
 
     if @firstNonWhitespaceIndex?
       leftToken.firstNonWhitespaceIndex = Math.min(splitIndex, @firstNonWhitespaceIndex)
@@ -92,7 +101,7 @@ class Token
         else
           breakOutLeadingSoftTabs = false
           value = match[0]
-          token = new Token({value, @scopes})
+          token = new Token({value, @scopeDescriptor})
         column += token.value.length
         outputTokens.push(token)
 
@@ -106,7 +115,7 @@ class Token
     while index < @value.length
       if textUtils.isPairedCharacter(@value, index)
         if nonPairStart isnt index
-          outputTokens.push(new Token({value: @value[nonPairStart...index], @scopes}))
+          outputTokens.push(new Token({value: @value[nonPairStart...index], @scopeDescriptor}))
         outputTokens.push(@buildPairedCharacterToken(@value, index))
         index += 2
         nonPairStart = index
@@ -114,14 +123,14 @@ class Token
         index++
 
     if nonPairStart isnt index
-      outputTokens.push(new Token({value: @value[nonPairStart...index], @scopes}))
+      outputTokens.push(new Token({value: @value[nonPairStart...index], @scopeDescriptor}))
 
     outputTokens
 
   buildPairedCharacterToken: (value, index) ->
     new Token(
       value: value[index..index + 1]
-      scopes: @scopes
+      scopeDescriptor: @scopeDescriptor
       isAtomic: true
     )
 
@@ -135,7 +144,7 @@ class Token
     tabStop = tabLength - (column % tabLength)
     new Token(
       value: _.multiplyString(" ", tabStop)
-      scopes: @scopes
+      scopeDescriptor: @scopeDescriptor
       bufferDelta: if isHardTab then 1 else tabStop
       isAtomic: true
       isHardTab: isHardTab
@@ -146,7 +155,7 @@ class Token
 
   matchesScopeSelector: (selector) ->
     targetClasses = selector.replace(StartDotRegex, '').split('.')
-    _.any @scopes, (scope) ->
+    _.any @scopeDescriptor, (scope) ->
       scopeClasses = scope.split('.')
       _.isSubset(targetClasses, scopeClasses)
 

src/tokenized-buffer.coffee

@@ -25,18 +25,12 @@ class TokenizedBuffer extends Model
   constructor: ({@buffer, @tabLength, @invisibles}) ->
     @emitter = new Emitter
 
-    @tabLength ?= atom.config.get('editor.tabLength')
-
     @subscribe atom.syntax.onDidAddGrammar(@grammarAddedOrUpdated)
     @subscribe atom.syntax.onDidUpdateGrammar(@grammarAddedOrUpdated)
 
     @subscribe @buffer.onDidChange (e) => @handleBufferChange(e)
     @subscribe @buffer.onDidChangePath (@bufferPath) => @reloadGrammar()
 
-    @subscribe @$tabLength.changes, (tabLength) => @retokenizeLines()
-
-    @subscribe atom.config.onDidChange 'editor.tabLength', ({newValue}) => @setTabLength(newValue)
-
     @reloadGrammar()
 
   serializeParams: ->
@@ -48,6 +42,10 @@ class TokenizedBuffer extends Model
     params.buffer = atom.project.bufferForPathSync(params.bufferPath)
     params
 
+  observeGrammar: (callback) ->
+    callback(@grammar)
+    @onDidChangeGrammar(callback)
+
   onDidChangeGrammar: (callback) ->
     @emitter.on 'did-change-grammar', callback
 
@@ -81,9 +79,20 @@ class TokenizedBuffer extends Model
     return if grammar is @grammar
     @unsubscribe(@grammar) if @grammar
     @grammar = grammar
+    @rootScopeDescriptor = [@grammar.scopeName]
     @currentGrammarScore = score ? grammar.getScore(@buffer.getPath(), @buffer.getText())
     @subscribe @grammar.onDidUpdate => @retokenizeLines()
+
+    @configSettings = tabLength: atom.config.get(@rootScopeDescriptor, 'editor.tabLength')
+
+    @grammarTabLengthSubscription?.dispose()
+    @grammarTabLengthSubscription = atom.config.onDidChange @rootScopeDescriptor, 'editor.tabLength', ({newValue}) =>
+      @configSettings.tabLength = newValue
+      @retokenizeLines()
+    @subscribe @grammarTabLengthSubscription
+
     @retokenizeLines()
+
     @emit 'grammar-changed', grammar
     @emitter.emit 'did-change-grammar', grammar
 
@@ -96,7 +105,7 @@ class TokenizedBuffer extends Model
   hasTokenForSelector: (selector) ->
     for {tokens} in @tokenizedLines
       for token in tokens
-        return true if selector.matches(token.scopes)
+        return true if selector.matches(token.scopeDescriptor)
     false
 
   retokenizeLines: ->
@@ -112,16 +121,11 @@ class TokenizedBuffer extends Model
   setVisible: (@visible) ->
     @tokenizeInBackground() if @visible
 
-  # Retrieves the current tab length.
-  #
-  # Returns a {Number}.
   getTabLength: ->
-    @tabLength
+    @tabLength ? @configSettings.tabLength
 
-  # Specifies the tab length.
-  #
-  # tabLength - A {Number} that defines the new tab length.
   setTabLength: (@tabLength) ->
+    @retokenizeLines()
 
   setInvisibles: (invisibles) ->
     unless _.isEqual(invisibles, @invisibles)
@@ -243,7 +247,7 @@ class TokenizedBuffer extends Model
 
   buildPlaceholderTokenizedLineForRow: (row) ->
     line = @buffer.lineForRow(row)
-    tokens = [new Token(value: line, scopes: [@grammar.scopeName])]
+    tokens = [new Token(value: line, scopeDescriptor: [@grammar.scopeName])]
     tabLength = @getTabLength()
     indentLevel = @indentLevelForRow(row)
     lineEnding = @buffer.lineEndingForRow(row)
@@ -298,8 +302,8 @@ class TokenizedBuffer extends Model
     else
       0
 
-  scopesForPosition: (position) ->
-    @tokenForPosition(position).scopes
+  scopeDescriptorForPosition: (position) ->
+    @tokenForPosition(position).scopeDescriptor
 
   tokenForPosition: (position) ->
     {row, column} = Point.fromObject(position)

src/tokenized-line.coffee

@@ -194,9 +194,9 @@ class TokenizedLine
 
   isComment: ->
     for token in @tokens
-      continue if token.scopes.length is 1
+      continue if token.scopeDescriptor.length is 1
       continue if token.isOnlyWhitespace()
-      for scope in token.scopes
+      for scope in token.scopeDescriptor
         return true if _.contains(scope.split('.'), 'comment')
       break
     false
@@ -226,26 +226,26 @@ class TokenizedLine
 
     scopeStack = []
     for token in @tokens
-      @updateScopeStack(scopeStack, token.scopes)
+      @updateScopeStack(scopeStack, token.scopeDescriptor)
       _.last(scopeStack).children.push(token)
 
     @scopeTree = scopeStack[0]
     @updateScopeStack(scopeStack, [])
     @scopeTree
 
-  updateScopeStack: (scopeStack, desiredScopes) ->
+  updateScopeStack: (scopeStack, desiredScopeDescriptor) ->
     # Find a common prefix
-    for scope, i in desiredScopes
-      break unless scopeStack[i]?.scope is desiredScopes[i]
+    for scope, i in desiredScopeDescriptor
+      break unless scopeStack[i]?.scope is desiredScopeDescriptor[i]
 
-    # Pop scopes until we're at the common prefx
+    # Pop scopeDescriptor until we're at the common prefx
     until scopeStack.length is i
       poppedScope = scopeStack.pop()
       _.last(scopeStack)?.children.push(poppedScope)
 
-    # Push onto common prefix until scopeStack equals desiredScopes
-    for j in [i...desiredScopes.length]
-      scopeStack.push(new Scope(desiredScopes[j]))
+    # Push onto common prefix until scopeStack equals desiredScopeDescriptor
+    for j in [i...desiredScopeDescriptor.length]
+      scopeStack.push(new Scope(desiredScopeDescriptor[j]))
 
 class Scope
   constructor: (@scope) ->

src/view-registry.coffee

@@ -26,7 +26,7 @@ class ViewRegistry
     if object instanceof HTMLElement
       object
     else if object instanceof jQuery
-      object[0].__spacePenView ?= object
+      object[0]?.__spacePenView ?= object
       object[0]
     else if provider = @findProvider(object)
       element = provider.createView?(object)

src/window-bootstrap.coffee

@@ -13,5 +13,5 @@ console.log "Window load time: #{atom.getWindowLoadTime()}ms"
 # Workaround for focus getting cleared upon window creation
 windowFocused = ->
   window.removeEventListener('focus', windowFocused)
-  setTimeout (-> document.querySelector('.workspace').focus()), 0
+  setTimeout (-> document.querySelector('atom-workspace').focus()), 0
 window.addEventListener('focus', windowFocused)

src/workspace-element.coffee

@@ -10,7 +10,6 @@ module.exports =
 class WorkspaceElement extends HTMLElement
   createdCallback: ->
     @subscriptions = new CompositeDisposable
-    atom.commands.setRootNode(this)
     @initializeContent()
     @observeScrollbarStyle()
     @observeTextEditorFontConfig()
@@ -27,11 +26,10 @@ class WorkspaceElement extends HTMLElement
     @classList.add 'workspace'
     @setAttribute 'tabindex', -1
 
-
-    @verticalAxis = document.createElement('div')
+    @verticalAxis = document.createElement('atom-workspace-axis')
     @verticalAxis.classList.add('vertical')
 
-    @horizontalAxis = document.createElement('div')
+    @horizontalAxis = document.createElement('atom-workspace-axis')
     @horizontalAxis.classList.add('horizontal')
     @horizontalAxis.appendChild(@verticalAxis)
 
@@ -56,60 +54,6 @@ class WorkspaceElement extends HTMLElement
     WorkspaceView ?= require './workspace-view'
     @__spacePenView = new WorkspaceView(this)
 
-    addCommands = (handlersByName) =>
-      for name, handler of handlersByName
-        do (handler) =>
-          @__spacePenView.command name, => handler.apply(this, arguments)
-
-    addCommands(
-      'window:increase-font-size': -> @getModel().increaseFontSize()
-      'window:decrease-font-size': -> @getModel().decreaseFontSize()
-      'window:reset-font-size': -> @getModel().resetFontSize()
-      'application:about': -> ipc.send('command', 'application:about')
-      'application:run-all-specs': -> ipc.send('command', 'application:run-all-specs')
-      'application:run-benchmarks': -> ipc.send('command', 'application:run-benchmarks')
-      'application:show-settings': -> ipc.send('command', 'application:show-settings')
-      'application:quit': -> ipc.send('command', 'application:quit')
-      'application:hide': -> ipc.send('command', 'application:hide')
-      'application:hide-other-applications': -> ipc.send('command', 'application:hide-other-applications')
-      'application:install-update': -> ipc.send('command', 'application:install-update')
-      'application:unhide-all-applications': -> ipc.send('command', 'application:unhide-all-applications')
-      'application:new-window': -> ipc.send('command', 'application:new-window')
-      'application:new-file': -> ipc.send('command', 'application:new-file')
-      'application:open': -> ipc.send('command', 'application:open')
-      'application:open-file': -> ipc.send('command', 'application:open-file')
-      'application:open-folder': -> ipc.send('command', 'application:open-folder')
-      'application:open-dev': -> ipc.send('command', 'application:open-dev')
-      'application:open-safe': -> ipc.send('command', 'application:open-safe')
-      'application:minimize': -> ipc.send('command', 'application:minimize')
-      'application:zoom': -> ipc.send('command', 'application:zoom')
-      'application:bring-all-windows-to-front': -> ipc.send('command', 'application:bring-all-windows-to-front')
-      'application:open-your-config': -> ipc.send('command', 'application:open-your-config')
-      'application:open-your-init-script': -> ipc.send('command', 'application:open-your-init-script')
-      'application:open-your-keymap': -> ipc.send('command', 'application:open-your-keymap')
-      'application:open-your-snippets': -> ipc.send('command', 'application:open-your-snippets')
-      'application:open-your-stylesheet': -> ipc.send('command', 'application:open-your-stylesheet')
-      'application:open-license': -> @getModel().openLicense()
-      'window:run-package-specs': -> ipc.send('run-package-specs', path.join(atom.project.getPath(), 'spec'))
-      'window:focus-next-pane': -> @getModel().activateNextPane()
-      'window:focus-previous-pane': -> @getModel().activatePreviousPane()
-      'window:focus-pane-above': -> @focusPaneViewAbove()
-      'window:focus-pane-below': -> @focusPaneViewBelow()
-      'window:focus-pane-on-left': -> @focusPaneViewOnLeft()
-      'window:focus-pane-on-right': -> @focusPaneViewOnRight()
-      'window:save-all': -> @getModel().saveAll()
-      'window:toggle-invisibles': -> atom.config.toggle("editor.showInvisibles")
-      'window:log-deprecation-warnings': -> Grim.logDeprecationWarnings()
-      'window:toggle-auto-indent': -> atom.config.toggle("editor.autoIndent")
-      'pane:reopen-closed-item': -> @getModel().reopenItem()
-      'core:close': -> @getModel().destroyActivePaneItemOrEmptyPane()
-      'core:save': -> @getModel().saveActivePaneItem()
-      'core:save-as': -> @getModel().saveActivePaneItemAs()
-    )
-
-    if process.platform is 'darwin'
-      addCommands 'window:install-shell-commands': -> @getModel().installShellCommands()
-
   getModel: -> @model
 
   setModel: (@model) ->
@@ -138,6 +82,60 @@ class WorkspaceElement extends HTMLElement
   handleWindowFocus: (event) ->
     @handleFocus(event) if document.activeElement is document.body
 
-module.exports = WorkspaceElement = document.registerElement 'atom-workspace',
-  prototype: WorkspaceElement.prototype
-  extends: 'div'
+  focusPaneViewAbove: -> @paneContainer.focusPaneViewAbove()
+
+  focusPaneViewBelow: -> @paneContainer.focusPaneViewBelow()
+
+  focusPaneViewOnLeft: -> @paneContainer.focusPaneViewOnLeft()
+
+  focusPaneViewOnRight: -> @paneContainer.focusPaneViewOnRight()
+
+atom.commands.add 'atom-workspace',
+  'window:increase-font-size': -> @getModel().increaseFontSize()
+  'window:decrease-font-size': -> @getModel().decreaseFontSize()
+  'window:reset-font-size': -> @getModel().resetFontSize()
+  'application:about': -> ipc.send('command', 'application:about')
+  'application:run-all-specs': -> ipc.send('command', 'application:run-all-specs')
+  'application:run-benchmarks': -> ipc.send('command', 'application:run-benchmarks')
+  'application:show-settings': -> ipc.send('command', 'application:show-settings')
+  'application:quit': -> ipc.send('command', 'application:quit')
+  'application:hide': -> ipc.send('command', 'application:hide')
+  'application:hide-other-applications': -> ipc.send('command', 'application:hide-other-applications')
+  'application:install-update': -> ipc.send('command', 'application:install-update')
+  'application:unhide-all-applications': -> ipc.send('command', 'application:unhide-all-applications')
+  'application:new-window': -> ipc.send('command', 'application:new-window')
+  'application:new-file': -> ipc.send('command', 'application:new-file')
+  'application:open': -> ipc.send('command', 'application:open')
+  'application:open-file': -> ipc.send('command', 'application:open-file')
+  'application:open-folder': -> ipc.send('command', 'application:open-folder')
+  'application:open-dev': -> ipc.send('command', 'application:open-dev')
+  'application:open-safe': -> ipc.send('command', 'application:open-safe')
+  'application:minimize': -> ipc.send('command', 'application:minimize')
+  'application:zoom': -> ipc.send('command', 'application:zoom')
+  'application:bring-all-windows-to-front': -> ipc.send('command', 'application:bring-all-windows-to-front')
+  'application:open-your-config': -> ipc.send('command', 'application:open-your-config')
+  'application:open-your-init-script': -> ipc.send('command', 'application:open-your-init-script')
+  'application:open-your-keymap': -> ipc.send('command', 'application:open-your-keymap')
+  'application:open-your-snippets': -> ipc.send('command', 'application:open-your-snippets')
+  'application:open-your-stylesheet': -> ipc.send('command', 'application:open-your-stylesheet')
+  'application:open-license': -> @getModel().openLicense()
+  'window:run-package-specs': -> ipc.send('run-package-specs', path.join(atom.project.getPath(), 'spec'))
+  'window:focus-next-pane': -> @getModel().activateNextPane()
+  'window:focus-previous-pane': -> @getModel().activatePreviousPane()
+  'window:focus-pane-above': -> @focusPaneViewAbove()
+  'window:focus-pane-below': -> @focusPaneViewBelow()
+  'window:focus-pane-on-left': -> @focusPaneViewOnLeft()
+  'window:focus-pane-on-right': -> @focusPaneViewOnRight()
+  'window:save-all': -> @getModel().saveAll()
+  'window:toggle-invisibles': -> atom.config.toggle("editor.showInvisibles")
+  'window:log-deprecation-warnings': -> Grim.logDeprecationWarnings()
+  'window:toggle-auto-indent': -> atom.config.toggle("editor.autoIndent")
+  'pane:reopen-closed-item': -> @getModel().reopenItem()
+  'core:close': -> @getModel().destroyActivePaneItemOrEmptyPane()
+  'core:save': -> @getModel().saveActivePaneItem()
+  'core:save-as': -> @getModel().saveActivePaneItemAs()
+
+if process.platform is 'darwin'
+  atom.commands.add 'atom-workspace', 'window:install-shell-commands', -> @getModel().installShellCommands()
+
+module.exports = WorkspaceElement = document.registerElement 'atom-workspace', prototype: WorkspaceElement.prototype

src/workspace-view.coffee

@@ -64,9 +64,9 @@ class WorkspaceView extends View
     @deprecateViewEvents()
 
   setModel: (@model) ->
-    @horizontal = @find('.horizontal')
-    @vertical = @find('.vertical')
-    @panes = @find('.panes').view()
+    @horizontal = @find('atom-workspace-axis.horizontal')
+    @vertical = @find('atom-workspace-axis.vertical')
+    @panes = @find('atom-pane-container').view()
     @subscribe @model.onDidOpen => @trigger 'uri-opened'
 
   beforeRemove: ->
@@ -234,7 +234,7 @@ class WorkspaceView extends View
   #
   # Returns an {Array} of {TextEditorView}s.
   getEditorViews: ->
-    for editorElement in @panes.element.querySelectorAll('.pane > .item-views > .editor')
+    for editorElement in @panes.element.querySelectorAll('atom-pane > .item-views > atom-text-editor')
       $(editorElement).view()
 
 

src/workspace.coffee

@@ -136,15 +136,16 @@ class Workspace extends Model
   # Updates the application's title and proxy icon based on whichever file is
   # open.
   updateWindowTitle: =>
+    appName = 'Atom'
     if projectPath = atom.project?.getPaths()[0]
       if item = @getActivePaneItem()
-        document.title = "#{item.getTitle?() ? 'untitled'} - #{projectPath}"
+        document.title = "#{item.getTitle?() ? 'untitled'} - #{projectPath} - #{appName}"
         atom.setRepresentedFilename(item.getPath?() ? projectPath)
       else
-        document.title = projectPath
+        document.title = "#{projectPath} - #{appName}"
         atom.setRepresentedFilename(projectPath)
     else
-      document.title = 'untitled'
+      document.title = "untitled - #{appName}"
       atom.setRepresentedFilename('')
 
   # On OS X, fades the application window's proxy icon when the current file

static/editor.less

@@ -2,7 +2,7 @@
 @import "octicon-utf-codes";
 @import "octicon-mixins";
 
-.editor.react {
+atom-text-editor.react {
   .editor-contents {
     width: 100%;
   }
@@ -85,7 +85,7 @@
   }
 }
 
-.editor.mini {
+atom-text-editor.mini {
   font-size: @input-font-size;
   line-height: @component-line-height;
   max-height: @component-line-height + 2; // +2 for borders
@@ -96,13 +96,13 @@
   }
 }
 
-.editor {
+atom-text-editor {
   z-index: 0;
   font-family: Inconsolata, Monaco, Consolas, 'Courier New', Courier;
   line-height: 1.3;
 }
 
-.editor, .editor-contents {
+atom-text-editor, .editor-contents {
   overflow: hidden;
   cursor: text;
   display: -webkit-flex;
@@ -110,11 +110,11 @@
   position: relative;
 }
 
-.editor .gutter .line-number.cursor-line {
+atom-text-editor .gutter .line-number.cursor-line {
   opacity: 1;
 }
 
-.editor .gutter {
+atom-text-editor .gutter {
   overflow: hidden;
   text-align: right;
   cursor: default;
@@ -122,20 +122,20 @@
   box-sizing: border-box;
 }
 
-.editor .gutter .line-number {
+atom-text-editor .gutter .line-number {
   padding-left: .5em;
   opacity: 0.6;
 }
 
-.editor .gutter .line-numbers {
+atom-text-editor .gutter .line-numbers {
   position: relative;
 }
 
-.editor .gutter .line-number.folded.cursor-line {
+atom-text-editor .gutter .line-number.folded.cursor-line {
   opacity: 1;
 }
 
-.editor .gutter .line-number .icon-right {
+atom-text-editor .gutter .line-number .icon-right {
   .octicon(chevron-down, 0.8em);
   display: inline-block;
   visibility: hidden;
@@ -144,7 +144,7 @@
   opacity: .6;
 }
 
-.editor .gutter:hover .line-number.foldable .icon-right {
+atom-text-editor .gutter:hover .line-number.foldable .icon-right {
   visibility: visible;
 
   &:before {
@@ -156,7 +156,7 @@
   }
 }
 
-.editor .gutter, .editor .gutter:hover {
+atom-text-editor .gutter, atom-text-editor .gutter:hover {
   .line-number.folded .icon-right {
     .octicon(chevron-right, 0.8em);
     visibility: visible;
@@ -169,40 +169,40 @@
   }
 }
 
-.editor .fold-marker {
+atom-text-editor .fold-marker {
   cursor: default;
 }
 
-.editor .fold-marker:after {
+atom-text-editor .fold-marker:after {
   .icon(0.8em, inline);
   content: @ellipsis;
   padding-left: 0.2em;
 }
 
-.editor .line.cursor-line .fold-marker:after {
+atom-text-editor .line.cursor-line .fold-marker:after {
   opacity: 1;
 }
 
-.editor.is-blurred .line.cursor-line {
+atom-text-editor.is-blurred .line.cursor-line {
   background: rgba(0, 0, 0, 0);
 }
 
-.editor .invisible-character {
+atom-text-editor .invisible-character {
   font-weight: normal !important;
   font-style: normal !important;
 }
 
-.editor .indent-guide {
+atom-text-editor .indent-guide {
   display: inline-block;
   box-shadow: inset 1px 0;
 }
 
-.editor .vertical-scrollbar,
-.editor .horizontal-scrollbar {
+atom-text-editor .vertical-scrollbar,
+atom-text-editor .horizontal-scrollbar {
   cursor: default;
 }
 
-.editor .vertical-scrollbar {
+atom-text-editor .vertical-scrollbar {
   position: absolute;
   top: 0;
   right: 0;
@@ -213,7 +213,7 @@
   z-index: 3;
 }
 
-.editor .scroll-view {
+atom-text-editor .scroll-view {
   overflow-x: auto;
   overflow-y: hidden;
   -webkit-flex: 1;
@@ -221,45 +221,45 @@
   position: relative;
 }
 
-.editor.soft-wrap .scroll-view {
+atom-text-editor.soft-wrap .scroll-view {
   overflow-x: hidden;
 }
 
-.editor .underlayer {
+atom-text-editor .underlayer {
   z-index: 0;
   position: absolute;
   min-height: 100%;
 }
 
-.editor .lines {
+atom-text-editor .lines {
   position: relative;
   z-index: 1;
 }
 
-.editor .overlayer {
+atom-text-editor .overlayer {
   z-index: 2;
   position: absolute;
 }
 
-.editor .line {
+atom-text-editor .line {
   white-space: pre;
 }
 
-.editor .line span {
+atom-text-editor .line span {
   vertical-align: top;
 }
 
-.editor .cursor {
+atom-text-editor .cursor {
   position: absolute;
   border-left: 1px solid;
 }
 
-.editor .cursor,
-.editor.is-focused .cursor.blink-off {
+atom-text-editor .cursor,
+atom-text-editor.is-focused .cursor.blink-off {
   visibility: hidden;
 }
 
-.editor.is-focused .cursor {
+atom-text-editor.is-focused .cursor {
   visibility: visible;
 }
 
@@ -267,7 +267,7 @@
   display: none;
 }
 
-.editor .hidden-input {
+atom-text-editor .hidden-input {
   padding: 0;
   border: 0;
   position: absolute;
@@ -278,19 +278,19 @@
   width: 1px;
 }
 
-.editor .highlight {
+atom-text-editor .highlight {
   background: none;
   padding: 0;
 }
 
-.editor .highlight .region,
-.editor .selection .region {
+atom-text-editor .highlight .region,
+atom-text-editor .selection .region {
   position: absolute;
   pointer-events: none;
   z-index: -1;
 }
 
-.editor.mini:not(.react) {
+atom-text-editor.mini:not(.react) {
   height: auto;
   line-height: 25px;
 

static/overlay.less

@@ -23,7 +23,7 @@
   }
 }
 
-.overlay .editor.mini {
+.overlay atom-text-editor.mini {
   margin-bottom: 10px;
 }
 

static/panes.less

@@ -3,23 +3,23 @@
 // Pane-items are things that go inside a pane. Like the UI-Demo, the
 // settings-view, the archive-view, the image-view. Etc. Basically a non-
 // editor resource with a tab.
-.panes {
+atom-pane-container {
   display: -webkit-flex;
   -webkit-flex: 1;
 
-  .pane-column {
+  atom-pane-axis.vertical {
     display: -webkit-flex;
     -webkit-flex: 1;
     -webkit-flex-direction: column;
   }
 
-  .pane-row {
+  atom-pane-axis.horizontal {
     display: -webkit-flex;
     -webkit-flex: 1;
     -webkit-flex-direction: row;
   }
 
-  .pane {
+  atom-pane {
     position: relative;
     display: -webkit-flex;
     -webkit-flex: 1;
@@ -38,7 +38,7 @@
         background-color: @pane-item-background-color;
       }
 
-      > *, > .editor.react > * {
+      > *, > atom-text-editor.react > * {
         position: absolute;
         top: 0;
         right: 0;

static/syntax.less

@@ -1,6 +1,6 @@
 @import "syntax-variables";
 
-.editor {
+atom-text-editor {
   .lines {
     .markup {
       &.git-commit {
@@ -28,7 +28,7 @@
   to { background-color: null; }
 }
 
-.editor .flash.selection .region {
+atom-text-editor .flash.selection .region {
   -webkit-animation-name: flash;
   -webkit-animation-duration: .5s;
   -webkit-animation-iteration-count: 1;

static/workspace-view.less

@@ -21,19 +21,20 @@ h6 {
   font-family: @font-family;
 }
 
-.workspace {
+atom-workspace {
+  display: block;
   height: 100%;
   overflow: hidden;
   position: relative;
   background-color: @app-background-color;
   font-family: @font-family;
 
-  .horizontal {
+  atom-workspace-axis.horizontal {
     display: -webkit-flex;
     height: 100%;
   }
 
-  .vertical {
+  atom-workspace-axis.vertical {
     display: -webkit-flex;
     -webkit-flex: 1;
     -webkit-flex-flow: column;