jiebi/CodeConvo huggingface dataset:
Change:
CheckIgnore = 'CheckIgnore', GetObjectDetails = 'GetObjectDetails', SubmoduleUpdate = 'SubmoduleUpdate', <ins> RebaseAbort = 'RebaseAbort', </ins> RebaseContinue = 'RebaseContinue', FindTrackingBranches = 'GetTracking', Apply = 'Apply',

Discussion:
It's very common to have to resolve merge conflicts during a pull with rebase. You might decide that you want to stop and try something else. There's no way, that I found, through the source control UI or command palette to properly abort a rebase. You can get into a jam trying to abort, though. Like clicking the branch button in the status bar. You can choose your local branch and have the local branch's contents restored, but Code leaves you in a rebase (and that's no good). You're stuck running on the command line. (I'll upload some pics later when I can contrive some examples... sorry, I didn't capture them while I was causing trouble earlier.)
I'd like to work on the implementation. But there are 2 options when a repository is being rebased: continue and abort. I can add two menu items right under "Pull (Rebase)": "Rebase Continue" and "Rebase Abort". Will it work from the UX perspective?
Rebase continue is already implemented: if you try to commit during a rebase, it will run rebase continue instead. All we're missing is the abort action.
So, adding "Rebase Continue" option under the "Pull (Rebase)" will be ok. Am I right?
This is good to know and takes some exploring to figure out. Are there any good patterns to explain this like during your 1st use of the feature? Or in the docs somewhere? This is a problem any time you combine git commands (like Sync).
We could maybe add that to the docs. :+1: Wanna submit a PR on ?
Hey, to this point (), I don't recall anywhere except maybe the Output | Git log that you can tell that the rebase has continued. There's no obvious status that commits are being replayed or that you may need to wait a few seconds for the next merge conflict to render in the source control explorer (if there are more conflicts) or even if the rebase is "done". You end up needing to check the Git status on the command line anyway. I think if you're going to wrap up the workflow by offering "abort", you need to make the entire experience better.
I did some exploration on supporting rebase features, which is related to this.
looks like your implementation covers git abort and my PR is not required anymore. Closing it.
Change:
if (topOfElementAtDepth > topOfEndLine && topOfElementAtDepth <= bottomOfEndLine) { startLineNumbers.push(start); endLineNumbers.push(end + 1); <del> lastLineRelativePosition = bottomOfEndLine - bottomOfElementAtDepth; </del> <ins> if (topOfElementAtDepth > bottomOfEndLine - lineHeight) { lastLineRelativePosition = bottomOfEndLine - bottomOfElementAtDepth; } </ins> break; } else if (bottomOfElementAtDepth > bottomOfBeginningLine && bottomOfElementAtDepth <= bottomOfEndLine) {

Discussion:
Long lines with Word Wrap on can cause Sticky Scroll to increase in height relative to the long line However the content of the line isn't displayed and it simply covers the screen Steps to Reproduce: file and assign JSON code View -Word Wrap on one/three clicks down ! ! VS Code Version: 1.92.0 OS Version: Windows 11
I see this in markdown too. I came here to report it. With word wrap on the sticky headers cover a good bit of the editor window with blank space. It switches back and forth with normal view as you scroll or resize the pane. !
Same problem in CSS files, when I scroll to the second line that's wrapped, whole file code goes blank <img width="655" alt="Screenshot 2024-09-16 at 10 50 02" src=""
Hi thanks for filing this issue. This happens due to the incorrect calculation of one of the fields in the logic. This should be fixed by
Change:
// if this is a deletion at the very end of the document,then we need to account // for a newline at the end of the last line which may have been deleted // https://github.com/Microsoft/vscode/issues/59670 <del> if (isDeletion && diff.originalStartLineNumber === original.lineCount) { </del> <ins> if (isDeletion && diff.originalEndLineNumber === original.lineCount) { </ins> endLine -= 1; endCharacter = original.lineAt(endLine).range.end.character; }

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.37.1 OS Version: Linux x64 4.15.1-58-generic Steps to Reproduce: trailing newlines from a file under version control. to the Source Control view. to stage the removal of these newlines: right-click on the right-hand side and select "stage selected changes" how there's still one removal that appears to have been left behind. step 3 your removals have all been staged. Expected behaviour: at step 3 the entire newline removal should be staged. Demo video: <!-- Launch with to check. --Does this issue occur when all extensions are disabled?: Yes
Is there anything I missed regarding this issue? Why is this still open?
Nope, I can still reproduce this under VS Code v1.39.1 ~If you haven't checked the video I linked, check it out, it demonstrates the issue better than words can.~ [EDIT] Ah, I see you fixed it, but it hasn't been merged in yet. Not sure what the policy is in this repo regarding closing tickets, but perhaps this one's still open since the fix hasn't hit production yet?
Change:
const confirmResult = await dialogService.confirm({ type: 'info', message: localize('mergeEditor.acceptMerge.unhandledConflicts', "There are still unhandled conflicts. Are you sure you want to accept the merge?"), <del> primaryButton: localize('mergeEditor.acceptMerge.unhandledConflicts.accept', "Accept merge with unhandled conflicts"), </del> <ins> primaryButton: localize('mergeEditor.acceptMerge.unhandledConflicts.accept', "Complete merge with unhandled conflicts"), </ins> secondaryButton: localize('mergeEditor.acceptMerge.unhandledConflicts.cancel', "Cancel"), });

Discussion:
Testing This was feedback I heard from others too—"Accept Merge" is a bit strange since you aren't really accepting a merge so much as the individual changes. I think "Complete Merge" would make more sense here. <img width="265" alt="CleanShot 2022-09-27 at 11 50 56 src="https://user-"
Or maybe "Confirm Merge".
More ideas: I like this - I think "confirm" is usually used to approve an already stated intention and does not fully fit here. ideas?
"Complete Merge" and "Accept Merge" are the best options. I am leaning towards "Complete Merge". fyi
for "Complete Merge"
Change:
this.input.focus(); }); <del> this.createBreakpointInput(dom.append(container, $('.inputContainer'))); </del> <ins> this.inputContainer = $('.inputContainer'); this.createBreakpointInput(dom.append(container, this.inputContainer)); </ins> this.input.getModel().setValue(this.getInputValue(this.breakpoint)); this.toDispose.push(this.input.getModel().onDidChangeContent(() => {

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: -- isn't fixed <!-- Use Help Report Issue to prefill these. --- VSCode Version: 1.37.0 OS Version: Windows 10 !
This works just fine for me on OS X and Win10 with vscode insiders. Can you reproduce with latest vscode insiders !
Thanks. I tried and it is indeed fixed in the insider build. However, I can reproduce it for sure on the stable version. The fix should have been included in June update. (seems it was)
There might be some extension which you are using that is modiyfing css and is breaking this. Sorry but I can not reproduce this, either in stable and in insiders. Also no other user seems to be hitting this. Due to that I will close this issue. And yes the fix was included in the June update.
I find the key to reproduction now. Just put in the and you will see the bug.
Yes I acknowledge the bug. The issue is that the breakpoint widget is not updating as the editor font updates. The size of the widget updates, but the font should update as well. I am open to PR that fix this issue Code pointer
Will have a try
Things look more complicated than we expected.  doesn't feel right. The is of 40px height (with font size set to 16) ! It looks more reasonable if setting the height to 20px ! centering thing. The is centred by the styles of (its parent dom) while gets a hardcoded 8px ... !
yes I acknowledge it is not the nicest. Any improvements in that area would be appreciated.
I have gone too deep down the rabbit hole . Leaving it to whoever interested...
This issue is being closed to keep the number of issues in our inbox on a manageable level, we are closing issues that are not going to be addressed in the foreseeable future: We look at the number of votes the issue has received and the number of duplicate issues filed. More details . If you disagree and feel that this issue is crucial: We are happy to listen and to reconsider. If you wonder what we are up to, please see our and guidelines. Thanks for your understanding and happy coding!

I understand this issue is not that important. But I don't agree this is out of scope . IMHO, it is at least a bug (although with very low priority).
Agree, let's reopen.
Attempted a PR () for this. Please have a look.
Verifier: Change the editor.fontSize, add a conditional breakpoint and make sure the text in the breakpoint widget is centered. Or can just try in VS COde insiders from Thursday and let us know how it behaves for him
Thank you! I confirm it is fixed in the insider build.
Thanks for letting us know. Adding verified label.
Change:
}, 'Executing task: {0}', commandLine), { excludeLeadingNewLine: true }) + this.taskShellIntegrationOutputSequence; } } else { <del> shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence + this.taskShellIntegrationOutputSequence; </del> <ins> shellLaunchConfig.initialText = { text: this.taskShellIntegrationStartSequence + this.taskShellIntegrationOutputSequence, trailingNewLine: false }; </ins> } } else { const commandExecutable = (task.command.runtime !== RuntimeType.CustomExecution) ? CommandString.value(command) : undefined;

Discussion:
!
works in OSS !
also works for me in insider's
works for that exact task for me !
It's because of this: Here's the I was using:
This works but it adds an extra line because of initialText so it doesn't look quite right: Before: ! After: !
Change:
detectLanguage(resource: URI, supportedLangs?: string[]): Promise<string | undefined>; } <ins> export type LanguageDetectionHintConfig = { untitledEditors: boolean; notebookEditors: boolean; }; </ins> //#region Telemetry events export const AutomaticLanguageDetectionLikelyWrongId = 'automaticlanguagedetection.likelywrong';

