wlxsp
/
test1
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Fixes issues with failing to load GitLens after bundling

main
Eric Amodio 6 years ago
parent
b2452913ce
commit
876badacf4
13 changed files with 144 additions and 142 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -4
      .vscode/launch.json
  2. +112
    -101
      package-lock.json
  3. +2
    -2
      package.json
  4. +4
    -5
      src/annotations/blameAnnotationProvider.ts
  5. +2
    -2
      src/annotations/lineAnnotationController.ts
  6. +3
    -4
      src/annotations/lineHoverController.ts
  7. +2
    -3
      src/annotations/recentChangesAnnotationProvider.ts
  8. +1
    -2
      src/configuration.ts
  9. +6
    -2
      src/constants.ts
  10. +3
    -9
      src/extension.ts
  11. +2
    -3
      src/keyboard.ts
  12. +2
    -2
      src/logger.ts
  13. +2
    -3
      src/views/explorerCommands.ts

+ 3
- 4
.vscode/launch.json View File

@ -10,11 +10,10 @@
"args": ["--extensionDevelopmentPath=${workspaceRoot}" ],
"stopOnEntry": false,
"sourceMaps": true,
"outFiles": ["${workspaceRoot}/out/src/**/*.js"],
"preLaunchTask": "watch"
"outFiles": ["${workspaceRoot}/out/src/**/*.js"]
},
{
"name": "Build & Launch GitLens",
"name": "Watch & Launch GitLens",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
@ -22,7 +21,7 @@
"stopOnEntry": false,
"sourceMaps": true,
"outFiles": ["${workspaceRoot}/out/src/**/*.js"],
"preLaunchTask": "build"
"preLaunchTask": "watch"
}
]
}

+ 112
- 101
package-lock.json View File

