package.json

{
  "name": "vscode-as-git-mergetool",
  "displayName": "VS Code as Git Mergetool",
  "description": "Diff editor layouts for common-base merging",
  "version": "0.14.0",
  "engines": {
    "vscode": "^1.48.0"
  },
  "publisher": "zawys",
  "repository": {
    "type": "git",
    "url": "https://github.com/zawys/vscode-as-git-mergetool"
  },
  "categories": [
    "SCM Providers",
    "Other"
  ],
  "activationEvents": [
    "*"
  ],
  "icon": "media/packaged/icon.png",
  "main": "out/dist/extension.js",
  "targets": {
    "main": {
      "context": "node",
      "includeNodeModules": {
        "vscode": false,
        "node-pty": false
      },
      "isLibrary": true,
      "outputFormat": "commonjs"
    }
  },
  "bugs": {
    "url": "https://github.com/zawys/vscode-as-git-mergetool/issues"
  },
  "qna": "https://github.com/zawys/vscode-as-git-mergetool/issues",
  "contributes": {
    "commands": [
      {
        "command": "vscode-as-git-mergetool.gitMergetoolStart",
        "title": "Start `git mergetool`",
        "enablement": "vscode-as-git-mergetool.gitMergetoolRunning == false",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.mergeContinue",
        "title": "Stage file and continue merging other files",
        "enablement": "vscode-as-git-mergetool.gitMergetoolRunning == true",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.gitMergetoolSkip",
        "title": "Skip file and continue merging other files",
        "enablement": "vscode-as-git-mergetool.gitMergetoolRunning == true",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.resetMergedFile",
        "title": "Discard changes made to merged file; reset",
        "enablement": "vscode-as-git-mergetool.gitMergetoolRunning == true",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.gitMergetoolStop",
        "title": "Stop `git mergetool`",
        "enablement": "vscode-as-git-mergetool.gitMergetoolRunning == true",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.gitMergetoolReopenMergeSituation",
        "title": "Reopen current merge situation in diff layout",
        "enablement": "vscode-as-git-mergetool.gitMergetoolRunning == true",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.deactivateLayout",
        "title": "Deactivate diff layout",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.focusPreviousConflict",
        "title": "Focus previous merge conflict",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.focusNextConflict",
        "title": "Focus next merge conflict",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.gitMergeAbort",
        "title": "Abort merge",
        "category": "Git"
      },
      {
        "command": "vscode-as-git-mergetool.commit",
        "title": "Commit with opened commit message",
        "icon": "$(check)",
        "enablement": "resourceLangId == git-commit",
        "category": "Git"
      },
      {
        "command": "vscode-as-git-mergetool.nextMergeStep",
        "title": "Start mergetool, go to next conflict, or do commit",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.mergeArbitraryFiles",
        "title": "Merge arbitrary files…",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.resetTemporarySettings",
        "title": "Reset temporary settings activated on diff layout start",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.switchLayout",
        "title": "Switch diff editor layout temporarily…",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.zoomDefault",
        "title": "zoom: default",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.zoomCenter",
        "title": "zoom: center",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.zoomLeft",
        "title": "zoom: left",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.zoomRight",
        "title": "zoom: right",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.zoomTop",
        "title": "zoom: top",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.zoomBottom",
        "title": "zoom: bottom",
        "category": "Git Mergetool"
      },
      {
        "command": "vscode-as-git-mergetool.runSettingsAssistant",
        "title": "Launch settings assistant",
        "category": "Git Mergetool"
      }
    ],
    "configuration": {
      "title": "Git Mergetool",
      "properties": {
        "vscode-as-git-mergetool.settingsAssistantOnStartup": {
          "type": "boolean",
          "default": true,
          "description": "If the setup assistant for the 'VS Code as Git Mergetool' extension shall be run on next VS Code startup.",
          "scope": "window"
        },
        "vscode-as-git-mergetool.editCommitMessageAfterMergetool": {
          "type": "boolean",
          "default": true,
          "description": "Open commit message in editor after successful `git mergetool`. This is a workaround for [VS Code issue #7989](https://github.com/microsoft/vscode/issues/7989), i.e. that VS Code does not allow to commit a merge when only local/current changes have been included in the commit; as well as [VS Code issue #30562](https://github.com/microsoft/vscode/issues/30562).",
          "scope": "window"
        },
        "vscode-as-git-mergetool.layout": {
          "type": "string",
          "default": "4TransferRight",
          "enum": [
            "3DiffToMerged",
            "3DiffToBase",
            "3DiffToBaseRows",
            "3DiffToBaseMergedRight",
            "4TransferRight",
            "4TransferDown"
          ],
          "enumDescriptions": [
            "3-column layout focussing on the state of the merged file. Suitable for situations where both versions contain many similar changes. \nRemote→Merged | Base→Merged | Local→Merged.",
            "Classical layout with diffs in 3 columns: \nBase→Local | Base→Merged | Base→Remote.",
            "Like 3DiffToBase, but rows instead of 3 columns: \nBase→Local // \nBase→Merged // \nBase→Remote. \nUseful for long lines.",
            "Like 3DiffToBase, but the right editor is moved below left editor, leaving much space for the merged file: \n(Base→Local // Base→Remote) | Base→Merged.",
            "Layout with 4 tiles: \nBase→Local | Remote→Merged // \nBase→Remote | Local→Merged. \nThe idea is to see local changes on the top, remote changes on the bottom; and to try to align the right edits to the ones on the left.",
            "Layout with 4 tiles: \nBase→Local | Base→Remote // \nRemote→Merged | Local→Merged. \nThe idea is to see local changes on the left, remote changes on the right; and to try to align the bottom edits to the ones on the top. \nUseful for long lines."
          ],
          "scope": "window"
        },
        "vscode-as-git-mergetool.workaroundFocusPauseLengthOnClose": {
          "type": "number",
          "default": 500,
          "description": "Workaround: Increase this if you experience diff editors kept open after deactivating the diff layout or git mergetool. Length of the pause before deactivating the layout in milliseconds. Vote for [VS Code issue #15178](https://github.com/microsoft/vscode/issues/15178). Has only effect when “Workaround Quick Layout Deactivation” is off.",
          "scope": "machine"
        },
        "vscode-as-git-mergetool.workaroundQuickLayoutDeactivation": {
          "type": "boolean",
          "default": true,
          "description": "Workaround: Speed layout deactivation up by switching the grid to a single column before closing every editor. Causes the previous editor groups to be merged into one. Necessary because of [VS Code issue #15178](https://github.com/microsoft/vscode/issues/15178).",
          "scope": "machine-overridable"
        },
        "vscode-as-git-mergetool.labelsInStatusBar": {
          "type": "boolean",
          "default": false,
          "description": "Add a text label to each status bar item.",
          "scope": "machine-overridable"
        },
        "vscode-as-git-mergetool.scrollSynchronizationMethod": {
          "type": "string",
          "default": "centered interval",
          "enum": [
            "centered interval",
            "top"
          ],
          "description": "Vertical position in the editor at which the extension shall try to align the contents such that corresponding lines match.",
          "scope": "window"
        },
        "vscode-as-git-mergetool.askToConfirmResetWhenSkipping": {
          "type": "boolean",
          "default": true,
          "description": "When using the “Skip file” command, if a message shall be displayed which informs about the reset and backup of changes and which allows to cancel.",
          "scope": "application"
        }
      }
    },
    "menus": {
      "scm/title": [
        {
          "command": "vscode-as-git-mergetool.gitMergetoolStart",
          "group": "Merge@1"
        },
        {
          "command": "vscode-as-git-mergetool.gitMergeAbort",
          "group": "Merge@2"
        },
        {
          "command": "vscode-as-git-mergetool.mergeArbitraryFiles",
          "group": "Merge@3"
        }
      ],
      "editor/title": [
        {
          "command": "vscode-as-git-mergetool.commit",
          "when": "resourceLangId == git-commit",
          "group": "navigation"
        }
      ]
    },
    "keybindings": [
      {
        "command": "vscode-as-git-mergetool.nextMergeStep",
        "key": "alt+shift+m m"
      },
      {
        "command": "merge-conflict.accept.current",
        "key": "alt+shift+m c"
      },
      {
        "command": "merge-conflict.accept.all-current",
        "key": "alt+shift+m ctrl+c"
      },
      {
        "command": "merge-conflict.accept.incoming",
        "key": "alt+shift+m i"
      },
      {
        "command": "merge-conflict.accept.all-incoming",
        "key": "alt+shift+m ctrl+i"
      },
      {
        "command": "merge-conflict.accept.both",
        "key": "alt+shift+m b"
      },
      {
        "command": "merge-conflict.accept.all-both",
        "key": "alt+shift+m ctrl+b"
      },
      {
        "key": "shift+alt+m n",
        "command": "merge-conflict.next"
      },
      {
        "key": "shift+alt+m p",
        "command": "merge-conflict.previous"
      },
      {
        "key": "shift+alt+m s",
        "command": "vscode-as-git-mergetool.gitMergetoolSkip"
      },
      {
        "key": "shift+alt+m a",
        "command": "vscode-as-git-mergetool.gitMergeAbort"
      },
      {
        "key": "shift+alt+m l",
        "command": "vscode-as-git-mergetool.switchLayout"
      },
      {
        "key": "shift+alt+m backspace",
        "command": "vscode-as-git-mergetool.zoomDefault"
      },
      {
        "key": "shift+alt+m space",
        "command": "vscode-as-git-mergetool.zoomCenter"
      },
      {
        "key": "shift+alt+m left",
        "command": "vscode-as-git-mergetool.zoomLeft"
      },
      {
        "key": "shift+alt+m right",
        "command": "vscode-as-git-mergetool.zoomRight"
      },
      {
        "key": "shift+alt+m up",
        "command": "vscode-as-git-mergetool.zoomTop"
      },
      {
        "key": "shift+alt+m down",
        "command": "vscode-as-git-mergetool.zoomBottom"
      }
    ]
  },
  "scripts": {
    "compile": "tsc -p ./",
    "watch": "tsc -watch -p ./",
    "clean": "rm -rf out packages",
    "recompile": "yarn run clean && yarn run compile",
    "lint": "eslint src test tools --ext ts --max-warnings=0",
    "copy_files": "cpy --parents --cwd=./test '**/*' '!**/*.ts' ../out/test && cpy out/tools/extension.js out/tools/extension.js.map out/dist",
    "test": "yarn install && yarn run recompile && yarn run lint && yarn run copy_files && yarn run bundle && yarn run test:only",
    "test:only": "node ./out/test/runTests.js",
    "test:dev": "yarn run copy_files && yarn run test:only",
    "bundle:dev": "webpack --mode development",
    "bundle": "webpack --mode production",
    "package": "mkdir packages && vsce package --out=packages/${npm_package_name}-${npm_package_version}.vsix --githubBranch=master --yarn",
    "debug:pre": "yarn run copy_files",
    "build:dev": "yarn install && yarn run clean && yarn run bundle:dev && yarn run package",
    "build": "yarn install && yarn run clean && yarn run bundle && yarn run package",
    "working_dir_is_clean": "git diff --quiet && ! git ls-files -o --exclude-standard | grep '.'",
    "index_is_clean": "git diff --staged --quiet && git diff --quiet && ! git ls-files -o --exclude-standard | grep '.'",
    "format": "prettier --ignore-path .gitignore --write .",
    "pre-commit": "ts-node ./tools/pre-commit.ts",
    "post-commit": "ts-node ./tools/post-commit.ts",
    "check_dependencies": "yarn audit",
    "preversion": "yarn run check_dependencies && yarn run index_is_clean",
    "sign_package": "cd packages && sha256sum vscode-as-git-mergetool-$npm_package_version.vsix > SHA256SUMS && gpg --detach-sign --sign-with=$npm_package_publisher --sign SHA256SUMS",
    "publish:github": "cd packages && hub release create --attach=vscode-as-git-mergetool-$npm_package_version.vsix --attach=SHA256SUMS --attach=SHA256SUMS.sig --message=v$npm_package_version --edit v$npm_package_version",
    "publish:marketplace": "vsce publish --packagePath packages/vscode-as-git-mergetool-$npm_package_version.vsix",
    "postversion": "yarn run build && yarn run sign_package && git push && git push --tags && yarn run publish:github && yarn run publish:marketplace",
    "postinstall": "husky install",
    "prepublishOnly": "pinst --disable",
    "postpublish": "pinst --enable"
  },
  "devDependencies": {
    "@types/diff": "^5.0.0",
    "@types/glob": "^7.1.3",
    "@types/mocha": "^8.2.2",
    "@types/node": "^15.0.2",
    "@types/tmp": "^0.2.0",
    "@types/vscode": "^1.56.0",
    "@types/which": "^2.0.0",
    "@typescript-eslint/eslint-plugin": "^4.23.0",
    "@typescript-eslint/parser": "^4.23.0",
    "cpy-cli": "^3.1.1",
    "dotenv": "^9.0.2",
    "eslint": "^7.26.0",
    "eslint-config-prettier": "^8.3.0",
    "eslint-plugin-eslint-comments": "^3.2.0",
    "eslint-plugin-header": "^3.1.1",
    "eslint-plugin-prettier": "^3.4.0",
    "eslint-plugin-promise": "^5.1.0",
    "eslint-plugin-unicorn": "^32.0.1",
    "glob": "^7.1.7",
    "husky": "^6.0.0",
    "mocha": "^8.4.0",
    "pinst": "^2.1.6",
    "prettier": "^2.3.0",
    "ts-loader": "^9.1.2",
    "ts-node": "^9.1.1",
    "typescript": "^4.2.4",
    "vsce": "^1.88.0",
    "vscode-test": "^1.5.2",
    "webpack": "^5.37.0",
    "webpack-cli": "^4.7.0"
  },
  "license": "AGPL-3.0-or-later",
  "dependencies": {
    "diff": "^5.0.0",
    "p-defer": "^4.0.0",
    "regenerator-runtime": "^0.13.7",
    "tmp-promise": "^3.0.2",
    "which": "^2.0.2"
  }
}