Fixes issues with failing to load GitLens after bundling

eamodio · eamodio · commit 876badacf450 · 2018-06-06T18:00:14.000-04:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,19 +10,18 @@
             "args": ["--extensionDevelopmentPath=${workspaceRoot}" ],
             "stopOnEntry": false,
             "sourceMaps": true,
-            "outFiles": ["${workspaceRoot}/out/src/**/*.js"],
-            "preLaunchTask": "watch"
+            "outFiles": ["${workspaceRoot}/out/src/**/*.js"]
         },
         {
-            "name": "Build & Launch GitLens",
+            "name": "Watch & Launch GitLens",
             "type": "extensionHost",
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": ["--extensionDevelopmentPath=${workspaceRoot}" ],
             "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/out/src/**/*.js"],
-            "preLaunchTask": "build"
+            "preLaunchTask": "watch"
         }
     ]
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3252,8 +3252,8 @@
         "uglify-es": "3.3.9",
         "uglifyjs-webpack-plugin": "1.2.5",
         "vscode": "1.1.18",
-        "webpack": "4.10.2",
-        "webpack-cli": "3.0.1",
+        "webpack": "4.11.1",
+        "webpack-cli": "3.0.2",
         "webpack-node-externals": "1.7.2"
     }
 }
diff --git a/src/annotations/blameAnnotationProvider.ts b/src/annotations/blameAnnotationProvider.ts
@@ -3,7 +3,6 @@ import { Arrays, Iterables } from '../system';
 import { CancellationToken, Disposable, Hover, HoverProvider, languages, Position, Range, TextDocument, TextEditor, TextEditorDecorationType } from 'vscode';
 import { AnnotationProviderBase } from './annotationProvider';
 import { Annotations } from './annotations';
-import { RangeEndOfLineIndex } from '../constants';
 import { Container } from '../container';
 import { GitDocumentState, TrackedDocument } from '../trackers/gitDocumentTracker';
 import { GitBlame, GitCommit, GitUri } from '../gitService';
@@ -75,7 +74,7 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
         }
 
         const highlightDecorationRanges = Arrays.filterMap(blame.lines,
-            l => l.sha === sha ? this.editor.document.validateRange(new Range(l.line, 0, l.line, RangeEndOfLineIndex)) : undefined);
+            l => l.sha === sha ? this.editor.document.validateRange(new Range(l.line, 0, l.line, Number.MAX_SAFE_INTEGER)) : undefined);
 
         this.editor.setDecorations(this.highlightDecoration, highlightDecorationRanges);
     }
@@ -122,7 +121,7 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
         }
 
         const message = Annotations.getHoverMessage(logCommit || commit, Container.config.defaultDateFormat, await Container.git.getRemotes(commit.repoPath), this.annotationType, this.editor.selection.active.line);
-        return new Hover(message, document.validateRange(new Range(position.line, 0, position.line, RangeEndOfLineIndex)));
+        return new Hover(message, document.validateRange(new Range(position.line, 0, position.line, Number.MAX_SAFE_INTEGER)));
     }
 
     async provideChangesHover(document: TextDocument, position: Position, token: CancellationToken): Promise<Hover | undefined> {
@@ -132,7 +131,7 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
         const hover = await Annotations.changesHover(commit, position.line, await GitUri.fromUri(document.uri));
         if (hover.hoverMessage === undefined) return undefined;
 
-        return new Hover(hover.hoverMessage, document.validateRange(new Range(position.line, 0, position.line, RangeEndOfLineIndex)));
+        return new Hover(hover.hoverMessage, document.validateRange(new Range(position.line, 0, position.line, Number.MAX_SAFE_INTEGER)));
     }
 
     private async getCommitForHover(position: Position): Promise<GitCommit | undefined> {
@@ -145,4 +144,4 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
 
         return blame.commits.get(line.sha);
     }