@ -23,14 +23,14 @@
"dev": true
},
"@webassemblyjs/ast": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.9.tgz",
"integrity": "sha512-xL3hC0TOc4ic1UNG8ZZNeaiPf1klozt6rqajcy7hfO/qqfkEhLff1AFt5g2LJkTjhw+QSEYVMt7qOaaApu7JzA==",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.10.tgz",
"integrity": "sha512-4BObuKRfeAnKdz5PfTp6MqSoCdj0z9EXu00PsQLzqcC55Htw5r9OXebS+sPF8T5tRTRI5/2w0CR52s/4vJ2fkw==",
"dev": true,
"requires": {
"@webassemblyjs/helper-module-context": "1.5.9",
"@webassemblyjs/helper-wasm-bytecode": "1.5.9",
"@webassemblyjs/wast-parser": "1.5.9",
"@webassemblyjs/helper-module-context": "1.5.10",
"@webassemblyjs/helper-wasm-bytecode": "1.5.10",
"@webassemblyjs/wast-parser": "1.5.10",
"debug": "^3.1.0",
"mamacro": "^0.0.3"
},
@ -47,21 +47,21 @@
}
},
"@webassemblyjs/floating-point-hex-parser": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.9.tgz",
"integrity": "sha512-naMJjuBqDqx4dPSzwpI9pkjdLds4tDTzvsOEzwxPDp655IfgLLP/QEvK/9PQp4p5DExqrR87rk8DWByoqWWlGA==",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.10.tgz",
"integrity": "sha512-ns6H/06BTnk7thnN8O6MK9xMqodgaVKkjBaC8nXGLeAtX2ONHxQL2NnY4XgUzyo7yRwGVAPBxdl7yxzc0iy9Eg==",
"dev": true
},
"@webassemblyjs/helper-api-error": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.9.tgz",
"integrity": "sha512-tzGdqBo7Xf3McJcXbwbwzwElRzF/nELJN+G4MGGfm0DGRQB6UTmMe44jFIOQYT1Za89Aiz5DMQJotdnnLheixw==",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.10.tgz",
"integrity": "sha512-OeWjB1Ie44sg5Nr8GVot5l+uclK4fWEQGH1b+HQ7x9GN9UxcJUIG3+u5dj2MTkthneQT1hUo09Wtpb/bY7zfXA==",
"dev": true
},
"@webassemblyjs/helper-buffer": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.9.tgz",
"integrity": "sha512-WYkys6y33viEY23tHJ+KkSd9yHZBd54Sy6gcSgwLGPP1or9pLqWBrjWWATHuDuIkpvSJSt/+3qjAV6zHd1nS0g==",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.10.tgz",
"integrity": "sha512-soggPYDku3gDl+zV1TVle3zLWgiU1Kli4QJdWCoeyX95RhGtF2A5tP7U3ypLlBb74SdoYYFVn3Fm7HXIWj1wzA==",
"dev": true,
"requires": {
"debug": "^3.1.0"
@ -79,42 +79,45 @@
}
},
"@webassemblyjs/helper-code-frame": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.9.tgz",
"integrity": "sha512-SYjNAlqcRH+YynslbIhFYOnGvE3WBl82/XlcFXiNkqnWsvHWnNkJbtxAtzrT/dcf69O/2pt8j1Q0+qc/rtacVw==",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.10.tgz",
"integrity": "sha512-1mNetGdoMMSW+spR7eC5kJZCA8g9aK7G0t2Mc5Q0p9Kw8p+gFgf9dO7fbThHP/+tNLHM6+SwUQ+S8s4BLhBtZQ==",
"dev": true,
"requires": {
"@webassemblyjs/wast-printer": "1.5.9"
"@webassemblyjs/wast-printer": "1.5.10"
}
},
"@webassemblyjs/helper-fsm": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.9.tgz",
"integrity": "sha512-8D+VVIJTRbsn31zt3eyidYyUkhH1jk2/58mrIPiMarflRsisItJa5WZVu/gw0l+ubFOJf9PivTJB6Kw/Kgxx3g==",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.10.tgz",
"integrity": "sha512-ekKmiumHOJrlzZhrigZ19COsCbqNeHtnRN2wktMIaCHGobW/FW+d4Qv1svc0BetjoXo/DhSgVvhHoxaKSO3yPw==",
"dev": true
},
"@webassemblyjs/helper-module-context": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.9.tgz",
"integrity": "sha512-DbeLbFOhioEeY7yAff12+n5sf7WP7Fmi0lnhCSzfW4xBsgwXKmRjAx7nVmsUf3z+BDnwHHVKIXBUM+ucccNUsw==",
"dev": true
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.10.tgz",
"integrity": "sha512-ce2KTWDlSCHhJZMOX+bgHGIKwYsx27MWySqffl8pqu9K+M1G4TlZCfRlN1dV85rAhn5OknOAHRBmRtceklY2/g==",
"dev": true,
"requires": {
"mamacro": "^0.0.3"
}
},
"@webassemblyjs/helper-wasm-bytecode": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.9.tgz",
"integrity": "sha512-zHQuTMMd2nTyEa3fbmGfzlJW305py1sgf1gHNCO/LVN8nWlKysB/+6J68sP1Cd+9USnT1VS2vyD1z+YJPS6GqQ==",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.10.tgz",
"integrity": "sha512-0noYMZDkkUZvHNpcOp9+ElMTwPxIyEWVc1bdjJ38qZTIX9ytCgRifs2DrF/1FfUxzI3d3xXFqrqCFfp+amAOaA==",
"dev": true
},
"@webassemblyjs/helper-wasm-section": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.9.tgz",
"integrity": "sha512-+ff+8Ju6sLCMFNygcDdLRNRsmuD0PHwq77d2mbfWj5YzUvFaKN2q2kRppJSEAixOnM2xLADuG5y/blpMo5G90A==",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.10.tgz",
"integrity": "sha512-rXH6br9w+CYY/tN+N7MFmnUD5J/D4sBsl1K8liqKGpAXlsGp9SmEeqXy8yBWJ1wH3J3rNGaxQNbk9VR3qZgn0w==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.5.9",
"@webassemblyjs/helper-buffer": "1.5.9",
"@webassemblyjs/helper-wasm-bytecode": "1.5.9",
"@webassemblyjs/wasm-gen": "1.5.9",
"@webassemblyjs/ast": "1.5.10",
"@webassemblyjs/helper-buffer": "1.5.10",
"@webassemblyjs/helper-wasm-bytecode": "1.5.10",
"@webassemblyjs/wasm-gen": "1.5.10",
"debug": "^3.1.0"
},
"dependencies": {
@ -130,37 +133,43 @@
}
},
"@webassemblyjs/ieee754": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.9.tgz",
"integrity": "sha512-mhetZBDnpV3VYqZb5Aail9X01VyIqDDZrNYdYj8bfx/PsVPG2znX90wRyVNTeqC5ylqHCgGkJ63bPaPEyINfsw==",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.10.tgz",
"integrity": "sha512-WWlO5quQd3qOUT4wJiuodh5E1A8BfXYkOueuZZjEPL3budH5snqdWsPDieTqkBJnfCZGwRkRSn14OH4OPY1hsw==",
"dev": true,
"requires": {
"ieee754": "^1.1.11"
}
},
"@webassemblyjs/leb128": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.9.tgz",
"integrity": "sha512-oZ3eUB9EViUtiuMwW/xeYamXgfFS2cmXl6aUIYBfpXJQ5v5aOC8ZuPpz2/LqlgNlT8ThpyFd6kfgkYVwKwkGvQ==",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.10.tgz",
"integrity": "sha512-b+DWTy6RsRznpCKvsP3V5yNkk6YWs+7kLOJ3GU1ITyz846VIzVJda+K0mr31fgXzob/QWToWEx8ajk+PrOegkQ==",
"dev": true,
"requires": {
"leb": "^0.3.0"
}
},
"@webassemblyjs/utf8": {
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.10.tgz",
"integrity": "sha512-MQM04pZd0DoxukOPBJD4uaeVQ4iaWzRqsq7iDvJQBqcxIIEwi2iAPv+xjL2PbVwosCvwkh7FzKK3FHVQUjTlTQ==",
"dev": true
},
"@webassemblyjs/wasm-edit": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.9.tgz",
"integrity": "sha512-pMWe3HomnWAMZytJ5sSNBS6qTbSoULUHkvDrtcarmLBTclmupZe25INy1jxbWGKsuFxw6w0xQ+eLRPlC8HPjhg==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.5.9",
"@webassemblyjs/helper-buffer": "1.5.9",
"@webassemblyjs/helper-wasm-bytecode": "1.5.9",
"@webassemblyjs/helper-wasm-section": "1.5.9",
"@webassemblyjs/wasm-gen": "1.5.9",
"@webassemblyjs/wasm-opt": "1.5.9",
"@webassemblyjs/wasm-parser": "1.5.9",
"@webassemblyjs/wast-printer": "1.5.9",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.10.tgz",
"integrity": "sha512-mrMZw5A0+p6A58iquzq/d0SJej481H4pNwPO65rEjzDsHs+yykT6de26VQD2GtaCTThfSNcw3JJXWJ1biqO/+g==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.5.10",
"@webassemblyjs/helper-buffer": "1.5.10",
"@webassemblyjs/helper-wasm-bytecode": "1.5.10",
"@webassemblyjs/helper-wasm-section": "1.5.10",
"@webassemblyjs/wasm-gen": "1.5.10",
"@webassemblyjs/wasm-opt": "1.5.10",
"@webassemblyjs/wasm-parser": "1.5.10",
"@webassemblyjs/wast-printer": "1.5.10",
"debug": "^3.1.0"
},
"dependencies": {
@ -176,27 +185,28 @@
}
},
"@webassemblyjs/wasm-gen": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.9.tgz",
"integrity": "sha512-UEhymlxupBUJuwnD2N860MqkpE7LHt0tNKqAgT4YAVjbx+88P6MBBk+q+9wr2FJCXxMgsPTxMWifqC4wd2FzVg==",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.10.tgz",
"integrity": "sha512-MXYoZg7zaRGmU2h2FBa6Oo+y0etuDZycx0h7nrBD4LzVqhufenoWY4Be6K4IMU0L/fRb/GMp17Vfqg4m/J8EuQ==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.5.9",
"@webassemblyjs/helper-wasm-bytecode": "1.5.9",
"@webassemblyjs/ieee754": "1.5.9",
"@webassemblyjs/leb128": "1.5.9"
"@webassemblyjs/ast": "1.5.10",
"@webassemblyjs/helper-wasm-bytecode": "1.5.10",
"@webassemblyjs/ieee754": "1.5.10",
"@webassemblyjs/leb128": "1.5.10",
"@webassemblyjs/utf8": "1.5.10"
}
},
"@webassemblyjs/wasm-opt": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.9.tgz",
"integrity": "sha512-oQm84US3e36dPq5bOeybVKA2ZyzeWR4fereg9kJa0Y9XLKxHwlsBa2kFyNXwZNrhMP33iyXAW+ym7om1zPZeAg==",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.10.tgz",
"integrity": "sha512-1A1rVPa1URgjCmEVZupRgrrbqwfCh6hJVkogK22JNygS+wn1gg1jgjN82Zd3NDhm738TwY61936n3y25GC+mfQ==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.5.9",
"@webassemblyjs/helper-buffer": "1.5.9",
"@webassemblyjs/wasm-gen": "1.5.9",
"@webassemblyjs/wasm-parser": "1.5.9",
"@webassemblyjs/ast": "1.5.10",
"@webassemblyjs/helper-buffer": "1.5.10",
"@webassemblyjs/wasm-gen": "1.5.10",
"@webassemblyjs/wasm-parser": "1.5.10",
"debug": "^3.1.0"
},
"dependencies": {
@ -212,42 +222,42 @@
}
},
"@webassemblyjs/wasm-parser": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.9.tgz",
"integrity": "sha512-jBKBTKE4M/WYCSqLjRvK+/QD55E/HNcQjswbksof3GEXfkq0iMqYxoPfqR7uLAD9/jVf9HpBNW2FJOyfTTlYfw==",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.10.tgz",
"integrity": "sha512-VWSi7NWmfEuMpZ0+CTnBzz8qhxw7R17CwmbcJ+QJ0wfqReWEgP/J5yI4mN/C/lEoYuroFUF+sTWoDQqzH4FNdQ==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.5.9",
"@webassemblyjs/helper-api-error": "1.5.9",
"@webassemblyjs/helper-wasm-bytecode": "1.5.9",
"@webassemblyjs/ieee754": "1.5.9",
"@webassemblyjs/leb128": "1.5.9",
"@webassemblyjs/wasm-parser": "1.5.9"
"@webassemblyjs/ast": "1.5.10",
"@webassemblyjs/helper-api-error": "1.5.10",
"@webassemblyjs/helper-wasm-bytecode": "1.5.10",
"@webassemblyjs/ieee754": "1.5.10",
"@webassemblyjs/leb128": "1.5.10",
"@webassemblyjs/wasm-parser": "1.5.10"
}
},
"@webassemblyjs/wast-parser": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.9.tgz",
"integrity": "sha512-bDuYH/NR5D+MmwVZdGW2rUvu4UcKGpodiHBSueajon3oNPu+PAKG+7br3BVFKxDUtDoVtuHLUQvkqp1lTrqPCA==",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.10.tgz",
"integrity": "sha512-RORXT40qjkFgowmFzqGFGBW3fuNd7UKJwyuYXeXLzqQOoPBySE1lsSrku0aQIcVl086dy297A+De5vPCfF/Rfg==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.5.9",
"@webassemblyjs/floating-point-hex-parser": "1.5.9",
"@webassemblyjs/helper-api-error": "1.5.9",
"@webassemblyjs/helper-code-frame": "1.5.9",
"@webassemblyjs/helper-fsm": "1.5.9",
"@webassemblyjs/ast": "1.5.10",
"@webassemblyjs/floating-point-hex-parser": "1.5.10",
"@webassemblyjs/helper-api-error": "1.5.10",
"@webassemblyjs/helper-code-frame": "1.5.10",
"@webassemblyjs/helper-fsm": "1.5.10",
"long": "^3.2.0",
"mamacro": "^0.0.3"
}
},
"@webassemblyjs/wast-printer": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.9.tgz",
"integrity": "sha512-04iV32TO69kZChP3DN6W8i6GCa5UtEn1Lnzb4sQGe5YNjIFz2k8+KZLxbovWIZgj9pk06k3Egq/wyD98lSKaLw==",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.10.tgz",
"integrity": "sha512-n4zZJmnETVc4RRs9wAZQr3dXUwC+Yyx+xwkaWdTk36NqgM89CPVLBpw8htKyKG+BX/tgk+VOXRwO+1x5Cf3J8Q==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.5.9",
"@webassemblyjs/wast-parser": "1.5.9",
"@webassemblyjs/ast": "1.5.10",
"@webassemblyjs/wast-parser": "1.5.10",
"long": "^3.2.0"
}
},
@ -5882,15 +5892,16 @@
}
},
"webpack": {
"version": "4.10.2",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.10.2.tgz",
"integrity": "sha512-S4yIBevM7DFSAOAvWSBgvuH5mtJ3HgjAS6tCGsTxxHtrVdbntdRVaPey2u9sCns6KV859Vwd2DwkvBLTcs6t6g==",
"version": "4.11.1",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.11.1.tgz",
"integrity": "sha512-8HGSxsLm9LTVgYiyfjY849c3Rgtb0bI0fPpdQsMmO6Hg8JXUOCudGD3j6sPfo6DaAdti1icUUZNh8XpY3igHqQ==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.5.9",
"@webassemblyjs/wasm-edit": "1.5.9",
"@webassemblyjs/wasm-opt": "1.5.9",
"@webassemblyjs/wasm-parser": "1.5.9",
"@webassemblyjs/ast": "1.5.10",
"@webassemblyjs/helper-module-context": "1.5.10",
"@webassemblyjs/wasm-edit": "1.5.10",
"@webassemblyjs/wasm-opt": "1.5.10",
"@webassemblyjs/wasm-parser": "1.5.10",
"acorn": "^5.0.0",
"acorn-dynamic-import": "^3.0.0",
"ajv": "^6.1.0",
@ -5914,9 +5925,9 @@
}
},
"webpack-cli": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.0.1.tgz",
"integrity": "sha512-eAfjI1QNB+fe8F2K7uTWeuhEzd5uu7Dy8PbgiwYbk2LFWlI5k+vVXb5I6ugJcHQxQpVkiHIHw2v1a69AGWcCVA==",
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.0.2.tgz",
"integrity": "sha512-XJnOWrGOVnxAa1ry0iL53K2RRhwjndR4x7ePfOJZbXBn0iHXumu9U94ZMssDyIt7I4qdKvyVuuSEjXjeAcAldg==",
"dev": true,
"requires": {
"chalk": "^2.4.1",

+ 2
- 2
package.json View File

@ -3252,8 +3252,8 @@
"uglify-es": "3.3.9",
"uglifyjs-webpack-plugin": "1.2.5",
"vscode": "1.1.18",
"webpack": "4.10.2",
"webpack-cli": "3.0.1",
"webpack": "4.11.1",
"webpack-cli": "3.0.2",
"webpack-node-externals": "1.7.2"
}
}

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

