Browse Source

Updates dependencies & prettiers

main
Eric Amodio 6 years ago
parent
commit
86c4d32ecf
10 changed files with 371 additions and 769 deletions
  1. +1
    -1
      CHANGELOG.md
  2. +348
    -742
      package-lock.json
  3. +6
    -6
      package.json
  4. +4
    -6
      src/annotations/annotationProvider.ts
  5. +4
    -6
      src/annotations/blameAnnotationProvider.ts
  6. +2
    -2
      src/commands/diffWithRevision.ts
  7. +2
    -2
      src/commands/openFileRevision.ts
  8. +2
    -2
      src/quickpicks/branchesAndTagsQuickPick.ts
  9. +1
    -1
      src/system/decorators/log.ts
  10. +1
    -1
      src/vsls/host.ts

+ 1
- 1
CHANGELOG.md View File

@ -406,7 +406,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
### Fixed
- Fixes [#400](https://github.com/eamodio/vscode-gitlens/issues/412) - GitLens logging to debug console when debugging different extension
- Fixes [#409](https://github.com/eamodio/vscode-gitlens/issues/409) - Literal $(ellipsis) inserted into commit QuickPick menu entry placeholder text
- Fixes [#409](https://github.com/eamodio/vscode-gitlens/issues/409) - Literal \$(ellipsis) inserted into commit QuickPick menu entry placeholder text
- Fixes [#415](https://github.com/eamodio/vscode-gitlens/issues/415) - Branch names get mangled by color escapes — thanks to [PR #416](https://github.com/eamodio/vscode-gitlens/pull/416) by Roy Ivy III ([@rivy](https://github.com/rivy))
## [8.3.5] - 2018-06-08

+ 348
- 742
package-lock.json
File diff suppressed because it is too large
View File


+ 6
- 6
package.json View File

@ -4866,25 +4866,25 @@
"devDependencies": {
"@types/lodash-es": "4.17.1",
"@types/node": "8.10.39",
"clean-webpack-plugin": "1.0.0",
"clean-webpack-plugin": "1.0.1",
"css-loader": "2.1.0",
"html-webpack-inline-source-plugin": "0.0.10",
"html-webpack-plugin": "3.2.0",
"imagemin-webpack-plugin": "2.4.0",
"mini-css-extract-plugin": "0.5.0",
"node-sass": "4.11.0",
"prettier": "1.15.3",
"prettier": "1.16.1",
"prettier-tslint": "0.4.2",
"sass-loader": "7.1.0",
"terser-webpack-plugin": "1.2.1",
"tslint": "5.12.0",
"tslint": "5.12.1",
"tslint-loader": "3.5.4",
"tslint-prettiest": "0.0.1",
"ts-loader": "5.3.3",
"typescript": "3.2.2",
"typescript": "3.2.4",
"vsce": "1.54.0",
"vscode": "1.1.26",
"webpack": "4.28.3",
"vscode": "1.1.27",
"webpack": "4.29.0",
"webpack-cli": "3.2.1"
}
}

+ 4
- 6
src/annotations/annotationProvider.ts View File

@ -105,12 +105,10 @@ export abstract class AnnotationProviderBase implements Disposable {
}
private _resetDebounced:
| ((
changes?: {
decoration: TextEditorDecorationType;
highlightDecoration: TextEditorDecorationType | undefined;
}
) => void)
| ((changes?: {
decoration: TextEditorDecorationType;
highlightDecoration: TextEditorDecorationType | undefined;
}) => void)
| undefined;
reset(changes?: {

+ 4
- 6
src/annotations/blameAnnotationProvider.ts View File

@ -86,12 +86,10 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
return;
}
const highlightDecorationRanges = Arrays.filterMap(
blame.lines,
l =>
l.sha === sha
? this.editor.document.validateRange(new Range(l.line, 0, l.line, Number.MAX_SAFE_INTEGER))
: undefined
const highlightDecorationRanges = Arrays.filterMap(blame.lines, 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);

+ 2
- 2
src/commands/diffWithRevision.ts View File

@ -93,8 +93,8 @@ export class DiffWithRevisionCommand extends ActiveEditorCommand {
args.branchOrTag instanceof GitTag ? '$(tag)' : '$(git-branch)'
} ${args.branchOrTag.name}`
: gitUri.sha
? ` from ${GlyphChars.Space}$(git-commit) ${gitUri.shortSha}`
: ''
? ` from ${GlyphChars.Space}$(git-commit) ${gitUri.shortSha}`
: ''
}`
},
Commands.DiffWithRevision,

+ 2
- 2
src/commands/openFileRevision.ts View File

@ -123,8 +123,8 @@ export class OpenFileRevisionCommand extends ActiveEditorCommand {
args.branchOrTag instanceof GitTag ? '$(tag)' : '$(git-branch)'
} ${args.branchOrTag.name}`
: gitUri.sha
? ` from ${GlyphChars.Space}$(git-commit) ${gitUri.shortSha}`
: ''
? ` from ${GlyphChars.Space}$(git-commit) ${gitUri.shortSha}`
: ''
}`
},
Commands.OpenFileRevision,

+ 2
- 2
src/quickpicks/branchesAndTagsQuickPick.ts View File

@ -267,8 +267,8 @@ export class BranchesAndTagsQuickPick {
branches.sort(
(a, b) =>
(a.starred ? -1 : 1) - (b.starred ? -1 : 1) ||
(b.remote ? -1 : 1) - (a.remote ? -1 : 1) ||
(a.starred ? -1 : 1) - (b.starred ? -1 : 1) ||
(b.remote ? -1 : 1) - (a.remote ? -1 : 1) ||
a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: 'base' })
);
for (const b of branches) {

+ 1
- 1
src/system/decorators/log.ts View File

@ -63,7 +63,7 @@ export function debug(
export function log<T>(
options: {
args?: false | { [arg: number]: ((arg: any) => string | false) };
args?: false | { [arg: number]: (arg: any) => string | false };
condition?(...args: any[]): boolean;
correlate?: boolean;
debug?: boolean;

+ 1
- 1
src/vsls/host.ts View File

@ -21,7 +21,7 @@ import {
import { vslsUriRootRegex } from './vsls';
const defaultWhitelistFn = () => true;
const gitWhitelist = new Map<string, ((args: any[]) => boolean)>([
const gitWhitelist = new Map<string, (args: any[]) => boolean>([
['blame', defaultWhitelistFn],
['branch', args => args[1] === '-vv' || args[1] === '--contains'],
['cat-file', defaultWhitelistFn],

Loading…
Cancel
Save