-}
+}
diff --git a/src/annotations/lineAnnotationController.ts b/src/annotations/lineAnnotationController.ts
@@ -2,7 +2,7 @@
 import { ConfigurationChangeEvent, debug, DecorationRangeBehavior, DecorationRenderOptions, Disposable, Range, TextEditor, TextEditorDecorationType, window } from 'vscode';
 import { Annotations } from './annotations';
 import { configuration } from './../configuration';
-import { isTextEditor, RangeEndOfLineIndex } from './../constants';
+import { isTextEditor } from './../constants';
 import { Container } from './../container';
 import { LinesChangeEvent } from './../trackers/gitLineTracker';
 
@@ -191,7 +191,7 @@ export class LineAnnotationController extends Disposable {
             if (state === undefined || state.commit === undefined) continue;
 
             const decoration = Annotations.trailing(state.commit, cfg.format, cfg.dateFormat === null ? Container.config.defaultDateFormat : cfg.dateFormat, scrollable);
-            decoration.range = editor.document.validateRange(new Range(l, RangeEndOfLineIndex, l, RangeEndOfLineIndex));
+            decoration.range = editor.document.validateRange(new Range(l, Number.MAX_SAFE_INTEGER, l, Number.MAX_SAFE_INTEGER));
             decorations.push(decoration);
         }
 
diff --git a/src/annotations/lineHoverController.ts b/src/annotations/lineHoverController.ts
@@ -2,7 +2,6 @@
 import { CancellationToken, ConfigurationChangeEvent, debug, Disposable, Hover, HoverProvider, languages, Position, Range, TextDocument, TextEditor, window } from 'vscode';
 import { Annotations } from './annotations';
 import { configuration } from './../configuration';
-import { RangeEndOfLineIndex } from './../constants';
 import { Container } from './../container';
 import { LinesChangeEvent } from './../trackers/gitLineTracker';
 
