Guard against missing file path in getScore()

CHANGELOG.md

@@ -1,3 +1,7 @@
+* Fixed: Error selecting a grammar for an untitled editor
+
+* Added: j/k now can be used to navigate the tree view and archive editor
+
 * Fixed: Atom can now be launched when ~/.atom/config.cson doesn't exist
 * Added: Initial collaboration sessions
 * Fixed: Empty lines being deleted via uppercase/downcase command

resources/mac/atom-Info.plist

@@ -36,6 +36,17 @@
 	<string>speakeasy.pem</string>
 	<key>SUScheduledCheckInterval</key>
 	<string>3600</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>atom</string>
+			</array>
+			<key>CFBundleURLName</key>
+			<string>Atom Shared Session Protocol</string>
+		</dict>
+	</array>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>

spec/app/syntax-spec.coffee

@@ -75,6 +75,12 @@ describe "the `syntax` global", ->
 
         expect(syntax.selectGrammar('more.test', '')).toBe grammar1
 
+    describe "when there is no file path", ->
+      it "does not throw an exception (regression)", ->
+        expect(-> syntax.selectGrammar(null, '#!/usr/bin/ruby')).not.toThrow()
+        expect(-> syntax.selectGrammar(null, '')).not.toThrow()
+        expect(-> syntax.selectGrammar(null, null)).not.toThrow()
+
   describe ".removeGrammar(grammar)", ->
     it "removes the grammar, so it won't be returned by selectGrammar", ->
       grammar = syntax.selectGrammar('foo.js')

src/app/text-mate-grammar.coffee

@@ -74,11 +74,10 @@ class TextMateGrammar
   getScore: (filePath, contents) ->
     contents = fsUtils.read(filePath) if not contents? and fsUtils.isFileSync(filePath)
 
-
     if syntax.grammarOverrideForPath(filePath) is @scopeName
-      2 + filePath.length
+      2 + (filePath?.length ? 0)
     else if @matchesContents(contents)
-      1 + filePath.length
+      1 + (filePath?.length ? 0)
     else
       @getPathScore(filePath)
 

src/main.coffee

@@ -7,6 +7,7 @@ fs = require 'fs'
 path = require 'path'
 optimist = require 'optimist'
 nslog = require 'nslog'
+dialog = require 'dialog'
 _ = require 'underscore'
 
 console.log = (args...) ->
@@ -21,6 +22,13 @@ delegate.browserMainParts.preMainMessageLoopRun = ->
     event.preventDefault()
     args.pathsToOpen.push(filePath)
 
+  app.on 'open-url', (event, url) =>
+    event.preventDefault()
+    dialog.showMessageBox
+      message: 'Atom opened with URL'
+      detail: url
+      buttons: ['OK']
+
   app.on 'open-file', addPathToOpen
 
   app.on 'will-finish-launching', ->

src/packages/archive-view/keymaps/archive-view.cson

@@ -0,0 +1,3 @@
+'.archive-view':
+  'k': 'core:move-up'
+  'j': 'core:move-down'

src/packages/tree-view/keymaps/tree-view.cson

@@ -12,6 +12,8 @@
   'a': 'tree-view:add'
   'delete': 'tree-view:remove'
   'backspace': 'tree-view:remove'
+  'k': 'core:move-up'
+  'j': 'core:move-down'
 
 '.tree-view-dialog .mini.editor':
   'enter': 'core:confirm'