Skip to content

Commit f039a0c

Browse files
utkarshgupta137Utkarsh Gupta
authored and
Utkarsh Gupta
committed
Fix subfolder git detection
1 parent f85e192 commit f039a0c

File tree

4 files changed

+21
-38
lines changed

4 files changed

+21
-38
lines changed

lib/helpers.coffee

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
fs = require "fs-plus"
2-
path = require "path"
1+
{Directory} = require "atom"
32

43
module.exports =
54
repositoryForPath: (goalPath) ->
6-
for directory, i in atom.project.getDirectories()
7-
if goalPath is directory.getPath() or directory.contains(goalPath)
8-
return atom.project.getRepositories()[i]
9-
null
5+
if goalPath
6+
directory = new Directory goalPath
7+
return atom.project.repositoryForDirectory directory
8+
Promise.resolve(null)

lib/minimap-git-diff-binding.coffee

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,18 @@ class MinimapGitDiffBinding
1818

1919
@subscriptions.add @minimap.onDidDestroy @destroy
2020

21-
if repository = @getRepo()
22-
@subscriptions.add @editor.getBuffer().onDidStopChanging @updateDiffs
23-
@subscriptions.add repository.onDidChangeStatuses =>
24-
@scheduleUpdate()
25-
@subscriptions.add repository.onDidChangeStatus (changedPath) =>
26-
@scheduleUpdate() if changedPath is @editor.getPath()
27-
@subscriptions.add repository.onDidDestroy =>
28-
@destroy()
29-
@subscriptions.add atom.config.observe 'minimap-git-diff.useGutterDecoration', (@useGutterDecoration) =>
30-
@scheduleUpdate()
21+
@getRepo().then (repo) =>
22+
@repository = repo
23+
if repo
24+
@subscriptions.add @editor.getBuffer().onDidStopChanging @updateDiffs
25+
@subscriptions.add @repository.onDidChangeStatuses =>
26+
@scheduleUpdate()
27+
@subscriptions.add @repository.onDidChangeStatus (changedPath) =>
28+
@scheduleUpdate() if changedPath is @editor.getPath()
29+
@subscriptions.add @repository.onDidDestroy =>
30+
@destroy()
31+
@subscriptions.add atom.config.observe 'minimap-git-diff.useGutterDecoration', (@useGutterDecoration) =>
32+
@scheduleUpdate()
3133

3234
@scheduleUpdate()
3335

@@ -75,12 +77,10 @@ class MinimapGitDiffBinding
7577

7678
getPath: -> @editor.getBuffer()?.getPath()
7779

78-
getRepositories: -> atom.project.getRepositories().filter (repo) -> repo?
79-
80-
getRepo: -> @repository ?= repositoryForPath(@editor.getPath())
80+
getRepo: -> repositoryForPath(@editor.getPath())
8181

8282
getDiffs: ->
8383
try
84-
return @getRepo()?.getLineDiffs(@getPath(), @editor.getBuffer().getText())
84+
return @repository?.getLineDiffs(@getPath(), @editor.getBuffer()?.getText())
8585
catch e
8686
return null

lib/minimap-git-diff.coffee

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ class MinimapGitDiff
3030
return if @pluginActive
3131

3232
try
33-
@activateBinding()
33+
@createBindings()
3434
@pluginActive = true
3535

36-
@subscriptions.add @minimap.onDidActivate @activateBinding
36+
@subscriptions.add @minimap.onDidActivate @createBindings
3737
@subscriptions.add @minimap.onDidDeactivate @destroyBindings
3838
catch e
3939
console.log e
@@ -45,16 +45,6 @@ class MinimapGitDiff
4545
@subscriptions.dispose()
4646
@destroyBindings()
4747

48-
activateBinding: =>
49-
@createBindings() if @getRepositories().length > 0
50-
51-
@subscriptions.add atom.project.onDidChangePaths =>
52-
53-
if @getRepositories().length > 0
54-
@createBindings()
55-
else
56-
@destroyBindings()
57-
5848
createBindings: =>
5949
MinimapGitDiffBinding ||= require './minimap-git-diff-binding'
6050

@@ -67,8 +57,6 @@ class MinimapGitDiff
6757
binding = new MinimapGitDiffBinding minimap
6858
@bindings.set(minimap, binding)
6959

70-
getRepositories: -> atom.project.getRepositories().filter (repo) -> repo?
71-
7260
destroyBindings: =>
7361
return unless @minimap? and @minimap.editorsMinimaps?
7462
@minimap.editorsMinimaps.forEach (minimap) =>

package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,5 @@
1515
"1.0.0": "consumeMinimapServiceV1"
1616
}
1717
}
18-
},
19-
"dependencies": {
20-
"mixto": "1.x",
21-
"fs-plus": "^2.0.0"
2218
}
2319
}

0 commit comments

Comments
 (0)