diff --git a/CHANGELOG.md b/CHANGELOG.md index b05a28b..0a15505 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [4.3.4](https://github.com/atom-minimap/minimap-git-diff/compare/v4.3.3...v4.3.4) (2020-11-28) + + +### Bug Fixes + +* add minimap as dependency ([dc98d64](https://github.com/atom-minimap/minimap-git-diff/commit/dc98d646615c01de2ca321603dff559e5dbb82f4)) + ## [4.3.3](https://github.com/atom-minimap/minimap-git-diff/compare/v4.3.2...v4.3.3) (2020-11-27) diff --git a/lib/minimap-git-diff.js b/lib/minimap-git-diff.js index 5cd7539..ba4d778 100644 --- a/lib/minimap-git-diff.js +++ b/lib/minimap-git-diff.js @@ -2,39 +2,35 @@ const { CompositeDisposable } = require('atom') let MinimapGitDiffBinding = null -class MinimapGitDiff { - constructor () { - this.pluginActive = false - this.createBindings = this.createBindings.bind(this) - this.destroyBindings = this.destroyBindings.bind(this) - this.subscriptions = new CompositeDisposable() - } - - get config () { - return { - useGutterDecoration: { - type: 'boolean', - default: false, - description: 'When enabled the git diffs will be displayed as thin vertical lines on the left side of the minimap.', - }, - } - } - - isActive () { return this.pluginActive } +module.exports = { + config: { + useGutterDecoration: { + type: 'boolean', + default: false, + description: 'When enabled the git diffs will be displayed as thin vertical lines on the left side of the minimap.', + }, + }, + + isActive () { + return this.pluginActive + }, activate () { + this.pluginActive = false + this.subscriptions = new CompositeDisposable() this.bindings = new WeakMap() - } + require('atom-package-deps').install('minimap-git-diff') + }, consumeMinimapServiceV1 (minimap) { this.minimap = minimap return this.minimap.registerPlugin('git-diff', this) - } + }, deactivate () { this.destroyBindings() this.minimap = null - } + }, activatePlugin () { if (this.pluginActive) { return } @@ -43,12 +39,12 @@ class MinimapGitDiff { this.createBindings() this.pluginActive = true - this.subscriptions.add(this.minimap.onDidActivate(this.createBindings)) - this.subscriptions.add(this.minimap.onDidDeactivate(this.destroyBindings)) + this.subscriptions.add(this.minimap.onDidActivate(this.createBindings.bind(this))) + this.subscriptions.add(this.minimap.onDidDeactivate(this.destroyBindings.bind(this))) } catch (e) { console.log(e) } - } + }, deactivatePlugin () { if (!this.pluginActive) { return } @@ -56,7 +52,7 @@ class MinimapGitDiff { this.pluginActive = false this.subscriptions.dispose() this.destroyBindings() - } + }, createBindings () { if (!MinimapGitDiffBinding) { MinimapGitDiffBinding = require('./minimap-git-diff-binding') } @@ -71,7 +67,7 @@ class MinimapGitDiff { this.bindings.set(minimap, binding) }), ) - } + }, destroyBindings () { if (!this.minimap || !this.minimap.editorsMinimaps) { return } @@ -82,7 +78,5 @@ class MinimapGitDiff { } this.bindings.delete(minimap) }) - } + }, } - -module.exports = new MinimapGitDiff() diff --git a/package-lock.json b/package-lock.json index c0486d8..f58f537 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "minimap-git-diff", - "version": "4.3.3", + "version": "4.3.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -618,6 +618,11 @@ } } }, + "atom-package-deps": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/atom-package-deps/-/atom-package-deps-7.0.2.tgz", + "integrity": "sha512-Z0JS0pUZiq+f3BFCj3lErQo8DdJEQmt4syVCBakidUxIl3mBee4uSX7MBMzhupMkjInEyKTTEIy4EaIDj4842Q==" + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", diff --git a/package.json b/package.json index 43c4521..c3eca01 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "minimap-git-diff", "main": "./lib/minimap-git-diff", - "version": "4.3.3", + "version": "4.3.4", "description": "A minimap binding for the git diff package", "author": "Cédric Néhémie ", "repository": "https://github.com/atom-minimap/minimap-git-diff", @@ -14,6 +14,14 @@ "lint": "eslint ." }, "atomTestRunner": "./spec/runner.js", + "package-deps": [ + { + "name": "minimap" + } + ], + "dependencies": { + "atom-package-deps": "^7.0.2" + }, "devDependencies": { "@semantic-release/apm-config": "^8.0.0", "atom-jasmine3-test-runner": "^5.1.8",