Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 22:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
98,963 Commits 3,760 Branches 361 Tags
a3c4e5ffcee85677f1dd7e208cbd32bc84fee4d5
Commit Graph

12658 Commits

Author SHA1 Message Date
Matt Bierner
a9b387204b Add some additional logging to md server (#156007) 
Logs watcher operations
 2022-07-23 00:32:10 +02:00
Peng Lyu
e6ad5f0a6f Update ipynb yarn lock (#156004) 2022-07-22 23:26:14 +02:00
Michael Lively
9428c6650b Merge pull request #155777 from Yoyokrazy/temp 
Added support for jupyter attachment field, embedded image rendering in markdown notebook cells
 2022-07-22 12:04:44 -07:00
ryuurock
42e79ca270 Update typescriptServiceClient.ts, fix naming errors (#155946) 
Update typescriptServiceClient.ts

fix naming errors
 2022-07-22 17:46:48 +00:00
Johannes Rieken
b8876a2d60 enable merge editor by default (#155937) 2022-07-22 11:28:49 +02:00
Matt Bierner
e2006a52da Add npmignore to markdown server (#155898) 
* Add npmignore to markdown server

* Update version
 2022-07-21 16:21:57 -07:00
Matt Bierner
b2daf1af82 Add MD server tracing and update diagnostics on files changes (#155797) 2022-07-21 10:07:06 -07:00
Johannes Rieken
bbbae594da show "Accept Merge" only for files currently under conflict. (#155822) 
While the merge editor shows users can handle merge conflicts outside of it, e.g on the console via `git add <FILE>`. The merge editor should have this graceful and step one is to hide the "Accept Merge" command when the file isn't conflicting anymore

* Adds a git-context key that contains all resource-uri-strings under conflict
* Enable/placement of the Accept Merge command is driven by that
* some merge editor context key sugar
 2022-07-21 13:25:23 +02:00
Angelo
cef02dae8d Contribute to html language server with a custom language. (#146731) 
* Contribute to html language server with a custom language.

Fixes #146730

Signed-off-by: azerr <azerr@redhat.com>

* refactor out LanguageParticipants

* restart client on language selector change

* htmlLanguage -> htmlLanguageParticipants

* tune autoInsert wording

* tune autoInsert description

Co-authored-by: azerr <azerr@redhat.com>
Co-authored-by: Martin Aeschlimann <martinae@microsoft.com>
 2022-07-21 13:19:01 +02:00
Benjamin Pasero
6cad4b9494 skip test & 💄 (#155826) 2022-07-21 12:47:23 +02:00
Ladislau Szomoru
ace330ba2c SCM - Fixed a regression due to which post-commit commands were not being executed (#155824) 
Fixed a regression due to which post-commit commands were not being executed
 2022-07-21 12:25:15 +02:00
Matt Bierner
924dde5c1e Documenting markdown LS (#155789) 2022-07-21 11:48:30 +02:00
Benjamin Pasero
477af8c842 skip flaky test (#152145) (#155809) 2022-07-21 11:46:51 +02:00
Ladislau Szomoru
cd90b2b5ad Git - Add telemetry comments (#155811) 
Add telemetry comments
 2022-07-21 09:34:19 +02:00
Ladislau Szomoru
e0e7ad368e Git - Enable action button while rebasing (#155744) 
Enable action button while rebasing
 2022-07-20 23:35:05 -07:00
Michael Lively
eaf321d50d formatting 2022-07-20 16:12:32 -07:00
Michael Lively
63142212a1 remove md-it dependency, added undefined check to attachments 2022-07-20 16:10:54 -07:00
Michael Lively
ff31f6b577 Update package.json 2022-07-20 15:01:40 -07:00
Michael Lively
3a23dda32c removed commented code 2022-07-20 13:47:26 -07:00
Michael Lively
d7b6596808 yarn.lock with yarnpkg instead of npm 2022-07-20 12:35:42 -07:00
Michael Lively
6a73a0d22d rm package-lock.json 2022-07-20 12:25:57 -07:00
Michael Lively
1b59f566bb rendering of attachment images complete via tokens 2022-07-20 12:23:37 -07:00
Michael Lively
735ead82f5 added attachment and metadata support back in... rebasing is scary 2022-07-20 12:23:37 -07:00
Michael Lively
3981a5804c added build stuff 2022-07-20 12:23:37 -07:00
Michael Lively
0fa857c9a1 okay now things are actually fresh and working 2022-07-20 12:23:24 -07:00
Ladislau Szomoru
f19251a4ca Git - Use GIT_EDITOR environment variable to suppress the git commit editor during rebase (#155748) 
Use GIT_EDITOR environment variable to suppress the git commit editor during rebase
 2022-07-20 17:52:56 +02:00
Ping
0b2c56eb7b Fix #114461 (#151824) 
suppress the editor during git rebase, fix #114461

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2022-07-20 15:03:43 +02:00
Martin Aeschlimann
d0769c7e7f [html] update service and fix url resolving (#155725) 2022-07-20 14:38:10 +02:00
Martin Aeschlimann
28be5d9906 Configurations ${WorkSpace} autocomplete broken after update (#155713) 
Configurations ${WorkSpace} autocomplete broken after update. Fixes #155638
 2022-07-20 08:01:52 -04:00
Johannes Rieken
ce5d92e998 use commit-icon for description, tweak codicon font-size (#155714) 
https://github.com/microsoft/vscode/issues/150863
 2022-07-20 13:49:24 +02:00
Johannes Rieken
7cdaa57928 also default to opening merge editor when conflict is about adding (#155711) 
fixes https://github.com/microsoft/vscode/issues/153737#issuecomment-1189357241
 2022-07-20 12:36:08 +02:00
Matt Bierner
32f5e49082 Move MD diagnostics to language server (#155653) 
* Move MD diagnostics to language server

This switches us to using the LSP pull diagnostic model with a new version of the language service

* Bump package version

* Delete unused file
 2022-07-19 16:34:09 -07:00
Ladislau Szomoru
03c16c9c00 Git - The git.sync command should use the git.rebaseWhenSync setting (#155511) 
The git.sync command should use the git.rebaseWhenSync setting
 2022-07-18 18:38:58 +02:00
Ladislau Szomoru
b3218963c4 Git - Do not show SmartCommit dialog when using "Commit All" (#155486) 
Do not show SmartCommit dialog when using "Commit All"
 2022-07-18 16:55:41 +02:00
Johannes Rieken
8bada27fdd Merge pull request #155148 from microsoft/joh/double-barnacle 
joh/double barnacle
 2022-07-18 16:45:00 +02:00
Joyce Er
73b34320c1 Add ability to continue desktop edit session in vscode.dev 2022-07-15 15:51:51 -07:00
Martin Aeschlimann
e225afee30 Add syntax highlighting for .env files without extensions (#155298) 
Add syntax highlighting for .env files without extensions. Fixes #154111
 2022-07-15 12:24:40 +00:00
Matt Bierner
394eaa9fa3 Fix md document links for untitled files (#155248) 2022-07-14 18:15:13 -07:00
Joyce Er
a0c9ebe6b4 Disable chunking to prevent importScripts calls in web (#155226) 2022-07-14 18:55:38 +00:00
Johannes Rieken
1878583319 read REBASE_HEAD when rebasing, swap yours/theirs (label, sides) as well (#155208) 
https://github.com/microsoft/vscode/issues/153737
 2022-07-14 09:23:44 -07:00
Ladislau Szomoru
ee18db8144 Sync Changes button - only show when local branch is ahead/behind the remote branch (#155192) 
Only show Sync Changes button when local branch is ahead/behind the remote branch
 2022-07-14 13:51:47 +00:00
Ladislau Szomoru
70a1ebd595 Git - Add events to IPostCommitCommandsProviderRegistry (#155051) 
* Add events to IPostCommitCommandsProviderRegistry

* Pull request feedback
 2022-07-14 10:46:57 +02:00
Johannes
0f0101be5f use TabInputTextMerge in git extensions 
For now only when checking for tabs, not yet for opening tabs
 2022-07-14 09:41:54 +02:00
Ladislau Szomoru
f6332bd86d Git - Use cloud icon for remote branches (#155140) 
Use cloud icon for remote branches
 2022-07-14 08:55:29 +02:00
Matt Bierner
9ee8961347 Move MD references, rename, and definition support to md LS (#155127) 2022-07-14 08:32:27 +02:00
Matt Bierner
867acc336f Remove references to finalized drop api (#155128) 2022-07-14 08:27:25 +02:00
Matt Bierner
50056f3e78 Finalize drop into editor api (#155102) 
Fixes #142990
Fixes #149779
 2022-07-13 12:54:52 -07:00
Matt Bierner
bec36ce756 Move md path completions and document links to language server (#155100) 2022-07-13 12:49:37 -07:00
Ladislau Szomoru
bc51adde6f git - Add localization comment for Publish Branch action button (#155053) 
* Add localization comment for Publish Branch action button

* Pull request feedback
 2022-07-13 14:39:18 +00:00
Rich Chiodo
052d5b0027 Fix issue with kernel preselection being overridden by view state (#154968) 
* Fix view state overriding selected kernel

* Add test to verify correct kernel is used
 2022-07-12 18:03:49 -07:00