chore: prettier

Author: Loïc Guychard

src/blame.test.ts

@@ -4,7 +4,7 @@ import {
     getBlameDecorations,
     getBlameDecorationsForSelections,
     getDecorationFromHunk,
-    Hunk
+    Hunk,
 } from './blame'
 import { createMockSourcegraphAPI } from './util/stubs'
 
@@ -13,55 +13,54 @@ const FIXTURE_HUNK_1: Hunk = {
     endLine: 2,
     author: {
         person: {
-            displayName: 'a'
+            displayName: 'a',
         },
-        date: '2018-09-10T21:52:45Z'
+        date: '2018-09-10T21:52:45Z',
     },
     rev: 'b',
     message: 'c',
     commit: {
-        url: 'd'
-    }
+        url: 'd',
+    },
 }
 
 const FIXTURE_HUNK_2: Hunk = {
     startLine: 2,
     endLine: 3,
     author: {
         person: {
-            displayName: 'e'
+            displayName: 'e',
         },
-        date: '2018-11-10T21:52:45Z'
+        date: '2018-11-10T21:52:45Z',
     },
     rev: 'f',
     message: 'g',
     commit: {
-        url: 'h'
-    }
+        url: 'h',
+    },
 }
 
 const FIXTURE_HUNK_3: Hunk = {
     startLine: 3,
     endLine: 4,
     author: {
         person: {
-            displayName: 'i'
+            displayName: 'i',
         },
-        date: '2018-10-10T21:52:45Z'
+        date: '2018-10-10T21:52:45Z',
     },
     rev: 'j',
     message: 'k',
     commit: {
-        url: 'l'
-    }
+        url: 'l',
+    },
 }
 
 const NOW = +new Date('2018-12-01T21:52:45Z')
 
 const SOURCEGRAPH = createMockSourcegraphAPI()
 
 describe('getDecorationsFromHunk()', () => {
-
     it('creates a TextDocumentDecoration from a Hunk', () => {
         expect(getDecorationFromHunk(FIXTURE_HUNK_1, NOW, 0, SOURCEGRAPH as any)).toEqual({
             after: {
@@ -75,66 +74,87 @@ describe('getDecorationsFromHunk()', () => {
                     backgroundColor: 'rgba(193, 217, 255, 0.65)',
                     color: 'rgba(0, 0, 25, 0.55)',
                 },
-                    linkURL: 'https://sourcegraph.test/d',
-                },
-                isWholeLine: true,
-                range: {
-                    end: 0,
-                    start: 0,
-                }
-            }
-        )
+                linkURL: 'https://sourcegraph.test/d',
+            },
+            isWholeLine: true,
+            range: {
+                end: 0,
+                start: 0,
+            },
+        })
     })
 
     it('truncates long commit messsages', () => {
-        const decoration = getDecorationFromHunk({
-            ...FIXTURE_HUNK_1,
-            message: 'asdgjdsag asdklgbasdghladg asdgjlhbasdgjlhabsdg asdgilbadsgiobasgd'
-        }, NOW, 0, SOURCEGRAPH as any)
-        expect(decoration.after && decoration.after.contentText).toEqual('a, 3 months ago: • asdgjdsag asdklgbasdghladg asdgjlhbasdgjlhabs…')
+        const decoration = getDecorationFromHunk(
+            {
+                ...FIXTURE_HUNK_1,
+                message: 'asdgjdsag asdklgbasdghladg asdgjlhbasdgjlhabsdg asdgilbadsgiobasgd',
+            },
+            NOW,
+            0,
+            SOURCEGRAPH as any
+        )
+        expect(decoration.after && decoration.after.contentText).toEqual(
+            'a, 3 months ago: • asdgjdsag asdklgbasdghladg asdgjlhbasdgjlhabs…'
+        )
     })
 
     it('truncates long display names', () => {
-        const decoration = getDecorationFromHunk({
-            ...FIXTURE_HUNK_1,
-            author: {
-                person: {
-                    displayName: 'asdgjdsag asdklgbasdghladg asdgjlhbasdgjlhabsdg asdgilbadsgiobasgd'
+        const decoration = getDecorationFromHunk(
+            {
+                ...FIXTURE_HUNK_1,
+                author: {
+                    person: {
+                        displayName: 'asdgjdsag asdklgbasdghladg asdgjlhbasdgjlhabsdg asdgilbadsgiobasgd',
+                    },
+                    date: '2018-09-10T21:52:45Z',
                 },
-                date:'2018-09-10T21:52:45Z'
-            }
-        }, NOW, 0, SOURCEGRAPH as any)
-        expect(decoration.after && decoration.after.contentText).toEqual('asdgjdsag asdklgbasdghlad…, 3 months ago: • c')
+            },
+            NOW,
+            0,
+            SOURCEGRAPH as any
+        )
+        expect(decoration.after && decoration.after.contentText).toEqual(
+            'asdgjdsag asdklgbasdghlad…, 3 months ago: • c'
+        )
     })
 })
 
 describe('getBlameDecorationsForSelections()', () => {
-
     it('adds decorations only for hunks that are within the selections', () => {
-        const decorations = getBlameDecorationsForSelections([FIXTURE_HUNK_1, FIXTURE_HUNK_2, FIXTURE_HUNK_3], [
-            new SOURCEGRAPH.Selection(new SOURCEGRAPH.Position(1, 0), new SOURCEGRAPH.Position(1, 0)) as any
-        ], NOW, SOURCEGRAPH as any)
-        expect(decorations).toEqual([
-            getDecorationFromHunk(FIXTURE_HUNK_2, NOW, 1, SOURCEGRAPH as any)
-        ])
+        const decorations = getBlameDecorationsForSelections(
+            [FIXTURE_HUNK_1, FIXTURE_HUNK_2, FIXTURE_HUNK_3],
+            [new SOURCEGRAPH.Selection(new SOURCEGRAPH.Position(1, 0), new SOURCEGRAPH.Position(1, 0)) as any],
+            NOW,
+            SOURCEGRAPH as any
+        )
+        expect(decorations).toEqual([getDecorationFromHunk(FIXTURE_HUNK_2, NOW, 1, SOURCEGRAPH as any)])
     })
 
     it('handles multiple selections', () => {
-        const decorations = getBlameDecorationsForSelections([FIXTURE_HUNK_1, FIXTURE_HUNK_2, FIXTURE_HUNK_3], [
-            new SOURCEGRAPH.Selection(new SOURCEGRAPH.Position(1, 0), new SOURCEGRAPH.Position(1, 0)) as any,
-            new SOURCEGRAPH.Selection(new SOURCEGRAPH.Position(2, 0), new SOURCEGRAPH.Position(5, 0)) as any,
-            new SOURCEGRAPH.Selection(new SOURCEGRAPH.Position(6, 0), new SOURCEGRAPH.Position(10, 0)) as any,
-        ], NOW, SOURCEGRAPH as any)
+        const decorations = getBlameDecorationsForSelections(
+            [FIXTURE_HUNK_1, FIXTURE_HUNK_2, FIXTURE_HUNK_3],
+            [
+                new SOURCEGRAPH.Selection(new SOURCEGRAPH.Position(1, 0), new SOURCEGRAPH.Position(1, 0)) as any,
+                new SOURCEGRAPH.Selection(new SOURCEGRAPH.Position(2, 0), new SOURCEGRAPH.Position(5, 0)) as any,
+                new SOURCEGRAPH.Selection(new SOURCEGRAPH.Position(6, 0), new SOURCEGRAPH.Position(10, 0)) as any,
+            ],
+            NOW,
+            SOURCEGRAPH as any
+        )
         expect(decorations).toEqual([
             getDecorationFromHunk(FIXTURE_HUNK_2, NOW, 1, SOURCEGRAPH as any),
             getDecorationFromHunk(FIXTURE_HUNK_3, NOW, 2, SOURCEGRAPH as any),
         ])
     })
 
     it('handles multiple hunks per selection', () => {
-        const decorations = getBlameDecorationsForSelections([FIXTURE_HUNK_1, FIXTURE_HUNK_2, FIXTURE_HUNK_3], [
-            new SOURCEGRAPH.Selection(new SOURCEGRAPH.Position(0, 0), new SOURCEGRAPH.Position(5, 0)) as any
-        ], NOW, SOURCEGRAPH as any)
+        const decorations = getBlameDecorationsForSelections(
+            [FIXTURE_HUNK_1, FIXTURE_HUNK_2, FIXTURE_HUNK_3],
+            [new SOURCEGRAPH.Selection(new SOURCEGRAPH.Position(0, 0), new SOURCEGRAPH.Position(5, 0)) as any],
+            NOW,
+            SOURCEGRAPH as any
+        )
         expect(decorations).toEqual([
             getDecorationFromHunk(FIXTURE_HUNK_1, NOW, 0, SOURCEGRAPH as any),
             getDecorationFromHunk(FIXTURE_HUNK_2, NOW, 1, SOURCEGRAPH as any),
@@ -143,87 +163,83 @@ describe('getBlameDecorationsForSelections()', () => {
     })
 
     it('decorates the start line of the selection if the start line of the hunk is outside of the selection boundaries', () => {
-        const decorations = getBlameDecorationsForSelections([{
-            ...FIXTURE_HUNK_1,
-            startLine: 1,
-            endLine: 10
-        }], [
-            new SOURCEGRAPH.Selection(new SOURCEGRAPH.Position(2, 0), new SOURCEGRAPH.Position(2, 0)) as any
-        ], NOW, SOURCEGRAPH as any)
-        expect(decorations).toEqual([
-            getDecorationFromHunk(FIXTURE_HUNK_1, NOW, 2, SOURCEGRAPH as any),
-        ])
+        const decorations = getBlameDecorationsForSelections(
+            [
+                {
+                    ...FIXTURE_HUNK_1,
+                    startLine: 1,
+                    endLine: 10,
+                },
+            ],
+            [new SOURCEGRAPH.Selection(new SOURCEGRAPH.Position(2, 0), new SOURCEGRAPH.Position(2, 0)) as any],
+            NOW,
+            SOURCEGRAPH as any
+        )
+        expect(decorations).toEqual([getDecorationFromHunk(FIXTURE_HUNK_1, NOW, 2, SOURCEGRAPH as any)])
     })
-
 })
 
 describe('getAllBlameDecorations()', () => {
-
     it('adds decorations for all hunks', () => {
-        expect(getAllBlameDecorations([
-            FIXTURE_HUNK_1,
-            FIXTURE_HUNK_2,
-            FIXTURE_HUNK_3
-        ], NOW, SOURCEGRAPH as any)).toEqual([
+        expect(
+            getAllBlameDecorations([FIXTURE_HUNK_1, FIXTURE_HUNK_2, FIXTURE_HUNK_3], NOW, SOURCEGRAPH as any)
+        ).toEqual([
             getDecorationFromHunk(FIXTURE_HUNK_1, NOW, 0, SOURCEGRAPH as any),
             getDecorationFromHunk(FIXTURE_HUNK_2, NOW, 1, SOURCEGRAPH as any),
             getDecorationFromHunk(FIXTURE_HUNK_3, NOW, 2, SOURCEGRAPH as any),
-
         ])
     })
-
 })
 
 describe('getBlameDecorations()', () => {
-
     it('gets no decorations if git.blame.lineDecorations is false', async () => {
-        expect(await getBlameDecorations({
-            uri: 'a',
-            settings: {
-                'git.blame.lineDecorations': false
-            },
-            now: NOW,
-            selections: null,
-            queryHunks: () => Promise.resolve([FIXTURE_HUNK_1, FIXTURE_HUNK_2, FIXTURE_HUNK_3]),
-            sourcegraph: SOURCEGRAPH as any
-        })).toEqual([])
+        expect(
+            await getBlameDecorations({
+                uri: 'a',
+                settings: {
+                    'git.blame.lineDecorations': false,
+                },
+                now: NOW,
+                selections: null,
+                queryHunks: () => Promise.resolve([FIXTURE_HUNK_1, FIXTURE_HUNK_2, FIXTURE_HUNK_3]),
+                sourcegraph: SOURCEGRAPH as any,
+            })
+        ).toEqual([])
     })
 
     it('gets decorations for all hunks if no selections are passed', async () => {
-        expect(await getBlameDecorations({
-            uri: 'a',
-            settings: {
-                'git.blame.lineDecorations': true
-            },
-            now: NOW,
-            selections: null,
-            queryHunks: () => Promise.resolve([FIXTURE_HUNK_1, FIXTURE_HUNK_2, FIXTURE_HUNK_3]),
-            sourcegraph: SOURCEGRAPH as any
-        })).toEqual([
+        expect(
+            await getBlameDecorations({
+                uri: 'a',
+                settings: {
+                    'git.blame.lineDecorations': true,
+                },
+                now: NOW,
+                selections: null,
+                queryHunks: () => Promise.resolve([FIXTURE_HUNK_1, FIXTURE_HUNK_2, FIXTURE_HUNK_3]),
+                sourcegraph: SOURCEGRAPH as any,
+            })
+        ).toEqual([
             getDecorationFromHunk(FIXTURE_HUNK_1, NOW, 0, SOURCEGRAPH as any),
             getDecorationFromHunk(FIXTURE_HUNK_2, NOW, 1, SOURCEGRAPH as any),
             getDecorationFromHunk(FIXTURE_HUNK_3, NOW, 2, SOURCEGRAPH as any),
         ])
     })
 
     it('gets decorations for the selections if selections are passed', async () => {
-        expect(await getBlameDecorations({
-            uri: 'a',
-            settings: {
-                'git.blame.lineDecorations': true
-            },
-            now: NOW,
-            selections: [
-                new SOURCEGRAPH.Selection(
-                    new SOURCEGRAPH.Position(2, 0),
-                    new SOURCEGRAPH.Position(2, 0)
-                ) as any
-            ],
-            queryHunks: () => Promise.resolve([FIXTURE_HUNK_1, FIXTURE_HUNK_2, FIXTURE_HUNK_3]),
-            sourcegraph: SOURCEGRAPH as any
-        })).toEqual([
-            getDecorationFromHunk(FIXTURE_HUNK_3, NOW, 2, SOURCEGRAPH as any),
-        ])
+        expect(
+            await getBlameDecorations({
+                uri: 'a',
+                settings: {
+                    'git.blame.lineDecorations': true,
+                },
+                now: NOW,
+                selections: [
+                    new SOURCEGRAPH.Selection(new SOURCEGRAPH.Position(2, 0), new SOURCEGRAPH.Position(2, 0)) as any,
+                ],
+                queryHunks: () => Promise.resolve([FIXTURE_HUNK_1, FIXTURE_HUNK_2, FIXTURE_HUNK_3]),
+                sourcegraph: SOURCEGRAPH as any,
+            })
+        ).toEqual([getDecorationFromHunk(FIXTURE_HUNK_3, NOW, 2, SOURCEGRAPH as any)])
     })
-
 })

src/blame.ts

@@ -5,7 +5,12 @@ import { Settings } from './extension'
 import { resolveURI } from './uri'
 import { memoizeAsync } from './util/memoizeAsync'
 
-export const getDecorationFromHunk = (hunk: Hunk, now: number, decoratedLine: number, sourcegraph: typeof import('sourcegraph')): TextDocumentDecoration => ({
+export const getDecorationFromHunk = (
+    hunk: Hunk,
+    now: number,
+    decoratedLine: number,
+    sourcegraph: typeof import('sourcegraph')
+): TextDocumentDecoration => ({
     range: new sourcegraph.Range(decoratedLine, 0, decoratedLine, 0),
     isWholeLine: true,
     after: {
@@ -25,7 +30,12 @@ export const getDecorationFromHunk = (hunk: Hunk, now: number, decoratedLine: nu
     },
 })
 
-export const getBlameDecorationsForSelections = (hunks: Hunk[], selections: Selection[], now: number, sourcegraph: typeof import('sourcegraph')) => {
+export const getBlameDecorationsForSelections = (
+    hunks: Hunk[],
+    selections: Selection[],
+    now: number,
+    sourcegraph: typeof import('sourcegraph')
+) => {
     const decorations: TextDocumentDecoration[] = []
     for (const hunk of hunks) {
         // Hunk start and end lines are 1-indexed, but selection lines are zero-indexed
@@ -51,7 +61,7 @@ export const getAllBlameDecorations = (hunks: Hunk[], now: number, sourcegraph:
     hunks.map(hunk => getDecorationFromHunk(hunk, now, hunk.startLine - 1, sourcegraph))
 
 const queryBlameHunks = memoizeAsync(
-    async ({uri, sourcegraph}: {uri: string, sourcegraph: typeof import('sourcegraph')}): Promise<Hunk[]> => {
+    async ({ uri, sourcegraph }: { uri: string; sourcegraph: typeof import('sourcegraph') }): Promise<Hunk[]> => {
         const { repo, rev, path } = resolveURI(uri)
         const { data, errors } = await sourcegraph.commands.executeCommand(
             'queryGraphQL',
@@ -105,13 +115,13 @@ export const getBlameDecorations = async ({
     selections,
     now,
     queryHunks = queryBlameHunks,
-    sourcegraph
+    sourcegraph,
 }: {
     uri: string
     settings: Settings
-    selections: Selection[] | null,
-    now: number,
-    queryHunks?: ({ uri, sourcegraph } : { uri: string, sourcegraph: typeof import('sourcegraph') }) => Promise<Hunk[]>,
+    selections: Selection[] | null
+    now: number
+    queryHunks?: ({ uri, sourcegraph }: { uri: string; sourcegraph: typeof import('sourcegraph') }) => Promise<Hunk[]>
     sourcegraph: typeof import('sourcegraph')
 }): Promise<TextDocumentDecoration[]> => {
     if (!settings['git.blame.lineDecorations']) {