jiebi/CodeConvo huggingface dataset:
Change:
} <del> class UnfoldAllRegionsExceptAction extends FoldingAction<void> { </del> <ins> class UnfoldAllExceptAction extends FoldingAction<void> { </ins> constructor() { super({ id: 'editor.unfoldAllExcept', <del> label: nls.localize('unfoldAllExcept.label', "Unfold All Regions Except Selected"), alias: 'Unfold All Regions Except Selected', </del> <ins> label: nls.localize('unfoldAllExcept.label', "Unfold All Except Selected"), alias: 'Unfold All Except Selected', </ins> precondition: CONTEXT_FOLDING_ENABLED, kbOpts: { kbExpr: EditorContextKeys.editorTextFocus,

Discussion:
<!-- Do Not Delete This! bugreporttemplate --<!-- Please read our Rules of Conduct: --<!-- Read our guide about submitting issues: --<!-- Search existing issues to avoid creating duplicates. --<!-- Test using the latest Insiders build to see if your issue has already been fixed: --<!-- Instead of creating your report here, use 'Report Issue' from the 'Help' menu in VS Code to pre-fill useful information. --<!-- Launch with to check. --Does this issue occur when all extensions are disabled?: Yes <!-- If you answered No above, use 'Help: Start Extension Bisect' from Command Palette to try to identify the cause. --<!-- Issues caused by an extension need to be reported directly to the extension publisher. The 'Help Report Issue' dialog can assist with this. --- VS Code Version: 1.80.1 OS Version: Win 10 Pro Steps to Reproduce: some code with several regions and code blocks cursor inside a region, press Ctrl+Shift+P and select "Fold all regions except selected" just the other regions are folded but all code blocks.
Yes, it should fold everything, not just regions. I fix the command label.
Change:
id: 'workbench.action.chat.focusInput', title: localize2('interactiveSession.focusInput.label', "Focus Chat Input"), f1: false, <del> keybinding: { primary: KeyMod.CtrlCmd | KeyCode.DownArrow, weight: KeybindingWeight.WorkbenchContrib, when: ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT.negate()) } </del> <ins> keybinding: [ { primary: KeyMod.CtrlCmd | KeyCode.DownArrow, weight: KeybindingWeight.WorkbenchContrib, when: ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT.negate(), CONTEXT_IN_QUICK_CHAT.negate()), }, { when: ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT.negate(), CONTEXT_IN_QUICK_CHAT), primary: KeyMod.CtrlCmd | KeyCode.UpArrow, weight: KeybindingWeight.WorkbenchContrib, } ] </ins> }); } run(accessor: ServicesAccessor, ...args: any[]) {

Discussion:
uses quick chat and has found that going between the input and the response is cumbersome because of our underlying list structure. This is in particular an issue because we now have many hyperlinked tab stops. ! We should provide a way to go between the input and the focused response. AFAICT, there is not a way to do this. Pressing seems to focus the input (unexpectedly), but there's no way to get back to the response. Thoughts?
Makes sense. Probably just need to handle the keybindings better
these probably just need logic for QC
Tyler figured out that there is a way to do this, but it's in the reverse direction from what one might expect based on tab order. Use to focus the input and to focus the last response.
Talked to JooYoung and it's fine to have these reversed, we'll want to be sure that using doesn't still focus the input box.
working afaict - and for response -input and vice versa, tab works fine as well
Change:
font-style: italic; } <del> .monaco-workbench.vs .repl .repl-tree .output.expression > .warn { color: #cd9731; } .monaco-workbench.vs-dark .repl .repl-tree .output.expression > .warn { color: #cd9731; } .monaco-workbench.hc-black .repl .repl-tree .output.expression > .warn { color: #008000; } </del> /* ANSI Codes */ .monaco-workbench .repl .repl-tree .output.expression .code-bold	{ font-weight: bold; } .monaco-workbench .repl .repl-tree .output.expression .code-italic	{ font-style: italic; }

Discussion:
I stumbled over and saw that there are still many colors hard-coded. Also while at the .css file, it's good practice to qualify all rules with (or ) now that the workbench can be embedded in the web.
Thanks for great feedback. There was some unused CSS, like the .annotation in the repl, so I removed that. I have also now qualifed all with . There is still one hard coded color for in repl, but I believe tackled this with his great PR. Though I might be mistaken?
I did, indeed, add colour contribution points to the REPL as part of but eventually you asked me to defer those until later, I do not remember the reason precisely... So the REPL is still not theme-able, unfortunately.
thanks for refreshing my memory. In case you would like to contribute that part of your PR we are open to accept it now :D From the I only see a need for color, not sure if there is more.
I am working on this now. I am taking it a step further, though, and adding theming to most of the REPL elements (errors, warnings, infos, source filenames etc.). Basically I want the whole REPL view to be fully customisable.
To verify, make sure you can customise the following colors in the debug console. You can use the setting :
Change:
.vscode-light .hljs-literal, .vscode-light .hljs-template-tag, .vscode-light .hljs-template-variable, <del> .vscode-light .hljs-type, .vscode-light .hljs-addition { </del> <ins> .vscode-light .hljs-type { </ins> color: #a31515; } <del> .vscode-light .hljs-deletion, </del> .vscode-light .hljs-selector-attr, .vscode-light .hljs-selector-pseudo, .vscode-light .hljs-meta {

Discussion:
<!-- Please search existing issues to avoid creating duplicates. --<!-- Also please test using the latest insiders build to make sure your issue has not already been fixed: --<!-- Use Help Report Issue to prefill these. --- VSCode Version: 1.28.0 (1.28.0) OS Version: macOS High Sierra 10.13.6 (17G65) Steps to Reproduce: a markdown file preview to the side ! <!-- Launch with to check. --Does this issue occur when all extensions are disabled?: Yes/No Yes
(Experimental duplicate detection) Thanks for submitting this issue. Please also check if it is already covered by an existing one, like: <!-- score: 0.721 --- <!-- score: 0.717 --- <!-- score: 0.672 --- <!-- score: 0.651 --- <!-- score: 0.645 --<!-- potentialduplicatescomment --
Change:
const shell = this._terminalService.getDefaultShell(true, configProvider); const shellArgs = this._terminalService.getDefaultShellArgs(true, configProvider); <ins> const terminalName = args.title || nls.localize('debug.terminal.title', "Debug Process"); </ins> const shellConfig = JSON.stringify({ shell, shellArgs }); <del> let terminal = await this._integratedTerminalInstances.checkout(shellConfig); </del> <ins> let terminal = await this._integratedTerminalInstances.checkout(shellConfig, terminalName); </ins> let cwdForPrepareCommand: string | undefined; let giveShellTimeToInitialize = false;

Discussion:
See I think the best way for this would be for VS Code core to rename the terminal if gets a new request with a different name -- opened an issue for that Or, at least, try to use a terminal of the same name if one exists (which would be easier and probably more feasible since the is not writable.) Code pointer:
Also fyi
I'm going to take a swing at this. Here is my current understanding of the problem and I would appreciate any feedback or comments. The issue - Launching debug sessions in integrated terminal will open duplicate terminals. Solution - Code can attempt to find a terminal instance that has the same title as the launch request and is not currently in use. If located, it can reuse that instance, otherwise it can use the existing logic to create a new instance. I believe this should also address the concerns in as Code will stop spawning new terminal instances for repeat debug sessions. Please let me know if I have any misunderstandings on the issue.
Sounds good to me
I'm looking over the current code for checking out an integrated terminal and came across the minUseDelay for determining which of the terminals is available for use. It was a fix for . As I understand it, when compound node tasks were run, they would all try to grab the same terminal instance so only the first one to run would actually get the terminal, the others would fail to run. By introducing the minUseDelay, it insured that all of the launch tasks would get a new terminal instance. Once microsoft/vscode-js-debug is merged, each Node launch task will most likely have a unique name and therefore a dedicated terminal instance (ideally) which would mean we could always return the first terminal without a child process that has the same title and get rid of minUseDelay. Right?
Obviously if someone had two launch configurations with the same name (why?) this would fall apart.
We could even enforce name-matching and reopen the terminal if nothing's running in it and the name mismatches
Change:
this._onDidChangeInstances.fire(); } <del> getInstanceFromResource(resource: URI | undefined): ITerminalInstance | undefined { </del> <ins> getInstanceFromResource(resource?: URI): ITerminalInstance | undefined { </ins> return getInstanceFromResource(this.instances, resource); }

Discussion:
<!-- Do Not Delete This! bugreporttemplate --<!-- Please read our Rules of Conduct: --<!-- Read our guide about submitting issues: --<!-- Search existing issues to avoid creating duplicates. --<!-- Test using the latest Insiders build to see if your issue has already been fixed: --<!-- Instead of creating your report here, use 'Report Issue' from the 'Help' menu in VS Code to pre-fill useful information. --<!-- Launch with to check. --Does this issue occur when all extensions are disabled?: Yes <!-- If you answered No above, use 'Help: Start Extension Bisect' from Command Palette to try to identify the cause. --<!-- Issues caused by an extension need to be reported directly to the extension publisher. The 'Help Report Issue' dialog can assist with this. --- VS Code Version: 1.59.0 OS Version: Arch Linux Steps to Reproduce: two or more terminals in the panel. one or more terminals into the editor area. ! to rename either an unfocused editor area terminal, or if only one terminal remains in the panel, the panel terminal by right clicking when the editor area has had last focus. ! ! ! name of the most recently focused editor terminal (even if none is presently selected) changes, rather than the right-clicked terminal (whether an unfocused editor area terminal or the unfocused panel terminal). ! Expected behaviour: The name of the terminal selected on right click will be changed.
(Experimental duplicate detection) Thanks for submitting this issue. Please also check if it is already covered by an existing one, like: <!-- score: 0.56 --- <!-- score: 0.536 --- <!-- score: 0.526 --- <!-- score: 0.523 --- <!-- score: 0.514 --<!-- potentialduplicatescomment --
Same applies to color and icon
It's still the case that the active editor terminal, rather than the one that was right-clicked on, is the one that the changes get applied to.
Change:
this.stateModel.setRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN, false); } <del> // Activity bar cannot be hidden if (this.stateModel.getRuntimeValue(LayoutStateKeys.ACTIVITYBAR_HIDDEN) && !this.canActivityBarBeHidden()) { this.stateModel.setRuntimeValue(LayoutStateKeys.ACTIVITYBAR_HIDDEN, false); } </del> this.stateModel.onDidChangeState(change => { if (change.key === LayoutStateKeys.ACTIVITYBAR_HIDDEN) { this.setActivityBarHidden(change.value as boolean);

Discussion:
After updating I see this: ! After some investigation with we found that it's cause by this line in : Which calls into: Which calls in to which accesses state. This is only initialized later in the method though. Rough repro based on memory: 1 (Windows): Update client to latest 1: Set activity bar to top 1: Sync 2 (macOS, old client): Sync (pulls in activity bar top setting?) 2: Update to latest 2: Open client
Thanks for the fix. I got report of this bug from some users and I am asking for developer tools console log (thanks
Change:
/* Icons */ .monaco-workbench > .notifications-toasts .codicon.codicon-error { <del> color: var(--vscode-notificationsErrorIcon-foreground); </del> <ins> color: var(--vscode-notificationsErrorIcon-foreground) !important; </ins> } .monaco-workbench > .notifications-toasts .codicon.codicon-warning { <del> color: var(--vscode-notificationsWarningIcon-foreground); </del> <ins> color: var(--vscode-notificationsWarningIcon-foreground) !important; </ins> } .monaco-workbench > .notifications-toasts .codicon.codicon-info { <del> color: var(--vscode-notificationsInfoIcon-foreground); </del> <ins> color: var(--vscode-notificationsInfoIcon-foreground) !important; </ins> }

Discussion:
Click on an error: <img width="595" alt="image" src="https://user-"
What I see when running from sources: !
in insiders. try with "Notification Tester" extension.
The problem is that the css rule that adds the icon color looses against the color from the list. !
Fix in
Change:
"group": "1_modification@3" }, { <del> "command": "git.revealInExplorer", "when": "scmProvider == git && scmResourceGroup == workingTree", "group": "2_view@1" }, { </del> "command": "git.revealFileInOS.linux", "when": "scmProvider == git && scmResourceGroup == workingTree && remoteName == '' && isLinux", <del> "group": "2_view@2" </del> <ins> "group": "2_view@1" </ins> }, { "command": "git.revealFileInOS.mac", "when": "scmProvider == git && scmResourceGroup == workingTree && remoteName == '' && isMac", <del> "group": "2_view@2" </del> <ins> "group": "2_view@1" </ins> }, { "command": "git.revealFileInOS.windows", "when": "scmProvider == git && scmResourceGroup == workingTree && remoteName == '' && isWindows", <ins> "group": "2_view@1" }, { "command": "git.revealInExplorer", "when": "scmProvider == git && scmResourceGroup == workingTree", </ins> "group": "2_view@2" }, {

Discussion:
<!-- Do Not Delete This! featurerequesttemplate --<!-- Please read our Rules of Conduct: --<!-- Please search existing issues to avoid creating duplicates. --<!-- Describe the feature you'd like. --In the Source Control panel, "Reveal in Explorer View" of context menu is above "Reveal in File Explorer". <img src="" width="300"But context menu of the tabs, "Reveal in Explorer View" is below "Reveal in File Explorer". <img src="" width="300"It's not consistent. It will occur mis-clicking.
Could you triage the issue?
would you be up to swap the order you contribute from the git extension?
Change:
</thead> <tbody><tr> <td><span class="codicon codicon-zap"></span></td> <del> <td><a data-href="#link" title="#link"><span class="codicon codicon-zap"></span>-link</a></td> </del> <ins> <td><a href="" data-href="#link" title="#link"><span class="codicon codicon-zap"></span>-link</a></td> </ins> </tr> </tbody></table> `);

Discussion:
This message right here: <img width="474" alt="image" src="https://user-"When i click on "Don't show again", it doesn't really work: as soon as i navigate to that input field again, it shows the same message again. Version: 1.66.2 Commit: User Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.88 Safari/537.36 Embedder:
says this regressed with
Change:
await this.run(Operation.Branch, () => this.repository.branch(name, true)); } <ins> async merge(name: string): Promise<void> { await this.run(Operation.Merge, () => this.repository.merge(name)); } </ins> async checkout(treeish: string): Promise<void> { await this.run(Operation.Checkout, () => this.repository.checkout(treeish, [])); }

Discussion:
It does not currently appear possible to merge local git branches in VS Code. Quite a common workflow is to have a "development" branch to develop new features on (or alternatively have feature specific branches). When the development is finished, the development branch is then merged into the "master" branch before release. This can be done via the integrated terminal, but as VS Code's git implementation is so wizzy, it would be great to be able to replicate this workflow using the GUI.
I can't believe there aren't more for this... what are the current alternatives? An extension, or have you guys set up a task for this?
+1, I think that feature might be considered priority for the git extension, it's a really nice implementation and with merging, would be perfect. No news?
It'd be lovely to be able to trigger a merge from the command palette, e.g. cmd + shift + p Select a branch to merge from via search-dropdown Any opportunity to avoid having to dip back into the command line is lovely. Thanks in advance!
Weird it is still not implemented and even weirder since we can create and change branch. It spoils the git integration in Code as if the feature was unfinished. We can still rely on built-in terminal or extension but it is not a consistent Code workflow Same for git stash
I also would like to see a Git Merge implemented eventually without going in the console. you might be interested to know that there's an open PR to which will hopefully land soon. There's actually also a PR for but changes were asked over a month ago and it wasn't done yet, so it might not land.
Fixed in
Change:
<section id="main"> <p id="host"></p> <form id="form"> <del> <p><input type="text" id="username" placeholder="Username"/></p> <p><input type="password" id="password" placeholder="Password"/></p> </del> <ins> <p><input type="text" id="username" placeholder="Username" required/></p> <p><input type="password" id="password" placeholder="Password" required/></p> </ins> <p id="buttons"> <input id="ok" type="submit" value="OK" /> <input id="cancel" type="button" value="Cancel" />

Discussion:
<!-- Do you have a question? Please ask it on --Currently using the git integration UI, git tries to push commits before testing if a password was entered. A test should be carried to make sure both fields have been entered before form submission. VSCode Version: 1.9.1 OS Version: Ubuntu 16.04 LTS Steps to Reproduce: a repository eg. changes, then try to push via the tab in the left bar GitHub username field blank OK button. should submit, but fail to push commits because password field was empty
Change:
import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources'; import { sep } from 'vs/base/common/path'; import { toWorkspaceFolders } from 'vs/platform/workspaces/common/workspaces'; <ins> import * as sinon from 'sinon'; </ins> suite('Snippet Variables Resolver', function () {

Discussion:
Issue Type: <bBug</bDoes this issue occur when all extensions are disabled?: Yes Snippets with multiple references to time-based snippet variables (eg. , , ) are not guaranteed to resolve to the same values due to the passage of time during the resolving process. a snippet with with multiple references to the snippet. There is a chance that the first will resolve to a different value than the second . I would expect that VSCode would save the time at the start of the resolution process and use it for the resolution of all time-based snippet variables. This is a time-based issue, so it helps to slow your CPU with heavy load. For example, I ran across this issue while running Folding on my machine. I'll submit a PR momentarily to fix this. VS Code version: Code - Insiders 1.59.0-insider (Universal) (, 2021-07-13T09:15:26.467Z) OS version: Darwin x64 20.5.0 Restricted Mode: Yes <details<summarySystem Info</summary </detailsExtensions: none<details<summaryA/B Experiments</summary</details<!-- generated by issue reporter --
Change:
private _hoverOnLine: number; private _hoverOnColumn: number; private _stickyRangeProjectedOnEditor: IRange | null; <ins> private _candidateDefinitionsLength: number; </ins> constructor( private readonly _editor: ICodeEditor,

Discussion:
Testing Unexpected behavior here: It seems to be scrolling to the right spot but the peek view is partially out of view: ! The file Code - OSS @ : Version: 1.71.0 Commit: Unknown Date: Unknown Electron: 19.0.12 Chromium: 102.0.5005.167 16.14.2 V8: 10.2.154.15-electron.0 OS: Windows_NT x64 10.0. Sandboxed: No
This can happen when a symbol has multiple definition locations. In that case we use peek to show all definitions and we need to make sure that revealing works nicer.
This seems like it's still present on today's Insiders https://user- If it helps to test, this is the file I was using:
Hi Connor, thanks for your bug. This should be solved with the PR: that was created today. The new behavior is: !
The cursor position is still wrong when I try verify on the same file: !
Nvm, tested the wrong version due to delayed insiders today
Change:
if (usePosition) { this.show(position, height); } <ins> this.editor.setPosition(position); </ins> this.editor.focus(); }

Discussion:
<!-- Do Not Delete This! featurerequesttemplate --<!-- Please read our Rules of Conduct: --<!-- Please search existing issues to avoid creating duplicates. --<!-- Describe the feature you'd like. --The actions "Show Previous Change" and "Show Next Change" are pretty handy to jump to changed but not yet committed code locations in a file. It's not nicely usable with keyboard navigation only, because it does not set the cursor to that changed code block. It's necessary to click with the mouse to set the cursor there. IntelliJ has the same feature, but it directly sets the cursor which makes it much more helpful.
could you please take a look at this one? Thanks!
To verify: a diff the commands "Show Previous Change" and "Show Next Change" that your cursor is moved to the change.
]() This still does not set the cursor for the left side of the diff, only the right side for me.
My verification steps were incorrect: a file in a git repo some changes to the file the quick diff. Example: <img width="1562" alt="image" src=""the up and down arrows to show next and previous changes. Verify that the cursor gets placed just above the quick diff.
Verified with latest steps
Change:
input2: string; base: string; result: string; <ins> resetResult?: boolean; </ins> } function toSmallNumbersDec(value: number): string {

Discussion:
<!-- Do Not Delete This! bugreporttemplate --<!-- Please read our Rules of Conduct: --<!-- Read our guide about submitting issues: --<!-- Search existing issues to avoid creating duplicates. --<!-- Test using the latest Insiders build to see if your issue has already been fixed: --<!-- Instead of creating your report here, use 'Report Issue' from the 'Help' menu in VS Code to pre-fill useful information. --<!-- Launch with to check. --Does this issue occur when all extensions are disabled?: Yes <!-- If you answered No above, use 'Help: Start Extension Bisect' from Command Palette to try to identify the cause. --<!-- Issues caused by an extension need to be reported directly to the extension publisher. The 'Help Report Issue' dialog can assist with this. --- VS Code Version: 1.73.0 OS Version: WindowsNT x64 10.0. Steps to Reproduce: a struct with some fields and functions in one branch the same struct in another branch, with a minor difference in one of the fields. the branches and open the merge editor. Accept Combination. On this example, is on the left side and on the right side. I'd expect "Accept Combination" to have only a single copy for the matching lines, and duplicate only the different line (and then I'd choose which one to keep), but it duplicates the entire struct. !
I also see that deleted/deleted is considered a conflict. I see no reason why. !
I also had duplicated code on two occasions when rebasing after the new VSCode update (and that's why I searched for this issue here). It seems that it kept the old code and the new code and didn't complain or considered a change/conflict. I still haven't used , so this duplication happened without using this new feature. In both situations, I had to manually remove the old code. If I find this situation again I will add here its screenshots.
Thanks,
Thank you!
Verification steps: Use the command to open that JSON and notice that conflicts with equal changes on both sides are auto-resolved.