@@ -96,7 +95,7 @@ export class LineHoverController extends Disposable {
         // If we aren't showing the hover over the whole line, make sure the annotation is on
         if (!wholeLine && Container.lineAnnotations.suspended) return undefined;
 
-        const range = document.validateRange(new Range(position.line, wholeLine ? 0 : RangeEndOfLineIndex, position.line, RangeEndOfLineIndex));
+        const range = document.validateRange(new Range(position.line, wholeLine ? 0 : Number.MAX_SAFE_INTEGER, position.line, Number.MAX_SAFE_INTEGER));
         if (!wholeLine && range.start.character !== position.character) return undefined;
 
         // Get the full commit message -- since blame only returns the summary
@@ -138,7 +137,7 @@ export class LineHoverController extends Disposable {
         // If we aren't showing the hover over the whole line, make sure the annotation is on
         if (!wholeLine && Container.lineAnnotations.suspended) return undefined;
 
-        const range = document.validateRange(new Range(position.line, wholeLine ? 0 : RangeEndOfLineIndex, position.line, RangeEndOfLineIndex));
+        const range = document.validateRange(new Range(position.line, wholeLine ? 0 : Number.MAX_SAFE_INTEGER, position.line, Number.MAX_SAFE_INTEGER));
         if (!wholeLine && range.start.character !== position.character) return undefined;
 
         const trackedDocument = await Container.tracker.get(document);
@@ -175,4 +174,4 @@ export class LineHoverController extends Disposable {
             this._hoverProviderDisposable = undefined;
         }
     }
-}
+}
diff --git a/src/annotations/recentChangesAnnotationProvider.ts b/src/annotations/recentChangesAnnotationProvider.ts
@@ -3,7 +3,6 @@ import { DecorationOptions, MarkdownString, Position, Range, TextEditor, TextEdi
 import { AnnotationProviderBase } from './annotationProvider';
 import { Annotations } from './annotations';
 import { FileAnnotationType } from './../configuration';
-import { RangeEndOfLineIndex } from '../constants';
 import { Container } from '../container';
 import { GitDocumentState, TrackedDocument } from '../trackers/gitDocumentTracker';
 import { GitUri } from '../gitService';
@@ -49,7 +48,7 @@ export class RecentChangesAnnotationProvider extends AnnotationProviderBase {
 
                 if (line.state === 'unchanged') continue;
 
-                const range = this.editor.document.validateRange(new Range(new Position(count, 0), new Position(count, RangeEndOfLineIndex)));
+                const range = this.editor.document.validateRange(new Range(new Position(count, 0), new Position(count, Number.MAX_SAFE_INTEGER)));
 
                 let message: MarkdownString | undefined = undefined;
 
@@ -88,4 +87,4 @@ export class RecentChangesAnnotationProvider extends AnnotationProviderBase {
     async validate(): Promise<boolean> {
         return true;
     }
-}
+}
diff --git a/src/configuration.ts b/src/configuration.ts
@@ -4,9 +4,8 @@ export * from './ui/config';
 import { Functions } from './system';
 import { ConfigurationChangeEvent, ConfigurationTarget, Event, EventEmitter, ExtensionContext, Uri, workspace } from 'vscode';
 import { IConfig, KeyMap } from './ui/config';
-import { CommandContext, setCommandContext } from './constants';
+import { CommandContext, extensionId, setCommandContext } from './constants';
 import { Container } from './container';
-import { extensionId } from './extension';
 import { clearGravatarCache } from './gitService';
 
 const emptyConfig: any = new Proxy<any>({} as IConfig, {
diff --git a/src/constants.ts b/src/constants.ts
@@ -1,7 +1,11 @@
 'use strict';
 import { commands, TextDocument, TextEditor, window } from 'vscode';
 
-export const RangeEndOfLineIndex = 100000000;
+export const applicationInsightsKey = 'a9c302f8-6483-4d01-b92c-c159c799c679';
+export const extensionId = 'gitlens';
+export const extensionOutputChannelName = 'GitLens';
+export const extensionQualifiedId = `eamodio.${extensionId}`;
+export const extensionTerminalName = 'GitLens';
 
 export enum BuiltInCommands {
     CloseActiveEditor = 'workbench.action.closeActiveEditor',
@@ -123,4 +127,4 @@ export enum WorkspaceState {
     GitExplorerAutoRefresh = 'gitlens:gitExplorer:autoRefresh',
     GitExplorerView = 'gitlens:gitExplorer:view',
     ResultsExplorerKeepResults = 'gitlens:resultsExplorer:keepResults'
-}
+}
diff --git a/src/extension.ts b/src/extension.ts
@@ -1,19 +1,13 @@
 'use strict';
 
-export const applicationInsightsKey = 'a9c302f8-6483-4d01-b92c-c159c799c679';
-export const extensionId = 'gitlens';
-export const extensionOutputChannelName = 'GitLens';
-export const extensionTerminalName = 'GitLens';
-export const qualifiedExtensionId = `eamodio.${extensionId}`;
-
+import { Logger } from './logger';
 import { Versions } from './system';
 import { commands, ExtensionContext, extensions, window, workspace } from 'vscode';
 import { CodeLensLanguageScope, CodeLensScopes, configuration, Configuration, HighlightLocations, IConfig, IMenuConfig, KeyMap, OutputLevel } from './configuration';
-import { CommandContext, GlobalState, setCommandContext } from './constants';
+import { CommandContext, extensionId, extensionQualifiedId, GlobalState, setCommandContext } from './constants';
 import { Commands, configureCommands } from './commands';
 import { Container } from './container';
 import { GitService } from './gitService';
-import { Logger } from './logger';
 import { Messages } from './messages';
 // import { Telemetry } from './telemetry';
 
@@ -26,7 +20,7 @@ export async function activate(context: ExtensionContext) {
 
     Logger.configure(context);
 
-    const gitlens = extensions.getExtension(qualifiedExtensionId)!;
+    const gitlens = extensions.getExtension(extensionQualifiedId)!;
     const gitlensVersion = gitlens.packageJSON.version;
 
     const enabled = workspace.getConfiguration('git', null!).get<boolean>('enabled', true);
diff --git a/src/keyboard.ts b/src/keyboard.ts
@@ -1,7 +1,6 @@
 'use strict';
 import { commands, Disposable } from 'vscode';
-import { CommandContext, setCommandContext } from './constants';
-import { extensionId } from './extension';
+import { CommandContext, extensionId, setCommandContext } from './constants';
 import { Logger } from './logger';
 
 export declare interface KeyCommand {
@@ -130,4 +129,4 @@ export class Keyboard extends Disposable {
             return undefined;
         }
     }
-}
+}
diff --git a/src/logger.ts b/src/logger.ts
@@ -1,7 +1,7 @@
 'use strict';
 import { ConfigurationChangeEvent, ExtensionContext, OutputChannel, window } from 'vscode';
 import { configuration, OutputLevel } from './configuration';
-import { extensionOutputChannelName } from './extension';
+import { extensionOutputChannelName } from './constants';
 // import { Telemetry } from './telemetry';
 
 const ConsolePrefix = `[${extensionOutputChannelName}]`;
@@ -97,4 +97,4 @@ export class Logger {
 
         return this._isDebugging;
     }
-}
+}
diff --git a/src/views/explorerCommands.ts b/src/views/explorerCommands.ts
@@ -1,8 +1,7 @@
 import { Arrays } from '../system';
 import { commands, Disposable, InputBoxOptions, Terminal, TextDocumentShowOptions, Uri, window } from 'vscode';
