Skip to content
This repository was archived by the owner on Sep 8, 2018. It is now read-only.

Commit 80fb9ea

Browse files
maxbrunsfeldmaxbrunsfeld
committed
Decaffeinate package
1 parent e3a3bc1 commit 80fb9ea

14 files changed

+461
-426
lines changed

‎.coffeelintignore

-1
This file was deleted.

‎coffeelint.json

-37
This file was deleted.

‎lib/diff-list-view.js

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
/** @babel */
1+
const SelectListView = require('atom-select-list')
2+
const {repositoryForPath} = require('./helpers')
23

3-
import SelectListView from 'atom-select-list'
4-
import {repositoryForPath} from './helpers'
5-
6-
export default class DiffListView {
4+
module.exports =
5+
class DiffListView {
76
constructor () {
87
this.selectListView = new SelectListView({
98
emptyMessage: 'No diffs in file',
@@ -68,9 +67,7 @@ export default class DiffListView {
6867
this.editor = editor
6968
const repository = repositoryForPath(this.editor.getPath())
7069
let diffs = repository ? repository.getLineDiffs(this.editor.getPath(), this.editor.getText()) : []
71-
if (!diffs) {
72-
diffs = []
73-
}
70+
if (!diffs) diffs = []
7471
for (let diff of diffs) {
7572
const bufferRow = diff.newStart > 0 ? diff.newStart - 1 : diff.newStart
7673
const lineText = this.editor.lineTextForBufferRow(bufferRow)

‎lib/git-diff-view.coffee

-138
This file was deleted.

‎lib/git-diff-view.js

+163
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
const {CompositeDisposable} = require('atom')
2+
const {repositoryForPath} = require('./helpers')
3+
4+
const MAX_BUFFER_LENGTH_TO_DIFF = 2 * 1024 * 1024
5+
6+
module.exports =
7+
class GitDiffView {
8+
constructor (editor) {
9+
this.updateDiffs = this.updateDiffs.bind(this)
10+
this.editor = editor
11+
this.subscriptions = new CompositeDisposable()
12+
this.decorations = {}
13+
this.markers = []
14+
}
15+
16+
start () {
17+
const editorElement = this.editor.getElement()
18+
19+
this.subscribeToRepository()
20+
21+
this.subscriptions.add(
22+
this.editor.onDidStopChanging(this.updateDiffs),
23+
this.editor.onDidChangePath(this.updateDiffs),
24+
atom.project.onDidChangePaths(() => this.subscribeToRepository()),
25+
atom.commands.add(editorElement, 'git-diff:move-to-next-diff', () => this.moveToNextDiff()),
26+
atom.commands.add(editorElement, 'git-diff:move-to-previous-diff', () => this.moveToPreviousDiff()),
27+
atom.config.onDidChange('git-diff.showIconsInEditorGutter', () => this.updateIconDecoration()),
28+
atom.config.onDidChange('editor.showLineNumbers', () => this.updateIconDecoration()),
29+
editorElement.onDidAttach(() => this.updateIconDecoration()),
30+
this.editor.onDidDestroy(() => {
31+
this.cancelUpdate()
32+
this.removeDecorations()
33+
this.subscriptions.dispose()
34+
})
35+
)
36+
37+
this.updateIconDecoration()
38+
this.scheduleUpdate()
39+
}
40+
41+
moveToNextDiff () {
42+
const cursorLineNumber = this.editor.getCursorBufferPosition().row + 1
43+
let nextDiffLineNumber = null
44+
let firstDiffLineNumber = null
45+
if (this.diffs) {
46+
for (const {newStart} of this.diffs) {
47+
if (newStart > cursorLineNumber) {
48+
if (nextDiffLineNumber == null) nextDiffLineNumber = newStart - 1
49+
nextDiffLineNumber = Math.min(newStart - 1, nextDiffLineNumber)
50+
}
51+
52+
if (firstDiffLineNumber == null) firstDiffLineNumber = newStart - 1
53+
firstDiffLineNumber = Math.min(newStart - 1, firstDiffLineNumber)
54+
}
55+
}
56+
57+
// Wrap around to the first diff in the file
58+
if (atom.config.get('git-diff.wrapAroundOnMoveToDiff') && nextDiffLineNumber == null) {
59+
nextDiffLineNumber = firstDiffLineNumber
60+
}
61+
62+
this.moveToLineNumber(nextDiffLineNumber)
63+
}
64+
65+
updateIconDecoration () {
66+
const gutter = this.editor.getElement().querySelector('.gutter')
67+
if (gutter) {
68+
if (atom.config.get('editor.showLineNumbers') && atom.config.get('git-diff.showIconsInEditorGutter')) {
69+
gutter.classList.add('git-diff-icon')
70+
} else {
71+
gutter.classList.remove('git-diff-icon')
72+
}
73+
}
74+
}
75+
76+
moveToPreviousDiff () {
77+
const cursorLineNumber = this.editor.getCursorBufferPosition().row + 1
78+
let previousDiffLineNumber = -1
79+
let lastDiffLineNumber = -1
80+
if (this.diffs) {
81+
for (const {newStart} of this.diffs) {
82+
if (newStart < cursorLineNumber) {
83+
previousDiffLineNumber = Math.max(newStart - 1, previousDiffLineNumber)
84+
}
85+
lastDiffLineNumber = Math.max(newStart - 1, lastDiffLineNumber)
86+
}
87+
}
88+
89+
// Wrap around to the last diff in the file
90+
if (atom.config.get('git-diff.wrapAroundOnMoveToDiff') && previousDiffLineNumber === -1) {
91+
previousDiffLineNumber = lastDiffLineNumber
92+
}
93+
94+
this.moveToLineNumber(previousDiffLineNumber)
95+
}
96+
97+
moveToLineNumber (lineNumber) {
98+
if (lineNumber != null && lineNumber >= 0) {
99+
this.editor.setCursorBufferPosition([lineNumber, 0])
100+
this.editor.moveToFirstCharacterOfLine()
101+
}
102+
}
103+
104+
subscribeToRepository () {
105+
this.repository = repositoryForPath(this.editor.getPath())
106+
if (this.repository) {
107+
this.subscriptions.add(this.repository.onDidChangeStatuses(() => {
108+
this.scheduleUpdate()
109+
}))
110+
this.subscriptions.add(this.repository.onDidChangeStatus(changedPath => {
111+
if (changedPath === this.editor.getPath()) this.scheduleUpdate()
112+
}))
113+
}
114+
}
115+
116+
cancelUpdate () {
117+
clearImmediate(this.immediateId)
118+
}
119+
120+
scheduleUpdate () {
121+
this.cancelUpdate()
122+
this.immediateId = setImmediate(this.updateDiffs)
123+
}
124+
125+
updateDiffs () {
126+
if (this.editor.isDestroyed()) return
127+
this.removeDecorations()
128+
const path = this.editor && this.editor.getPath()
129+
if (path && this.editor.getBuffer().getLength() < MAX_BUFFER_LENGTH_TO_DIFF) {
130+
this.diffs = this.repository && this.repository.getLineDiffs(path, this.editor.getText())
131+
if (this.diffs) this.addDecorations(this.diffs)
132+
}
133+
}
134+
135+
addDecorations (diffs) {
136+
for (const {newStart, oldLines, newLines} of diffs) {
137+
const startRow = newStart - 1
138+
const endRow = (newStart + newLines) - 1
139+
if (oldLines === 0 && newLines > 0) {
140+
this.markRange(startRow, endRow, 'git-line-added')
141+
} else if (newLines === 0 && oldLines > 0) {
142+
if (startRow < 0) {
143+
this.markRange(0, 0, 'git-previous-line-removed')
144+
} else {
145+
this.markRange(startRow, startRow, 'git-line-removed')
146+
}
147+
} else {
148+
this.markRange(startRow, endRow, 'git-line-modified')
149+
}
150+
}
151+
}
152+
153+
removeDecorations () {
154+
for (let marker of this.markers) marker.destroy()
155+
this.markers = []
156+
}
157+
158+
markRange (startRow, endRow, klass) {
159+
const marker = this.editor.markBufferRange([[startRow, 0], [endRow, 0]], {invalidate: 'never'})
160+
this.editor.decorateMarker(marker, {type: 'line-number', class: klass})
161+
this.markers.push(marker)
162+
}
163+
}

‎lib/helpers.coffee

-6
This file was deleted.

‎lib/helpers.js

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
exports.repositoryForPath = function (goalPath) {
2+
const directories = atom.project.getDirectories()
3+
const repositories = atom.project.getRepositories()
4+
for (let i = 0; i < directories.length; i++) {
5+
const directory = directories[i]
6+
if (goalPath === directory.getPath() || directory.contains(goalPath)) {
7+
return repositories[i]
8+
}
9+
}
10+
return null
11+
}

0 commit comments

Comments
 (0)