mirror of
https://github.com/kahole/edamagit.git
synced 2024-10-05 19:47:53 +03:00
upgrade everything
This commit is contained in:
parent
1f489c88c5
commit
771c592789
@ -25,6 +25,7 @@
|
||||
"curly": "warn",
|
||||
"no-empty": "off",
|
||||
"no-unused-vars": "off",
|
||||
"semi": "warn"
|
||||
"semi": "warn",
|
||||
"prefer-const": "off"
|
||||
}
|
||||
}
|
4652
package-lock.json
generated
4652
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
28
package.json
28
package.json
@ -9,7 +9,7 @@
|
||||
},
|
||||
"version": "0.5.4",
|
||||
"engines": {
|
||||
"vscode": "^1.42.1"
|
||||
"vscode": "^1.50.0"
|
||||
},
|
||||
"icon": "images/edamagit_logo.png",
|
||||
"galleryBanner": {
|
||||
@ -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"
|
||||
}
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -37,7 +37,7 @@ export class PickMenuUtil {
|
||||
eventListenerDisposable.dispose();
|
||||
didHideDisposable.dispose();
|
||||
if (resolveOnHide) {
|
||||
resolve();
|
||||
resolve(undefined!);
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -7,7 +7,6 @@ export function run(): Promise<void> {
|
||||
const mocha = new Mocha({
|
||||
ui: 'tdd',
|
||||
});
|
||||
mocha.useColors(true);
|
||||
|
||||
const testsRoot = path.resolve(__dirname, '..');
|
||||
|
||||
|
1
src/typings/git.d.ts
vendored
1
src/typings/git.d.ts
vendored
@ -130,6 +130,7 @@ export interface CommitOptions {
|
||||
signoff?: boolean;
|
||||
signCommit?: boolean;
|
||||
empty?: boolean;
|
||||
noVerify?: boolean;
|
||||
}
|
||||
|
||||
export interface BranchQuery {
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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)",
|
||||
@ -63,7 +63,7 @@
|
||||
},
|
||||
"modified": {
|
||||
"match": "^(modified|new file|deleted|renamed|copied|unmerged) .*$",
|
||||
"name": "strong"
|
||||
"name": "strong magit.subheader"
|
||||
},
|
||||
"diff": {
|
||||
"begin": "(?=^@@)",
|
||||
|
Loading…
Reference in New Issue
Block a user