-import { CommandContext, setCommandContext } from '../constants';
+import { CommandContext, extensionTerminalName, setCommandContext } from '../constants';
 import { Container } from '../container';
-import { extensionTerminalName } from '../extension';
 import { BranchNode, ExplorerNode, TagNode } from '../views/gitExplorer';
 import { CommitFileNode, CommitNode, ExplorerRefNode, RemoteNode, StashFileNode, StashNode, StatusFileCommitsNode, StatusUpstreamNode } from './explorerNodes';
 import { Commands, DiffWithCommandArgs, DiffWithCommandArgsRevision, DiffWithPreviousCommandArgs, DiffWithWorkingCommandArgs, openEditor, OpenFileInRemoteCommandArgs, OpenFileRevisionCommandArgs } from '../commands';
@@ -377,4 +376,4 @@ export class ExplorerCommands extends Disposable {
         terminal.show(false);
         terminal.sendText(`git ${command} ${args}`, false);
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -10,19 +10,18 @@`
`10`	`10`	`"args": ["--extensionDevelopmentPath=${workspaceRoot}" ],`
`11`	`11`	`"stopOnEntry": false,`
`12`	`12`	`"sourceMaps": true,`
`13`		`- "outFiles": ["${workspaceRoot}/out/src/*/.js"],`
`14`		`- "preLaunchTask": "watch"`
	`13`	`+ "outFiles": ["${workspaceRoot}/out/src/*/.js"]`
`15`	`14`	`},`
`16`	`15`	`{`
`17`		`- "name": "Build & Launch GitLens",`
	`16`	`+ "name": "Watch & Launch GitLens",`
`18`	`17`	`"type": "extensionHost",`
`19`	`18`	`"request": "launch",`
`20`	`19`	`"runtimeExecutable": "${execPath}",`
`21`	`20`	`"args": ["--extensionDevelopmentPath=${workspaceRoot}" ],`
`22`	`21`	`"stopOnEntry": false,`
`23`	`22`	`"sourceMaps": true,`
`24`	`23`	`"outFiles": ["${workspaceRoot}/out/src/*/.js"],`
`25`		`- "preLaunchTask": "build"`
	`24`	`+ "preLaunchTask": "watch"`
`26`	`25`	`}`
`27`	`26`	`]`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3252,8 +3252,8 @@`
`3252`	`3252`	`"uglify-es": "3.3.9",`
`3253`	`3253`	`"uglifyjs-webpack-plugin": "1.2.5",`
`3254`	`3254`	`"vscode": "1.1.18",`
`3255`		`- "webpack": "4.10.2",`
`3256`		`- "webpack-cli": "3.0.1",`
	`3255`	`+ "webpack": "4.11.1",`
	`3256`	`+ "webpack-cli": "3.0.2",`
