Skip to content

Commit

Permalink
upgrade everything
Browse files Browse the repository at this point in the history
  • Loading branch information
kahole committed Nov 22, 2020
1 parent 1f489c8 commit 771c592
Show file tree
Hide file tree
Showing 10 changed files with 1,187 additions and 3,515 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"curly": "warn",
"no-empty": "off",
"no-unused-vars": "off",
"semi": "warn"
"semi": "warn",
"prefer-const": "off"
}
}
4,656 changes: 1,164 additions & 3,492 deletions package-lock.json

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"version": "0.5.4",
"engines": {
"vscode": "^1.42.1"
"vscode": "^1.50.0"
},
"icon": "images/edamagit_logo.png",
"galleryBanner": {
Expand Down Expand Up @@ -658,23 +658,23 @@
},
"devDependencies": {
"@types/glob": "^7.1.3",
"@types/mocha": "^7.0.1",
"@types/node": "^12.12.64",
"@types/vscode": "^1.42.1",
"@typescript-eslint/eslint-plugin": "^2.34.0",
"@typescript-eslint/parser": "^2.34.0",
"eslint": "^6.8.0",
"@types/mocha": "^8.0.4",
"@types/node": "^14.14.9",
"@types/vscode": "^1.50.0",
"@typescript-eslint/eslint-plugin": "^4.8.1",
"@typescript-eslint/parser": "^4.8.1",
"eslint": "^7.14.0",
"eslint-loader": "^4.0.2",
"glob": "^7.1.6",
"mocha": "^7.2.0",
"ts-loader": "^7.0.5",
"typescript": "^3.9.7",
"vscode-test": "^1.4.0",
"webpack": "^4.44.2",
"webpack-cli": "^3.3.12"
"mocha": "^8.1.2",
"ts-loader": "^8.0.11",
"typescript": "^4.1.2",
"vscode-test": "^1.4.1",
"webpack": "^5.6.0",
"webpack-cli": "^4.2.0"
},
"dependencies": {
"date-fns": "^2.16.1",
"jsonc-parser": "^2.3.1"
"jsonc-parser": "^3.0.0"
}
}
2 changes: 1 addition & 1 deletion src/commands/ignoringCommands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ async function ignore(repository: MagitRepository, globally = false) {
gitIgnoreFilePath = repository.uri.fsPath + '/.git/info/exclude';
}

return new Promise((resolve, reject) => {
return new Promise<void>((resolve, reject) => {
fs.appendFile(gitIgnoreFilePath, EOL + ignorePattern, (err) => {
if (err) {
reject(err);
Expand Down
2 changes: 1 addition & 1 deletion src/commands/visitAtPointCommands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ async function visitHunk(selectedView: HunkView, activePosition?: Position) {
const numDeletedLinesAboveActiveLine = changeHunk.diff.split(Constants.LineSplitterRegex).slice(0, activeLineRelativeToDiff + 1).filter(line => line.charAt(0) === '-').length;
const relevantPositionInFile = new Position(diffStartLineInFile + activeLineRelativeToDiff - numDeletedLinesAboveActiveLine, relevantCharacterSelection);

var relevantSelection = new Selection(relevantPositionInFile, relevantPositionInFile);
let relevantSelection = new Selection(relevantPositionInFile, relevantPositionInFile);

editor.revealRange(new Range(relevantPositionInFile, relevantPositionInFile), TextEditorRevealType.InCenterIfOutsideViewport);
editor.selection = relevantSelection;
Expand Down
2 changes: 1 addition & 1 deletion src/menu/pickMenu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export class PickMenuUtil {
eventListenerDisposable.dispose();
didHideDisposable.dispose();
if (resolveOnHide) {
resolve();
resolve(undefined!);
}
});

Expand Down
1 change: 0 additions & 1 deletion src/test/suite/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export function run(): Promise<void> {
const mocha = new Mocha({
ui: 'tdd',
});
mocha.useColors(true);

const testsRoot = path.resolve(__dirname, '..');

Expand Down
1 change: 1 addition & 0 deletions src/typings/git.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ export interface CommitOptions {
signoff?: boolean;
signCommit?: boolean;
empty?: boolean;
noVerify?: boolean;
}

export interface BranchQuery {
Expand Down
3 changes: 1 addition & 2 deletions src/utils/magitUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,7 @@ export default class MagitUtils {
}

public static magitAnythingModified(repository: MagitRepository): boolean {
return repository !== undefined && (
repository.indexChanges.length > 0 ||
return (repository.indexChanges.length > 0 ||
repository.workingTreeChanges.length > 0 ||
(repository.mergeChanges?.length ?? 0) > 0);
}
Expand Down
4 changes: 2 additions & 2 deletions syntaxes/magit.tmGrammar.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"sectionHeader": {
"match": "^(Untracked files|((Unstaged|Staged) changes)|Stashes|Recent commits|Unmerged into|Unpushed to|Unpulled from|HEAD|Branches|Remote|Tags|GitError!|(Merging .*(?= \\())|(Rebasing .* onto .*$)|Cherry Picking|Reverting|Stash@{\\d+}|(Commits in .*$))",
"name": "strong keyword.operator.new.section.header.magit"
"name": "strong keyword.operator.new.section.header.magit magit.header"
},
"highlight": {
"match": "^(join|pick)",
Expand All @@ -63,7 +63,7 @@
},
"modified": {
"match": "^(modified|new file|deleted|renamed|copied|unmerged) .*$",
"name": "strong"
"name": "strong magit.subheader"
},
"diff": {
"begin": "(?=^@@)",
Expand Down

0 comments on commit 771c592

Please sign in to comment.