@ -3,7 +3,6 @@ import { Arrays, Iterables } from '../system';
import { CancellationToken, Disposable, Hover, HoverProvider, languages, Position, Range, TextDocument, TextEditor, TextEditorDecorationType } from 'vscode';
import { AnnotationProviderBase } from './annotationProvider';
import { Annotations } from './annotations';
import { RangeEndOfLineIndex } from '../constants';
import { Container } from '../container';
import { GitDocumentState, TrackedDocument } from '../trackers/gitDocumentTracker';
import { GitBlame, GitCommit, GitUri } from '../gitService';
@ -75,7 +74,7 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
}
const highlightDecorationRanges = Arrays.filterMap(blame.lines,
l => l.sha === sha ? this.editor.document.validateRange(new Range(l.line, 0, l.line, RangeEndOfLineIndex)) : undefined);
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);
}
@ -122,7 +121,7 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
}
const message = Annotations.getHoverMessage(logCommit || commit, Container.config.defaultDateFormat, await Container.git.getRemotes(commit.repoPath), this.annotationType, this.editor.selection.active.line);
return new Hover(message, document.validateRange(new Range(position.line, 0, position.line, RangeEndOfLineIndex)));
return new Hover(message, document.validateRange(new Range(position.line, 0, position.line, Number.MAX_SAFE_INTEGER)));
}
async provideChangesHover(document: TextDocument, position: Position, token: CancellationToken): Promise<Hover | undefined> {
@ -132,7 +131,7 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
const hover = await Annotations.changesHover(commit, position.line, await GitUri.fromUri(document.uri));
if (hover.hoverMessage === undefined) return undefined;
return new Hover(hover.hoverMessage, document.validateRange(new Range(position.line, 0, position.line, RangeEndOfLineIndex)));
return new Hover(hover.hoverMessage, document.validateRange(new Range(position.line, 0, position.line, Number.MAX_SAFE_INTEGER)));
}
private async getCommitForHover(position: Position): Promise<GitCommit | undefined> {
@ -145,4 +144,4 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
return blame.commits.get(line.sha);
}
}
}