`3257`	`3257`	`"webpack-node-externals": "1.7.2"`
`3258`	`3258`	`}`
`3259`	`3259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ import { Arrays, Iterables } from '../system';`
`3`	`3`	`import { CancellationToken, Disposable, Hover, HoverProvider, languages, Position, Range, TextDocument, TextEditor, TextEditorDecorationType } from 'vscode';`
`4`	`4`	`import { AnnotationProviderBase } from './annotationProvider';`
`5`	`5`	`import { Annotations } from './annotations';`
`6`		`-import { RangeEndOfLineIndex } from '../constants';`
`7`	`6`	`import { Container } from '../container';`
`8`	`7`	`import { GitDocumentState, TrackedDocument } from '../trackers/gitDocumentTracker';`
`9`	`8`	`import { GitBlame, GitCommit, GitUri } from '../gitService';`
`@@ -75,7 +74,7 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase`
`75`	`74`	`}`
`76`	`75`
`77`	`76`	`const highlightDecorationRanges = Arrays.filterMap(blame.lines,`
`78`		`- l => l.sha === sha ? this.editor.document.validateRange(new Range(l.line, 0, l.line, RangeEndOfLineIndex)) : undefined);`
	`77`	`+ l => l.sha === sha ? this.editor.document.validateRange(new Range(l.line, 0, l.line, Number.MAX_SAFE_INTEGER)) : undefined);`
`79`	`78`
`80`	`79`	`this.editor.setDecorations(this.highlightDecoration, highlightDecorationRanges);`
`81`	`80`	`}`
`@@ -122,7 +121,7 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase`
`122`	`121`	`}`
`123`	`122`
`124`	`123`	`const message = Annotations.getHoverMessage(logCommit \|\| commit, Container.config.defaultDateFormat, await Container.git.getRemotes(commit.repoPath), this.annotationType, this.editor.selection.active.line);`
`125`		`- return new Hover(message, document.validateRange(new Range(position.line, 0, position.line, RangeEndOfLineIndex)));`
	`124`	`+ return new Hover(message, document.validateRange(new Range(position.line, 0, position.line, Number.MAX_SAFE_INTEGER)));`
`126`	`125`	`}`
`127`	`126`
`128`	`127`	`async provideChangesHover(document: TextDocument, position: Position, token: CancellationToken): Promise<Hover \| undefined> {`
`@@ -132,7 +131,7 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase`
`132`	`131`	`const hover = await Annotations.changesHover(commit, position.line, await GitUri.fromUri(document.uri));`
`133`	`132`	`if (hover.hoverMessage === undefined) return undefined;`
`134`	`133`
`135`		`- return new Hover(hover.hoverMessage, document.validateRange(new Range(position.line, 0, position.line, RangeEndOfLineIndex)));`
	`134`	`+ return new Hover(hover.hoverMessage, document.validateRange(new Range(position.line, 0, position.line, Number.MAX_SAFE_INTEGER)));`
`136`	`135`	`}`
`137`	`136`
`138`	`137`	`private async getCommitForHover(position: Position): Promise<GitCommit \| undefined> {`
`@@ -145,4 +144,4 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase`
`145`	`144`
`146`	`145`	`return blame.commits.get(line.sha);`
`147`	`146`	`}`
`148`		`-}`
	`147`	`+}`