Change settings to use bash-like globbing

Author: execjosh

lib/matcher.coffee

@@ -1,29 +1,18 @@
-# See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions
-escapeRegExp = (string) ->
- # $& means the whole matched string
- string.replace /[.*+?^${}()|[\]\\]/g, '\\$&'
+{Minimatch} = require 'minimatch'
 
 module.exports =
 class Matcher
- constructor: (matcher, scopeName, opts = {}) ->
- regexpOpts = ''
-
- if opts.caseSensitive
- regexpOpts += 'i'
-
- matcher = if matcher? then "#{matcher}" else ''
-
- if matcher.length <= 0
- # TODO: Throw error?
- @_regexp = null
- else if /(^\^)|([.|])|(\$$)/.test matcher
- @_regexp = new RegExp "(#{matcher})", regexpOpts
- else
- # Otherwise, we assume it is an extension matcher
- @_regexp = new RegExp "(\\.#{escapeRegExp(matcher)}$)", regexpOpts
+ constructor: (pattern, scopeName, opts = {}) ->
+ @_matcher = new Minimatch pattern,
+ matchBase: true
+ nobrace: true
+ nocomment: true
+ nocase: !!opts.caseSensitive
+ noext: true
+ nonegate: true
 
  match: (string) ->
- RegExp.lastMatch if @_regexp?.test(string)
+ @_matcher.match string
 
  toString: ->
- if @_regexp? then @_regexp.toString() else 'undefined'
+ @_matcher.pattern

lib/scope-name-provider.coffee

@@ -7,15 +7,15 @@ class ScopeNameProvider
  @_matchers = {}
  @_scopeNames = {}
 
- registerMatcher: (matcher, scopeName, opts = {}) ->
+ registerMatcher: (pattern, scopeName, opts = {}) ->
  @_matchers[scopeName] ?= []
- matcher = new Matcher matcher, scopeName, opts
+ matcher = new Matcher pattern, scopeName, opts
  @_matchers[scopeName].push matcher
  @_scopeNames[scopeName] = scopeName
  return # void
 
  getScopeName: (filename) ->
- # scopeName : {match, matcher}
+ # scopeName : pattern
  matches = @_matchFilename filename
  keys = Object.keys matches
  len = keys.length
@@ -30,8 +30,8 @@ class ScopeNameProvider
 
  # Sort keys by match alphabetically
  keys.sort (a, b) ->
- a = matches[a].match
- b = matches[b].match
+ a = matches[a]
+ b = matches[b]
  if a < b
  -1
  else if a > b
@@ -44,7 +44,11 @@ class ScopeNameProvider
 
  # Show a notification
  atom.notifications.addWarning '[file-types] Multiple Matches',
- detail: "Assuming '#{scopeName}' for file '#{filename}'.\n\n#{("- '#{m.matcher}': '#{sn}' matched '#{m.match}'" for sn, m of matches).join '\n'}"
+ detail: """
+ Assuming '#{scopeName}' for file '#{filename}'.
+
+ #{("- '#{p}': '#{sn}'" for sn, p of matches).join '\n'}
+ """
  dismissable: true
 
  return scopeName
@@ -64,11 +68,11 @@ class ScopeNameProvider
  # Start with previously longest length found and no match
  longestLengthForScope = longestLength
  longestMatchForScope = null
- longestMatcherForScope = null
 
  for matcher in matchers
- continue unless (match = matcher.match(filename))?
+ continue unless matcher.match(filename)
 
+ match = matcher.toString()
  len = match.length
 
  # Just skip if less-than longest length for scope
@@ -77,19 +81,16 @@ class ScopeNameProvider
  # Save match if longest (or equal-to longest) for scope
  longestLengthForScope = len
  longestMatchForScope = match
- longestMatcherForScope = matcher
 
  # Skip this scope if no matches found
- continue unless longestMatcherForScope?
+ continue unless longestMatchForScope?
 
  # Reset longest matches if longest
  if longestLengthForScope > longestLength
  longestMatches = {}
 
  # Save the longest match info
  longestLength = longestLengthForScope