+ 2
- 2
src/annotations/lineAnnotationController.ts View File

@ -2,7 +2,7 @@
import { ConfigurationChangeEvent, debug, DecorationRangeBehavior, DecorationRenderOptions, Disposable, Range, TextEditor, TextEditorDecorationType, window } from 'vscode';
import { Annotations } from './annotations';
import { configuration } from './../configuration';
import { isTextEditor, RangeEndOfLineIndex } from './../constants';
import { isTextEditor } from './../constants';
import { Container } from './../container';
import { LinesChangeEvent } from './../trackers/gitLineTracker';
@ -191,7 +191,7 @@ export class LineAnnotationController extends Disposable {
if (state === undefined || state.commit === undefined) continue;
const decoration = Annotations.trailing(state.commit, cfg.format, cfg.dateFormat === null ? Container.config.defaultDateFormat : cfg.dateFormat, scrollable);
decoration.range = editor.document.validateRange(new Range(l, RangeEndOfLineIndex, l, RangeEndOfLineIndex));
decoration.range = editor.document.validateRange(new Range(l, Number.MAX_SAFE_INTEGER, l, Number.MAX_SAFE_INTEGER));
decorations.push(decoration);
}

+ 3
- 4
src/annotations/lineHoverController.ts View File

@ -2,7 +2,6 @@
import { CancellationToken, ConfigurationChangeEvent, debug, Disposable, Hover, HoverProvider, languages, Position, Range, TextDocument, TextEditor, window } from 'vscode';
import { Annotations } from './annotations';
import { configuration } from './../configuration';
import { RangeEndOfLineIndex } from './../constants';
import { Container } from './../container';
import { LinesChangeEvent } from './../trackers/gitLineTracker';
@ -96,7 +95,7 @@ export class LineHoverController extends Disposable {
// If we aren't showing the hover over the whole line, make sure the annotation is on
if (!wholeLine && Container.lineAnnotations.suspended) return undefined;
const range = document.validateRange(new Range(position.line, wholeLine ? 0 : RangeEndOfLineIndex, position.line, RangeEndOfLineIndex));
const range = document.validateRange(new Range(position.line, wholeLine ? 0 : Number.MAX_SAFE_INTEGER, position.line, Number.MAX_SAFE_INTEGER));
if (!wholeLine && range.start.character !== position.character) return undefined;
// Get the full commit message -- since blame only returns the summary
@ -138,7 +137,7 @@ export class LineHoverController extends Disposable {
// If we aren't showing the hover over the whole line, make sure the annotation is on
if (!wholeLine && Container.lineAnnotations.suspended) return undefined;
const range = document.validateRange(new Range(position.line, wholeLine ? 0 : RangeEndOfLineIndex, position.line, RangeEndOfLineIndex));
const range = document.validateRange(new Range(position.line, wholeLine ? 0 : Number.MAX_SAFE_INTEGER, position.line, Number.MAX_SAFE_INTEGER));
if (!wholeLine && range.start.character !== position.character) return undefined;
const trackedDocument = await Container.tracker.get(document);
@ -175,4 +174,4 @@ export class LineHoverController extends Disposable {
this._hoverProviderDisposable = undefined;
}
}
}
}

