Commit Graph

9961 Commits

Author SHA1 Message Date
Joao Moreno aa00a4d022 wip: show scm viewlet contents 2016-11-23 17:53:57 +01:00
Joao Moreno 92e6a9e311 wip: GitSCMProvider 2016-11-23 17:23:38 +01:00
Joao Moreno 44934b47d1 wip: scm viewlet 2016-11-23 16:19:49 +01:00
Joao Moreno e72f3f4e6a 💄 2016-11-23 15:47:45 +01:00
Joao Moreno 621ef70b6d wip: SCMProvider 2016-11-23 12:51:29 +01:00
Joao Moreno fa17b3ebaa EventMultiplexer 2016-11-23 12:46:41 +01:00
Joao Moreno f5cb578dd8 Merge remote-tracking branch 'origin/master' into scm-api 2016-11-22 16:35:51 +01:00
Joao Moreno e8efbf474e fix missing return 2016-11-22 15:49:35 +01:00
Joao Moreno 4c302f9218 scm api: getOriginalResource 2016-11-22 15:48:33 +01:00
isidor 42b0a56380 focus mode: esc to exit have lower weight than close reference search 2016-11-22 14:30:23 +01:00
isidor d2a4e2eace debug: do not massage output in the repl specially. 2016-11-22 14:18:16 +01:00
isidor 73241919a4 debug: remove nasi escape codes when computing string heigh in repl 2016-11-22 14:18:16 +01:00
Benjamin Pasero 4fe260c606 💄 2016-11-22 13:01:34 +01:00
Benjamin Pasero ab9f0b741e hot exit - add version id getters to models 2016-11-22 12:56:50 +01:00
Joao Moreno 65524e591a Merge remote-tracking branch 'origin/master' into scm-api 2016-11-22 12:49:21 +01:00
Joao Moreno 277c0a253a wip: git extension typings 2016-11-22 12:49:03 +01:00
Joao Moreno 1af44d673f wip: extHostSCM, mainThreadSCM 2016-11-22 12:15:13 +01:00
Andre Weinand 1816ae96b0 cosmetics 2016-11-22 12:01:38 +01:00
Johannes Rieken d6834d01de fix #15349 2016-11-22 11:57:45 +01:00
Johannes Rieken 9afd40fc21 don't stop to log after first signal, #15456 2016-11-22 11:57:45 +01:00
Joao Moreno beed737999 fixes #15878 2016-11-22 11:51:53 +01:00
Benjamin Pasero b49d66ee0c Zoom level setting should be rounded off before writing to settings file (fixes #15877) 2016-11-22 11:36:37 +01:00
isidor 741bc632fc debug: logToRepl and appendReplOutput should not be exposed by debugService 2016-11-22 11:18:25 +01:00
Joao Moreno 09b67e21d9 fix compile errors 2016-11-22 11:15:45 +01:00
João Moreno daa7a6dd3f Merge pull request #15800 from joaomoreno/dirtydiff
Contributable dirtydiff
2016-11-22 11:06:08 +01:00
João Moreno adf528e1db Merge pull request #15797 from joaomoreno/reference-counted-models
Reference counted (workbench) text models
2016-11-22 11:05:50 +01:00
Joao Moreno f4ae41f9b3 initial proposed SCM api 2016-11-22 11:02:08 +01:00
Johannes Rieken 4993c08066 add test for #15834 2016-11-22 10:49:17 +01:00
Joao Moreno 781d97a04c Merge branch 'master' into dirtydiff 2016-11-22 10:48:28 +01:00
Joao Moreno 2e8ee91650 move dirty diff css to contribution 2016-11-22 10:47:43 +01:00
Joao Moreno 3407c06a91 fixes #13197 2016-11-22 10:44:33 +01:00
Joao Moreno 6913eb58d3 simplify ReferenceCollection 2016-11-22 10:43:08 +01:00
Joao Moreno b560a80a6e fix test 2016-11-22 10:18:01 +01:00
Johannes Rieken 56f5a73f62 update snippet doc with supported variables, #4956 2016-11-22 10:01:57 +01:00
rebornix f298203857 Fix #15799: put git indicators on top of others 2016-11-21 21:48:20 -08:00
Eric Lawrence b9315bbced Fix typos in commonEditorConfig.ts (#15826)
* Fix typo

posibilties => possibilties

* Fix typo
2016-11-21 11:09:04 -08:00
Christof Marti 40ed39d26f Flatten configuration keys for logging (fixes #13653) 2016-11-21 09:23:20 -08:00
Johannes Rieken 6bc6ba5b5a add variable-builder methods to snippet string, #4956 2016-11-21 18:04:01 +01:00
isidor b0780bc908 debug test: adapter merge 2016-11-21 16:59:23 +01:00
Johannes Rieken c68054a9b1 wire up snippets, #4956 2016-11-21 16:19:30 +01:00
Johannes Rieken 646533e008 make parser produce Variable-type, #4956 2016-11-21 16:19:30 +01:00
isidor a0450b317e debug: allow adapters to contribute snippets 2016-11-21 16:06:15 +01:00
isidor 2bd93b9874 json: introduce IJSONSchemaSnippet 2016-11-21 16:06:15 +01:00
isidor 6c792d2b4e debug: remove enableBreakpointsFor schem contribution 2016-11-21 16:06:15 +01:00
Joao Moreno 3eddc66357 createModelReference(...) 2016-11-21 16:00:06 +01:00
Joao Moreno 0b6675494e unwrap reference of promise 2016-11-21 15:58:48 +01:00
Johannes Rieken a56468d05a don't run fwd-slash tests on windows, #4956 2016-11-21 13:50:20 +01:00
Joao Moreno 4783f2756d fix integration tests 2016-11-21 13:05:58 +01:00
Johannes Rieken 90e65b38f8 implement common variables, #4956 2016-11-21 12:50:00 +01:00
Johannes Rieken 79b4365a9f add ISnippetVariableResolver, #4956 2016-11-21 12:50:00 +01:00