- longestMatches[scopeName] =
- match: longestMatchForScope
- matcher: longestMatcherForScope.toString()
+ longestMatches[scopeName] = longestMatchForScope
 
  longestMatches

package.json

@@ -5,6 +5,9 @@
  "description": "Specify additional file types for languages.",
  "repository": "https://github.com/execjosh/atom-file-types",
  "license": "MIT",
+ "dependencies": {
+ "minimatch": "^3.0.2"
+ },
  "engines": {
  "atom": ">=0.185.0 <2.0.0"
  }

spec/matcher-spec.coffee

@@ -1,68 +1,4 @@
 Matcher = require '../lib/matcher'
 
 describe 'Matcher', ->
- describe 'constructor', ->
- it 'creates null regexp for null input', ->
- matcher = new Matcher null
- expect(matcher._regexp).toBe null
-
- it 'creates null regexp for empty input', ->
- matcher = new Matcher ''
- expect(matcher._regexp).toBe null
-
- describe 'with carat (^)', ->
- it 'creates regexp for input starting with a carat (^)', ->
- matcher = new Matcher '^rb'
- expect(matcher._regexp.toString()).toBe "/(^rb)/"
-
- it 'creates "extension" regexp for input containing, but not starting, with a carat (^)', ->
- matcher = new Matcher 'r^b'
- expect(matcher._regexp.toString()).toBe '/(\\.r\\^b$)/'
-
- it 'creates "extension" regexp for input ending, but not starting, with a carat (^)', ->
- matcher = new Matcher 'r^'
- expect(matcher._regexp.toString()).toBe '/(\\.r\\^$)/'
-
- describe 'with dollar ($)', ->
- it 'creates regexp for input ending with a dollar ($)', ->
- matcher = new Matcher 'rb$'
- expect(matcher._regexp.toString()).toBe "/(rb$)/"
-
- it 'creates "extension" regexp for input containing, but not ending, with a dollar ($)', ->
- matcher = new Matcher 'r$b'
- expect(matcher._regexp.toString()).toBe '/(\\.r\\$b$)/'
-
- it 'creates "extension" regexp for input starting, but not ending, with a dollar ($)', ->
- matcher = new Matcher '$b'
- expect(matcher._regexp.toString()).toBe '/(\\.\\$b$)/'
-
- describe 'with unescaped dot (.)', ->
- it 'creates regexp for input starting with a dot (.)', ->
- matcher = new Matcher '.rb'
- expect(matcher._regexp.toString()).toBe "/(.rb)/"
-
- it 'creates regexp for input containing, but neither starting nor ending, with a dot (.)', ->
- matcher = new Matcher 'r.b'
- expect(matcher._regexp.toString()).toBe '/(r.b)/'
-
- it 'creates regexp for input ending with a dot (.)', ->
- matcher = new Matcher 'rb.'
- expect(matcher._regexp.toString()).toBe "/(rb.)/"
-
- describe 'with escaped dot (.)', ->
- it 'creates regexp for input starting with an escaped dot (.)', ->
- matcher = new Matcher '\\.rb'
- expect(matcher._regexp.toString()).toBe "/(\\.rb)/"
-
- it 'creates regexp for input containing, but neither starting nor ending, with an escaped dot (.)', ->
- matcher = new Matcher 'r\\.b'
- expect(matcher._regexp.toString()).toBe '/(r\\.b)/'
-
- it 'creates regexp for input ending with an escaped dot (.)', ->
- matcher = new Matcher 'rb\\.'
- expect(matcher._regexp.toString()).toBe "/(rb\\.)/"
-
- describe 'with pipe (|)', ->
- it 'creates regexp for input containing, but neither starting nor ending, with a pipe (|)', ->
- matcher = new Matcher 'r|b'
- expect(matcher._regexp.toString()).toBe '/(r|b)/'
+ xdescribe 'constructor', ->

spec/scope-name-provider-spec.coffee

@@ -10,44 +10,45 @@ describe 'ScopeNameProvider', ->
 
  describe 'scope provision', ->
  it 'provides scope name based on file extension', ->
- snp.registerMatcher 'blah', 'text.plain.test-grammar'
+ snp.registerMatcher '*.blah', 'text.plain.test-grammar'
  expect(snp.getScopeName 'hogehoge.blah').toBe 'text.plain.test-grammar'
 
  it 'provides scope name based on regexp matcher', ->
- snp.registerMatcher 'spec\\.coffee$', 'test.coffee.spec'
+ snp.registerMatcher '*spec.coffee', 'test.coffee.spec'
  expect(snp.getScopeName 'super-human-spec.coffee').toBe 'test.coffee.spec'
 
  it 'gives precedence to longest match', ->
- snp.registerMatcher 'blah', 'text.plain.test-grammar'
- snp.registerMatcher 'spec\\.blah$', 'test.blah.spec'
- expect(snp.getScopeName 'super-human-spec.blah').toBe 'test.blah.spec'
-
- it 'gives precedence to last match for match length tie-breaker', ->
- snp.registerMatcher 'rb', 'text.plain.test-grammar'
- snp.registerMatcher '\\.r(a|b)$', 'test.blah.spec'
- expect(snp.getScopeName 'super-human-spec.rb').toBe 'test.blah.spec'
+ matchers =
+ '*.css.liquid': 'source.css'
+ '*.scss.liquid': 'source.css.scss'
+ '*.liquid': 'text.html.basic'
+ '*_spec.rb': 'source.ruby.rspec'
+ '*.rb': 'source.ruby'
+ for pattern, scopeName of matchers
+ snp.registerMatcher pattern, scopeName
+ expect(snp.getScopeName 'some_controller_spec.rb').toBe 'source.ruby.rspec'
+ expect(snp.getScopeName 'some_controller.rb').toBe 'source.ruby'
+ expect(snp.getScopeName 'something.liquid').toBe 'text.html.basic'
+ expect(snp.getScopeName 'something.scss.liquid').toBe 'source.css.scss'
+ expect(snp.getScopeName 'something.css.liquid').toBe 'source.css'
 
- describe 'regexp matcher', ->
+ describe 'globbing matcher', ->
  it 'can match start-of-string', ->
- snp.registerMatcher '^spec', 'test.spec'
+ snp.registerMatcher 'spec*', 'test.spec'
  expect(snp.getScopeName 'spec-super-human.coffee').toBe 'test.spec'
  expect(snp.getScopeName 'super-human-spec.coffee').toEqualNull()
 
  it 'can match mid-string', ->
- snp.registerMatcher 'sp.c', 'test.spec'
+ snp.registerMatcher 'sp*.coffee', 'test.spec'
  expect(snp.getScopeName 'spec-super-human.coffee').toBe 'test.spec'
- expect(snp.getScopeName 'super-human-spec.coffee').toBe 'test.spec'
- expect(snp.getScopeName 'super-human-spock.coffee').toBe 'test.spec'
+ expect(snp.getScopeName 'super-human-spec.coffee').toEqualNull()
+ expect(snp.getScopeName 'super-human-spock.coffee').toEqualNull()
 
  it 'can match end-of-string', ->
- snp.registerMatcher 'spec$', 'test.spec'
+ snp.registerMatcher '*spec', 'test.spec'
  expect(snp.getScopeName 'spec-super-human').toEqualNull()
  expect(snp.getScopeName 'super-human-spec').toBe 'test.spec'
 
- it 'can match escaped dots', ->
- snp.registerMatcher '_spec\\.rb$', 'source.ruby.rspec'
- expect(snp.getScopeName 'really_cool_controller_spec.rb').toBe 'source.ruby.rspec'
-
  describe 'registered scope name list provision', ->
  it 'initially has no scope names', ->
  expect(snp.getScopeNames()).toEqual []