diff --git a/package.json b/package.json index 6641b953a..581e7510c 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "emissary": "^1.3.3", "event-kit": "^1.0.3", "first-mate": "^3.0.0", - "fs-plus": "^2.5", + "fs-plus": "^2.6", "fstream": "0.1.24", "fuzzaldrin": "^2.1", "git-utils": "^3.0.0", @@ -45,7 +45,7 @@ "marked": "^0.3", "mixto": "^1", "nslog": "^2.0.0", - "oniguruma": "^4.0.0", + "oniguruma": "^4.1", "optimist": "0.4.0", "pathwatcher": "^4.3.1", "property-accessors": "^1.1.3", @@ -103,7 +103,7 @@ "incompatible-packages": "0.24.0", "keybinding-resolver": "0.29.0", "link": "0.30.0", - "markdown-preview": "0.143.0", + "markdown-preview": "0.144.0", "metrics": "0.45.0", "notifications": "0.33.0", "open-on-github": "0.34.0", @@ -112,7 +112,7 @@ "settings-view": "0.185.0", "snippets": "0.84.0", "spell-check": "0.55.0", - "status-bar": "0.63.0", + "status-bar": "0.64.0", "styleguide": "0.44.0", "symbols-view": "0.91.0", "tabs": "0.67.0", @@ -130,16 +130,16 @@ "language-gfm": "0.67.0", "language-git": "0.10.0", "language-go": "0.22.0", - "language-html": "0.29.0", + "language-html": "0.30.0", "language-hyperlink": "0.12.2", "language-java": "0.14.0", "language-javascript": "0.63.0", - "language-json": "0.12.0", + "language-json": "0.14.0", "language-less": "0.25.0", "language-make": "0.14.0", "language-mustache": "0.11.0", "language-objective-c": "0.15.0", - "language-perl": "0.19.0", + "language-perl": "0.21.0", "language-php": "0.21.0", "language-property-list": "0.8.0", "language-python": "0.32.0", diff --git a/spec/git-repository-provider-spec.coffee b/spec/git-repository-provider-spec.coffee index 59e3f55af..15e1dcc60 100644 --- a/spec/git-repository-provider-spec.coffee +++ b/spec/git-repository-provider-spec.coffee @@ -16,6 +16,7 @@ describe "GitRepositoryProvider", -> expect(result).toBeInstanceOf GitRepository expect(provider.pathToRepository[result.getPath()]).toBeTruthy() expect(result.statusTask).toBeTruthy() + expect(result.getType()).toBe 'git' it "returns the same GitRepository for different Directory objects in the same repo", -> provider = new GitRepositoryProvider atom.project diff --git a/src/git-repository.coffee b/src/git-repository.coffee index c4a9d34f5..ae10e7459 100644 --- a/src/git-repository.coffee +++ b/src/git-repository.coffee @@ -169,6 +169,12 @@ class GitRepository Section: Repository Details ### + # Public: A {String} indicating the type of version control system used by + # this repository. + # + # Returns `"git"`. + getType: -> 'git' + # Public: Returns the {String} path of the repository. getPath: -> @path ?= fs.absolute(@getRepo().getPath()) diff --git a/src/project.coffee b/src/project.coffee index 299ba920b..f0d368531 100644 --- a/src/project.coffee +++ b/src/project.coffee @@ -482,7 +482,7 @@ class Project extends Model # Deprecated: delegate registerOpener: (opener) -> deprecate("Use Workspace::addOpener instead") - atom.workspace.registerOpener(opener) + atom.workspace.addOpener(opener) # Deprecated: delegate unregisterOpener: (opener) -> @@ -491,10 +491,10 @@ class Project extends Model # Deprecated: delegate eachEditor: (callback) -> - deprecate("Use Workspace::eachEditor instead") - atom.workspace.eachEditor(callback) + deprecate("Use Workspace::observeTextEditors instead") + atom.workspace.observeTextEditors(callback) # Deprecated: delegate getEditors: -> - deprecate("Use Workspace::getEditors instead") - atom.workspace.getEditors() + deprecate("Use Workspace::getTextEditors instead") + atom.workspace.getTextEditors()