+ 2
- 3
src/annotations/recentChangesAnnotationProvider.ts View File

@ -3,7 +3,6 @@ import { DecorationOptions, MarkdownString, Position, Range, TextEditor, TextEdi
import { AnnotationProviderBase } from './annotationProvider';
import { Annotations } from './annotations';
import { FileAnnotationType } from './../configuration';
import { RangeEndOfLineIndex } from '../constants';
import { Container } from '../container';
import { GitDocumentState, TrackedDocument } from '../trackers/gitDocumentTracker';
import { GitUri } from '../gitService';
@ -49,7 +48,7 @@ export class RecentChangesAnnotationProvider extends AnnotationProviderBase {
if (line.state === 'unchanged') continue;
const range = this.editor.document.validateRange(new Range(new Position(count, 0), new Position(count, RangeEndOfLineIndex)));
const range = this.editor.document.validateRange(new Range(new Position(count, 0), new Position(count, Number.MAX_SAFE_INTEGER)));
let message: MarkdownString | undefined = undefined;
@ -88,4 +87,4 @@ export class RecentChangesAnnotationProvider extends AnnotationProviderBase {
async validate(): Promise<boolean> {
return true;
}
}
}

+ 1
- 2
src/configuration.ts View File

@ -4,9 +4,8 @@ export * from './ui/config';
import { Functions } from './system';
import { ConfigurationChangeEvent, ConfigurationTarget, Event, EventEmitter, ExtensionContext, Uri, workspace } from 'vscode';
import { IConfig, KeyMap } from './ui/config';
import { CommandContext, setCommandContext } from './constants';
import { CommandContext, extensionId, setCommandContext } from './constants';
import { Container } from './container';
import { extensionId } from './extension';
import { clearGravatarCache } from './gitService';
const emptyConfig: any = new Proxy<any>({} as IConfig, {

+ 6
- 2
src/constants.ts View File

@ -1,7 +1,11 @@
'use strict';
import { commands, TextDocument, TextEditor, window } from 'vscode';
export const RangeEndOfLineIndex = 100000000;
export const applicationInsightsKey = 'a9c302f8-6483-4d01-b92c-c159c799c679';
export const extensionId = 'gitlens';
export const extensionOutputChannelName = 'GitLens';
export const extensionQualifiedId = `eamodio.${extensionId}`;
export const extensionTerminalName = 'GitLens';
export enum BuiltInCommands {
CloseActiveEditor = 'workbench.action.closeActiveEditor',
@ -123,4 +127,4 @@ export enum WorkspaceState {
GitExplorerAutoRefresh = 'gitlens:gitExplorer:autoRefresh',
GitExplorerView = 'gitlens:gitExplorer:view',
ResultsExplorerKeepResults = 'gitlens:resultsExplorer:keepResults'
}
}

+ 3
- 9
src/extension.ts View File

@ -1,19 +1,13 @@
'use strict';
export const applicationInsightsKey = 'a9c302f8-6483-4d01-b92c-c159c799c679';
export const extensionId = 'gitlens';
export const extensionOutputChannelName = 'GitLens';
export const extensionTerminalName = 'GitLens';
export const qualifiedExtensionId = `eamodio.${extensionId}`;
import { Logger } from './logger';
import { Versions } from './system';
import { commands, ExtensionContext, extensions, window, workspace } from 'vscode';
import { CodeLensLanguageScope, CodeLensScopes, configuration, Configuration, HighlightLocations, IConfig, IMenuConfig, KeyMap, OutputLevel } from './configuration';
import { CommandContext, GlobalState, setCommandContext } from './constants';
import { CommandContext, extensionId, extensionQualifiedId, GlobalState, setCommandContext } from './constants';
import { Commands, configureCommands } from './commands';
import { Container } from './container';
import { GitService } from './gitService';
import { Logger } from './logger';
import { Messages } from './messages';
// import { Telemetry } from './telemetry';
@ -26,7 +20,7 @@ export async function activate(context: ExtensionContext) {
Logger.configure(context);
const gitlens = extensions.getExtension(qualifiedExtensionId)!;
const gitlens = extensions.getExtension(extensionQualifiedId)!;
const gitlensVersion = gitlens.packageJSON.version;
const enabled = workspace.getConfiguration('git', null!).get<boolean>('enabled', true);

+ 2
- 3
src/keyboard.ts View File

@ -1,7 +1,6 @@
'use strict';
import { commands, Disposable } from 'vscode';
import { CommandContext, setCommandContext } from './constants';
import { extensionId } from './extension';
import { CommandContext, extensionId, setCommandContext } from './constants';
import { Logger } from './logger';
export declare interface KeyCommand {
@ -130,4 +129,4 @@ export class Keyboard extends Disposable {
return undefined;
}
}
}
}

+ 2
- 2
src/logger.ts View File

@ -1,7 +1,7 @@
'use strict';
import { ConfigurationChangeEvent, ExtensionContext, OutputChannel, window } from 'vscode';
import { configuration, OutputLevel } from './configuration';
import { extensionOutputChannelName } from './extension';
import { extensionOutputChannelName } from './constants';
// import { Telemetry } from './telemetry';
const ConsolePrefix = `[${extensionOutputChannelName}]`;
@ -97,4 +97,4 @@ export class Logger {
return this._isDebugging;
}
}
}

+ 2
- 3
src/views/explorerCommands.ts View File

@ -1,8 +1,7 @@
import { Arrays } from '../system';
import { commands, Disposable, InputBoxOptions, Terminal, TextDocumentShowOptions, Uri, window } from 'vscode';
import { CommandContext, setCommandContext } from '../constants';
import { CommandContext, extensionTerminalName, setCommandContext } from '../constants';
import { Container } from '../container';
import { extensionTerminalName } from '../extension';
import { BranchNode, ExplorerNode, TagNode } from '../views/gitExplorer';
import { CommitFileNode, CommitNode, ExplorerRefNode, RemoteNode, StashFileNode, StashNode, StatusFileCommitsNode, StatusUpstreamNode } from './explorerNodes';
import { Commands, DiffWithCommandArgs, DiffWithCommandArgsRevision, DiffWithPreviousCommandArgs, DiffWithWorkingCommandArgs, openEditor, OpenFileInRemoteCommandArgs, OpenFileRevisionCommandArgs } from '../commands';
@ -377,4 +376,4 @@ export class ExplorerCommands extends Disposable {
terminal.show(false);
terminal.sendText(`git ${command} ${args}`, false);
}
}
}

Write Preview
Loading…
Cancel
Save