Discussion:
The candidate fix for was to just disable language detection in notebooks by default. With a bit more time to work on it, a better solution should be derived.
is this fix insider released?
is it now :)
Change:
private _isInLayout: boolean = false; <del> private readonly _viewContext: ViewContext; </del> private _webviewElement: FastDomNode<HTMLElement> | null = null; get webviewElement() {

Discussion:
enough cells in the interactive window that it needs to scroll "interactiveWindow.alwaysScrollOnNewCell": false to the bottom of the IW and execute another cell :bug: scrollbar height changes and is at the bottom, but the new cell isn't visible
Change:
} } <ins> /** * Check if the item being dragged is one of the supported types that can be dropped on an * open editor or editor group. Fixes https://github.com/Microsoft/vscode/issues/52344. * @param e * @returns true if dropping is supported. */ function dropOnEditorSupported(e: DragEvent): boolean { // DataTransfer types are automatically converted to lower case, except Files. const supportedTransferTypes = { openEditor: CodeDataTransfers.EDITORS.toLowerCase(), externalFile: 'Files', codeFile: CodeDataTransfers.FILES.toLowerCase() }; if ( e.dataTransfer.types.indexOf(supportedTransferTypes.openEditor) !== -1 || e.dataTransfer.types.indexOf(supportedTransferTypes.externalFile) !== -1 || // All Code files should already register as normal files, but just to be safe: e.dataTransfer.types.indexOf(supportedTransferTypes.codeFile) !== -1 ) { return true; } else { return false; } } </ins> class EditorGroupRenderer implements IRenderer<IEditorGroup, IEditorGroupTemplateData> { static readonly ID = 'editorgroup';

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.25.0-insider OS Version: Windows 10 Home - 1803 Steps to Reproduce: the Explorer sidebar tab the Outline or File Hierarchy views as if to rearrange them the cursor over an item in the Open Editors view individual editors will change color along with the entire view, making it seem as if you can drop a sidebar view into an open editor and something will happen. What should actually happen is that the view should highlight (since its location will be replaced; it does do this), but the individual items should not be affected. Screenshot: ! I am holding the File Hierarchy view over the file in that screenshot. <!-- Launch with to check. --Does this issue occur when all extensions are disabled?: Yes
I acknowledge the issue, the problem is that the OpenEditor view is not differentiating between drag events PR to fix this is welcome
I was able to add a check to prevent the hover styling unless the item being dragged is another open editor in the list (see ), however this also means that when tabs are dragged over the Open Editors panel (ie, when there's multiple groups; you can drag a tab into a group and it will duplicate into that group), it doesn't have any styling anymore. I couldn't figure out a way to check if the dragged object is a tab. Is that feasible? Where would I look?
yeah it is not so simple You would need to check the dragged data. If there is an elegent solution to fix this please provide a PR. If too complex or computation intensive I would prefer to leave the issue open for now. Thanks
So just to make sure, the only things that should trigger the class on open editors are the open tabs and the other open editors in the list, correct?
no. Dragging resources from the explorer, adn dragging things outside of vscode should also trigger it
Change:
// Broadcast changes this._pauseableEmitter.fire({ rawEvents: [], versionId: this.versionId, synchronous: synchronous, endSelectionState: endSelections }); <del> this._pauseableEmitter.resume(); </del> } <ins> this._pauseableEmitter.resume(); </ins> } }

Discussion:
Cannot create new cells or remove them (I don't have repro steps; it usually stops working after first time creating a new cell) Version: 1.90.0-insider Commit: Date: 2024-05-13T05:59:57.400Z Electron: 29.3.1 ElectronBuildId: Chromium: 122.0.6261.156 20.9.0 V8: 12.2.281.27-electron.0 OS: Darwin arm64 23.4.0
repro: an empty cell in a notebook and execute it a new code cell, clicking or using keybindings a/b :bug: no new cell is , existing cell's editor is focused

When working a python jupyter notebook within vscode, I started occasionally seeing this notification: ! With this in the dev console: cc Version: 1.90.0-insider Commit: Date: 2024-05-03T18:08:45.720Z Electron: 28.2.8 ElectronBuildId: Chromium: 120.0.6099.291 18.18.2 V8: 12.0.267.19-electron.0 OS: Darwin arm64 23.4.0
I still see this in Version: 1.90.0-insider Commit: Date: 2024-05-10T06:01:29.967Z Electron: 28.2.8 ElectronBuildId: Chromium: 120.0.6099.291 18.18.2 V8: 12.0.267.19-electron.0 OS: Darwin arm64 23.4.0 ! !
The most consistent repro I found: auto save a cell with ctrl+enter (so that focus moves to the container) with the cell contents press escape and ctrl+enter again to close the input and then re-run the cell within the 1 second auto-save delay :bug: notification about save failure This specific set of operations will put the edit that removes the output last, and since it started with no output, nothing actually changes for that edit, but the version is still incremented. The fix should take care of any case where an edit doesn't actually update anything.
The latest fix is not released yet, but I started seeing ! with Version: 1.90.0-insider Commit: Date: 2024-05-10T18:24:16.069Z Electron: 29.3.1 ElectronBuildId: Chromium: 122.0.6261.156 20.9.0 V8: 12.2.281.27-electron.0 OS: Darwin arm64 23.4.0
that's probably the same error, but the catch block throws - should be fixed in
Good morning, I am getting a similar error message. I am connected to a VM through SSH. I am able to edit & save the Jupyter Notebook until I run any cell. After running a cell I can no longer save the notebook, even after the cell has finished running. !

Info: Version: 1.90.0-insider (user setup) Commit: Date: 2024-05-13T05:48:48.053Z Electron: 29.3.1 ElectronBuildId: Chromium: 122.0.6261.156 20.9.0 V8: 12.2.281.27-electron.0 OS: Windows_NT x64 10.0.
thanks for the update, sounds like the latest change might have made things worse, I'll take another look.
- is there a specific cell execution behavior that causes this, or just when any cell executes? how long the cell runs for if it produces output if it has an call
I think I found the issue introduced in my previous change
Change:
return ''; } try { <del> const stringValue = new TextDecoder().decode(value.buffer.slice(value.byteOffset)); </del> if (mime === CellOutputMimeTypes.error) { <ins> const stringValue = textDecoder.decode(value.buffer.slice(value.byteOffset)); </ins> return JSON.parse(stringValue); } else if (mime.startsWith('text/') || textMimeTypes.includes(mime)) { <ins> const stringValue = textDecoder.decode(value.buffer.slice(value.byteOffset)); </ins> return splitMultilineString(stringValue); } else if (mime.startsWith('image/') && mime !== 'image/svg+xml') { // Images in Jupyter are stored in base64 encoded format. // VS Code expects bytes when rendering images. <del> // https://developer.mozilla.org/en-US/docs/Glossary/Base64#solution_1_%E2%80%93_escaping_the_string_before_encoding_it return btoa(encodeURIComponent(stringValue).replace(/%([0-9A-F]{2})/g, function (_match, p1) { return String.fromCharCode(Number.parseInt('0x' + p1)); })); </del> <ins> if (typeof Buffer !== 'undefined' && typeof Buffer.from === 'function') { return Buffer.from(value).toString('base64'); } else { // https://developer.mozilla.org/en-US/docs/Glossary/Base64#solution_1_%E2%80%93_escaping_the_string_before_encoding_it const stringValue = textDecoder.decode(value.buffer.slice(value.byteOffset)); return btoa(encodeURIComponent(stringValue).replace(/%([0-9A-F]{2})/g, function (_match, p1) { return String.fromCharCode(Number.parseInt('0x' + p1)); })); } </ins> } else if (mime.toLowerCase().includes('json')) { <ins> const stringValue = textDecoder.decode(value.buffer.slice(value.byteOffset)); </ins> return stringValue.length > 0 ? JSON.parse(stringValue) : stringValue; } else { <ins> const stringValue = textDecoder.decode(value.buffer.slice(value.byteOffset)); </ins> return stringValue; } } catch (ex) {

Discussion:
Issue Type: <bBug</bI was working on a notebook with lots of print output for debugging. 10min in, I could not save and got a notification of "Maximum call stack size exceeded". ! The kernel script was still running and printing hefty objects in a loop. I remember once crashing VS Code with long notebook output, so maybe this is related. Console log: Extension version: 2021.8. VS Code version: Code - Insiders 1.59.0-insider (, 2021-07-22T05:13:00.851Z) OS version: Darwin x64 20.5.0 Restricted Mode: No Remote OS version: Linux x64 5.10.25-linuxkit Fetching remote diagnostics for 'dev-container+7b22686f737450617468223a222f55736572732f64696769746172616c642f7265706f732f6465766469762d6d6574726963732d616e642d616e616c79736573222c2273657474696e6773223a7b22636f6e74657874223a226465736b746f702d6c696e7578227d7d' timed out. <details<summarySystem Info</summary Fetching remote diagnostics for 'dev-container+7b22686f737450617468223a222f55736572732f64696769746172616c642f7265706f732f6465766469762d6d6574726963732d616e642d616e616c79736573222c2273657474696e6773223a7b22636f6e74657874223a226465736b746f702d6c696e7578227d7d' timed out. </details<details<summaryA/B Experiments</summary</details<!-- generated by issue reporter --
Saving while logging long print statements worked fine now.
Change:
if (item) { this.focus(true, item); this.tree.setFocus([item]); <del> } else { </del> <ins> } else if (this.tree.getFocus().length === 0) { </ins> this.tree.setFocus([]); } }

Discussion:
When discussing with how we're going to improve accessibility for GitHub Pull Requests and Issues when opening a PR description we found that the built in Extensions view does the following: Arrow keys are used to navigate between list/tree items Enter opens the extension item and moves focus to the extension description webview editor Space opens the extension item and keeps focus in the tree Extension trees don't work the same way: Arrow keys are used to navigate between list/tree items (same as above) Both enter and space run the tree item command and keep focus in the tree We already have special handling for and command run from the tree view so that we can keep things ctrl+click as open to the side. We should also handle enter and space as the Extensions view does.
Actually, looks like this already works. The problem was that we were preserving focus in the PR extension: I did find another issue while investigating this though: