From 745a3ef9f2c78dc9bc3455cb35da4bcae2c0af4f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 27 Feb 2013 13:24:08 -0800 Subject: [PATCH] Use class methods to create native object shims CoffeeScript 1.5 complains if a constructor has a returns a value. --- spec/stdlib/onig-reg-exp-spec.coffee | 4 ++-- src/app/git.coffee | 2 +- src/app/language-mode.coffee | 10 +++++----- src/app/text-mate-grammar.coffee | 4 ++-- src/stdlib/git-repository.coffee | 4 ++-- src/stdlib/onig-reg-exp.coffee | 4 ++-- src/stdlib/onig-scanner.coffee | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/spec/stdlib/onig-reg-exp-spec.coffee b/spec/stdlib/onig-reg-exp-spec.coffee index 14955c317..7f43d47c7 100644 --- a/spec/stdlib/onig-reg-exp-spec.coffee +++ b/spec/stdlib/onig-reg-exp-spec.coffee @@ -3,13 +3,13 @@ OnigRegExp = require 'onig-reg-exp' describe "OnigRegExp", -> describe ".search(string, index)", -> it "returns an array of the match and all capture groups", -> - regex = new OnigRegExp("\\w(\\d+)") + regex = OnigRegExp.create("\\w(\\d+)") result = regex.search("----a123----") expect(result).toEqual ["a123", "123"] expect(result.index).toBe 4 expect(result.indices).toEqual [4, 5] it "returns null if it does not match", -> - regex = new OnigRegExp("\\w(\\d+)") + regex = OnigRegExp.create("\\w(\\d+)") result = regex.search("--------") expect(result).toBeNull() diff --git a/src/app/git.coffee b/src/app/git.coffee index 2b46fd4ee..866e2977f 100644 --- a/src/app/git.coffee +++ b/src/app/git.coffee @@ -24,7 +24,7 @@ class Git ignore: 1 << 14 constructor: (path, options={}) -> - @repo = new GitRepository(path) + @repo = GitRepository.open(path) refreshIndexOnFocus = options.refreshIndexOnFocus ? true if refreshIndexOnFocus $ = require 'jquery' diff --git a/src/app/language-mode.coffee b/src/app/language-mode.coffee index e8db1c774..848ae826f 100644 --- a/src/app/language-mode.coffee +++ b/src/app/language-mode.coffee @@ -30,13 +30,13 @@ class LanguageMode buffer = @editSession.buffer commentStartRegexString = _.escapeRegExp(commentStartString).replace(/(\s+)$/, '($1)?') - commentStartRegex = new OnigRegExp("^(\\s*)(#{commentStartRegexString})") + commentStartRegex = OnigRegExp.create("^(\\s*)(#{commentStartRegexString})") shouldUncomment = commentStartRegex.test(buffer.lineForRow(start)) if commentEndString = syntax.getProperty(scopes, "editor.commentEnd") if shouldUncomment commentEndRegexString = _.escapeRegExp(commentEndString).replace(/^(\s+)/, '($1)?') - commentEndRegex = new OnigRegExp("(#{commentEndRegexString})(\\s*)$") + commentEndRegex = OnigRegExp.create("(#{commentEndRegexString})(\\s*)$") startMatch = commentStartRegex.search(buffer.lineForRow(start)) endMatch = commentEndRegex.search(buffer.lineForRow(end)) if startMatch and endMatch @@ -152,12 +152,12 @@ class LanguageMode increaseIndentRegexForScopes: (scopes) -> if increaseIndentPattern = syntax.getProperty(scopes, 'editor.increaseIndentPattern') - new OnigRegExp(increaseIndentPattern) + OnigRegExp.create(increaseIndentPattern) decreaseIndentRegexForScopes: (scopes) -> if decreaseIndentPattern = syntax.getProperty(scopes, 'editor.decreaseIndentPattern') - new OnigRegExp(decreaseIndentPattern) + OnigRegExp.create(decreaseIndentPattern) foldEndRegexForScopes: (scopes) -> if foldEndPattern = syntax.getProperty(scopes, 'editor.foldEndPattern') - new OnigRegExp(foldEndPattern) + OnigRegExp.create(foldEndPattern) diff --git a/src/app/text-mate-grammar.coffee b/src/app/text-mate-grammar.coffee index 9cc6d105d..01acb2f77 100644 --- a/src/app/text-mate-grammar.coffee +++ b/src/app/text-mate-grammar.coffee @@ -28,7 +28,7 @@ class TextMateGrammar constructor: ({ @name, @fileTypes, @scopeName, patterns, repository, @foldingStopMarker, firstLineMatch}) -> @initialRule = new Rule(this, {@scopeName, patterns}) @repository = {} - @firstLineRegex = new OnigRegExp(firstLineMatch) if firstLineMatch + @firstLineRegex = OnigRegExp.create(firstLineMatch) if firstLineMatch @fileTypes ?= [] for name, data of repository @@ -111,7 +111,7 @@ class Rule regex = pattern.regexSource regexes.push regex if regex - regexScanner = new OnigScanner(regexes) + regexScanner = OnigScanner.create(regexes) regexScanner.patterns = patterns @scannersByBaseGrammarName[baseGrammar.name] = regexScanner unless anchored regexScanner diff --git a/src/stdlib/git-repository.coffee b/src/stdlib/git-repository.coffee index 8b6ef83d5..7a52403b4 100644 --- a/src/stdlib/git-repository.coffee +++ b/src/stdlib/git-repository.coffee @@ -1,11 +1,11 @@ module.exports = class GitRepository - constructor: (path) -> + @open: (path) -> unless repo = $git.getRepository(path) throw new Error("No Git repository found searching path: #{path}") repo.constructor = GitRepository repo.__proto__ = GitRepository.prototype - return repo + repo getHead: $git.getHead getPath: $git.getPath diff --git a/src/stdlib/onig-reg-exp.coffee b/src/stdlib/onig-reg-exp.coffee index 93883da20..db7fa4632 100644 --- a/src/stdlib/onig-reg-exp.coffee +++ b/src/stdlib/onig-reg-exp.coffee @@ -1,11 +1,11 @@ module.exports = class OnigRegExp - constructor: (source) -> + @create: (source) -> regexp = $onigRegExp.buildOnigRegExp(source); regexp.constructor = OnigRegExp regexp.__proto__ = OnigRegExp.prototype regexp.source = source - return regexp + regexp search: $onigRegExp.search test: $onigRegExp.test diff --git a/src/stdlib/onig-scanner.coffee b/src/stdlib/onig-scanner.coffee index fb26939ec..80c457c2f 100644 --- a/src/stdlib/onig-scanner.coffee +++ b/src/stdlib/onig-scanner.coffee @@ -1,10 +1,10 @@ module.exports = class OnigScanner - constructor: (sources) -> + @create: (sources) -> scanner = $onigScanner.buildScanner(sources) scanner.constructor = OnigScanner scanner.__proto__ = OnigScanner.prototype scanner.sources = sources - return scanner + scanner findNextMatch: $onigScanner.findNextMatch