ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-02-16 10:58:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Updates dependencies (typescript)

Browse Source 
Fixes newly detected typescript errors
This commit is contained in:
Eric Amodio
2017-07-02 22:23:54 -04:00
parent 3d32d86998
commit 3081632815
11 changed files with 56 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "gitlens", "name": "gitlens",
"version": "4.1.3", "version": "4.2.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"dependencies": { "dependencies": {
"@types/copy-paste": { "@types/copy-paste": {
@@ -22,9 +22,9 @@
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {
"version": "8.0.2", "version": "8.0.7",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.2.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.7.tgz",
"integrity": "sha512-1uANgw7TMKnSSO0jffiFnrcMsKVqK3n1IHiSwSgptsRzgLfTCu0QdxZPofyYKVA2U0vH4OmullQ2IiU/XhFp5w==", "integrity": "sha512-fuCPLPe4yY0nv6Z1rTLFCEC452jl0k7i3gF/c8hdEKpYtEpt6Sk67hTGbxx8C0wmifFGPvKYd/O8CvS6dpgxMQ==",
"dev": true "dev": true
}, },
"@types/tmp": { "@types/tmp": {
@@ -1027,9 +1027,9 @@
"dev": true "dev": true
}, },
"js-tokens": { "js-tokens": {
"version": "3.0.1", "version": "3.0.2",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
"integrity": "sha1-COnxMkhKLEWjCQfp3E1VZ7fxFNc=", "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
"dev": true "dev": true
}, },
"jsbn": { "jsbn": {
@@ -1483,6 +1483,12 @@
"integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=", "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
"dev": true "dev": true
}, },
"querystringify": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz",
"integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs=",
"dev": true
},
"queue": { "queue": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/queue/-/queue-3.1.0.tgz", "resolved": "https://registry.npmjs.org/queue/-/queue-3.1.0.tgz",
@@ -1518,9 +1524,9 @@
} }
}, },
"readable-stream": { "readable-stream": {
"version": "2.3.2", "version": "2.3.3",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
"integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00=", "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
"dev": true "dev": true
}, },
"regex-cache": { "regex-cache": {
@@ -1585,6 +1591,12 @@
} }
} }
}, },
"requires-port": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
"integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
"dev": true
},
"resolve": { "resolve": {
"version": "1.3.3", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz",
@@ -1799,9 +1811,9 @@
"dev": true "dev": true
}, },
"tsutils": { "tsutils": {
"version": "2.4.0", "version": "2.5.1",
"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.4.0.tgz", "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.5.1.tgz",
"integrity": "sha1-rUzm26Dlo+2934Ymt8oEB4IYn+o=", "integrity": "sha1-wgATkMee7Bpcz6esEtWZY5aD4M8=",
"dev": true "dev": true
}, },
"tunnel-agent": { "tunnel-agent": {
@@ -1818,9 +1830,9 @@
"optional": true "optional": true
}, },
"typescript": { "typescript": {
"version": "2.3.4", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.1.tgz",
"integrity": "sha1-PTgyGCgjHkNPKHUUlZw3qCtin0I=", "integrity": "sha1-w8yxbdqgsjFN4DHn5v7onlujRrw=",
"dev": true "dev": true
}, },
"unique-stream": { "unique-stream": {
@@ -1829,6 +1841,12 @@
"integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
"dev": true "dev": true
}, },
"url-parse": {
"version": "1.1.9",
"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.1.9.tgz",
"integrity": "sha1-xn8dd11R8KGJEd17P/rSe7nlvRk=",
"dev": true
},
"util-deprecate": { "util-deprecate": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -1924,9 +1942,9 @@
} }
}, },
"vscode": { "vscode": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.0.tgz", "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.1.tgz",
"integrity": "sha1-sEwjmbbsdoE1yWiOeHPXduKNy5U=", "integrity": "sha1-LAztdumYZc0oKTxJ5tXF9d9t0HE=",
"dev": true "dev": true
}, },
"wrappy": { "wrappy": {

2
package.json
View File

@@ -1374,7 +1374,7 @@
"@types/copy-paste": "1.1.30", "@types/copy-paste": "1.1.30",
"@types/iconv-lite": "0.0.1", "@types/iconv-lite": "0.0.1",
"@types/mocha": "2.2.41", "@types/mocha": "2.2.41",
"@types/node": "8.0.4", "@types/node": "8.0.7",
"@types/tmp": "0.0.33", "@types/tmp": "0.0.33",
"mocha": "3.4.2", "mocha": "3.4.2",
"tslint": "5.4.3", "tslint": "5.4.3",

6
src/annotations/blameAnnotationProvider.ts
View File

@@ -7,7 +7,7 @@ import { WhitespaceController } from './whitespaceController';
export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase { export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase {
protected _blame: Promise<GitBlame>; protected _blame: Promise<GitBlame | undefined>;
constructor(context: ExtensionContext, editor: TextEditor, decoration: TextEditorDecorationType | undefined, highlightDecoration: TextEditorDecorationType | undefined, whitespaceController: WhitespaceController | undefined, protected git: GitService, protected uri: GitUri) { constructor(context: ExtensionContext, editor: TextEditor, decoration: TextEditorDecorationType | undefined, highlightDecoration: TextEditorDecorationType | undefined, whitespaceController: WhitespaceController | undefined, protected git: GitService, protected uri: GitUri) {
super(context, editor, decoration, highlightDecoration, whitespaceController); super(context, editor, decoration, highlightDecoration, whitespaceController);
@@ -63,7 +63,7 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
whitespacePromise = this.whitespaceController && this.whitespaceController.override(); whitespacePromise = this.whitespaceController && this.whitespaceController.override();
} }
let blame: GitBlame; let blame: GitBlame | undefined;
if (whitespacePromise) { if (whitespacePromise) {
[blame] = await Promise.all([this._blame, whitespacePromise]); [blame] = await Promise.all([this._blame, whitespacePromise]);
} }
@@ -71,7 +71,7 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
blame = await this._blame; blame = await this._blame;
} }
if (!blame || !blame.lines.length) { if (blame === undefined || !blame.lines.length) {
this.whitespaceController && await this.whitespaceController.restore(); this.whitespaceController && await this.whitespaceController.restore();
return undefined; return undefined;
} }

2
src/annotations/gutterBlameAnnotationProvider.ts
View File

@@ -20,7 +20,7 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase {
// Precalculate the formatting options so we don't need to do it on each iteration // Precalculate the formatting options so we don't need to do it on each iteration
const tokenOptions = Strings.getTokensFromTemplate(cfg.format) const tokenOptions = Strings.getTokensFromTemplate(cfg.format)
.reduce((map, token) => { .reduce((map, token) => {
map[token.key] = token.options; map[token.key] = token.options as ICommitFormatOptions;
return map; return map;
}, {} as { [token: string]: ICommitFormatOptions }); }, {} as { [token: string]: ICommitFormatOptions });

6
src/git/gitLocator.ts
View File

@@ -55,9 +55,9 @@ function findSystemGitWin32(basePath: string): Promise<IGit> {
} }
function findGitWin32(): Promise<IGit> { function findGitWin32(): Promise<IGit> {
return findSystemGitWin32(process.env['ProgramW6432']) return findSystemGitWin32(process.env['ProgramW6432']!)
.then(null, () => findSystemGitWin32(process.env['ProgramFiles(x86)'])) .then(null, () => findSystemGitWin32(process.env['ProgramFiles(x86)']!))
.then(null, () => findSystemGitWin32(process.env['ProgramFiles'])) .then(null, () => findSystemGitWin32(process.env['ProgramFiles']!))
.then(null, () => findSpecificGit('git')); .then(null, () => findSpecificGit('git'));
} }

2
src/git/remotes/provider.ts
View File

@@ -41,7 +41,7 @@ export abstract class RemoteProvider {
return commands.executeCommand(BuiltInCommands.Open, Uri.parse(url)); return commands.executeCommand(BuiltInCommands.Open, Uri.parse(url));
} }
open(resource: RemoteResource): Promise<{}> { open(resource: RemoteResource): Promise<{} | undefined> {
switch (resource.type) { switch (resource.type) {
case 'branch': case 'branch':
return this.openBranch(resource.branch); return this.openBranch(resource.branch);

2
src/gitService.ts
View File

@@ -88,7 +88,7 @@ export class GitService extends Disposable {
private _disposable: Disposable | undefined; private _disposable: Disposable | undefined;
private _fireGitCacheChangeDebounced: () => void; private _fireGitCacheChangeDebounced: () => void;
private _fsWatcher: FileSystemWatcher | undefined; private _fsWatcher: FileSystemWatcher | undefined;
private _gitignore: Promise<ignore.Ignore>; private _gitignore: Promise<ignore.Ignore | undefined>;
static EmptyPromise: Promise<GitBlame | GitDiff | GitLog | undefined> = Promise.resolve(undefined); static EmptyPromise: Promise<GitBlame | GitDiff | GitLog | undefined> = Promise.resolve(undefined);

6
src/quickPicks/commitDetails.ts
View File

@@ -5,7 +5,7 @@ import { Commands, CopyMessageToClipboardCommandArgs, CopyShaToClipboardCommandA
import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, KeyCommandQuickPickItem, OpenFileCommandQuickPickItem, OpenFilesCommandQuickPickItem, QuickPickItem } from './common'; import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, KeyCommandQuickPickItem, OpenFileCommandQuickPickItem, OpenFilesCommandQuickPickItem, QuickPickItem } from './common';
import { GlyphChars } from '../constants'; import { GlyphChars } from '../constants';
import { getGitStatusOcticon, GitCommit, GitLog, GitLogCommit, GitService, GitStashCommit, GitStatusFile, GitStatusFileStatus, GitUri, IGitCommitInfo, IGitStatusFile, RemoteResource } from '../gitService'; import { getGitStatusOcticon, GitCommit, GitLog, GitLogCommit, GitService, GitStashCommit, GitStatusFile, GitStatusFileStatus, GitUri, IGitCommitInfo, IGitStatusFile, RemoteResource } from '../gitService';
import { Keyboard, KeyNoopCommand, Keys } from '../keyboard'; import { Keyboard, KeyCommand, KeyNoopCommand, Keys } from '../keyboard';
import { OpenRemotesCommandQuickPickItem } from './remotes'; import { OpenRemotesCommandQuickPickItem } from './remotes';
import * as moment from 'moment'; import * as moment from 'moment';
import * as path from 'path'; import * as path from 'path';
@@ -203,8 +203,8 @@ export class CommitDetailsQuickPick {
items.splice(0, 0, goBackCommand); items.splice(0, 0, goBackCommand);
} }
let previousCommand: CommandQuickPickItem | (() => Promise<CommandQuickPickItem>) | undefined = undefined; let previousCommand: KeyCommand | (() => Promise<KeyCommand>) | undefined = undefined;
let nextCommand: CommandQuickPickItem | (() => Promise<CommandQuickPickItem>) | undefined = undefined; let nextCommand: KeyCommand | (() => Promise<KeyCommand>) | undefined = undefined;
if (!stash) { if (!stash) {
// If we have the full history, we are good // If we have the full history, we are good
if (repoLog !== undefined && !repoLog.truncated && repoLog.sha === undefined) { if (repoLog !== undefined && !repoLog.truncated && repoLog.sha === undefined) {

8
src/quickPicks/commitFileDetails.ts
View File

@@ -5,7 +5,7 @@ import { Commands, CopyMessageToClipboardCommandArgs, CopyShaToClipboardCommandA
import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, KeyCommandQuickPickItem, OpenFileCommandQuickPickItem } from './common'; import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, KeyCommandQuickPickItem, OpenFileCommandQuickPickItem } from './common';
import { GlyphChars } from '../constants'; import { GlyphChars } from '../constants';
import { GitBranch, GitLog, GitLogCommit, GitService, GitUri, RemoteResource } from '../gitService'; import { GitBranch, GitLog, GitLogCommit, GitService, GitUri, RemoteResource } from '../gitService';
import { Keyboard, KeyNoopCommand } from '../keyboard'; import { Keyboard, KeyCommand, KeyNoopCommand } from '../keyboard';
import { OpenRemotesCommandQuickPickItem } from './remotes'; import { OpenRemotesCommandQuickPickItem } from './remotes';
import * as moment from 'moment'; import * as moment from 'moment';
import * as path from 'path'; import * as path from 'path';
@@ -173,8 +173,8 @@ export class CommitFileDetailsQuickPick {
items.splice(0, 0, goBackCommand); items.splice(0, 0, goBackCommand);
} }
let previousCommand: CommandQuickPickItem | (() => Promise<CommandQuickPickItem>) | undefined = undefined; let previousCommand: KeyCommand | (() => Promise<KeyCommand>) | undefined = undefined;
let nextCommand: CommandQuickPickItem | (() => Promise<CommandQuickPickItem>) | undefined = undefined; let nextCommand: KeyCommand | (() => Promise<KeyCommand>) | undefined = undefined;
if (!stash) { if (!stash) {
// If we have the full history, we are good // If we have the full history, we are good
if (fileLog !== undefined && !fileLog.truncated && fileLog.sha === undefined) { if (fileLog !== undefined && !fileLog.truncated && fileLog.sha === undefined) {
@@ -278,7 +278,7 @@ export class CommitFileDetailsQuickPick {
placeHolder: `${commit.getFormattedPath()} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${isUncommitted ? `Uncommitted ${GlyphChars.ArrowRightHollow} ` : '' }${commit.shortSha} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.author}, ${moment(commit.date).fromNow()} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.message}`, placeHolder: `${commit.getFormattedPath()} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${isUncommitted ? `Uncommitted ${GlyphChars.ArrowRightHollow} ` : '' }${commit.shortSha} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.author}, ${moment(commit.date).fromNow()} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.message}`,
ignoreFocusOut: getQuickPickIgnoreFocusOut(), ignoreFocusOut: getQuickPickIgnoreFocusOut(),
onDidSelectItem: (item: QuickPickItem) => { onDidSelectItem: (item: QuickPickItem) => {
scope.setKeyCommand('right', item); scope.setKeyCommand('right', item as KeyCommand);
} }
} as QuickPickOptions); } as QuickPickOptions);

2
src/quickPicks/remotes.ts
View File

@@ -22,7 +22,7 @@ export class OpenRemoteCommandQuickPickItem extends CommandQuickPickItem {
this.resource = resource; this.resource = resource;
} }
async execute(): Promise<{}> { async execute(): Promise<{} | undefined> {
return this.remote.provider!.open(this.resource); return this.remote.provider!.open(this.resource);
} }
} }

2
src/telemetry.ts
View File

@@ -41,7 +41,7 @@ export class TelemetryReporter {
constructor(key: string) { constructor(key: string) {
const diagChannelState = process.env['APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL']; const diagChannelState = process.env['APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL'];
process.env['APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL'] = true; (process.env['APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL'] as any) = true;
this.appInsights = require('applicationinsights') as ApplicationInsights; this.appInsights = require('applicationinsights') as ApplicationInsights;
process.env['APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL'] = diagChannelState; process.env['APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL'] = diagChannelState;