hugs7
commented
3 months ago For what it's worth, doing this in the command line with git add -p then following the commands works without issue. Is VSCode using git add -p or doing something else?
D:\Redacted\Documents\Redacted\Redacted>git add -p client/src/components/LetterWriter/toolbar/WriterToolbar.tsx
diff --git a/client/src/components/LetterWriter/toolbar/WriterToolbar.tsx b/client/src/components/LetterWriter/toolbar/WriterToolbar.tsx
index 4d71187..665840b 100644
--- a/client/src/components/LetterWriter/toolbar/WriterToolbar.tsx
+++ b/client/src/components/LetterWriter/toolbar/WriterToolbar.tsx
@@ -33,9 +33,10 @@ import {
UNDO_COMMAND,
REDO_COMMAND,
LexicalEditor,
+ KEY_MODIFIER_COMMAND,
} from "lexical";
import { $setBlocksType } from "@lexical/selection";
-import { $isLinkNode } from "@lexical/link";
+import { $isLinkNode, TOGGLE_LINK_COMMAND } from "@lexical/link";
import {
$isListNode,
INSERT_CHECK_LIST_COMMAND,
(1/6) Stage this hunk [y,n,q,a,d,j,J,g,/,s,e,?]? n
@@ -85,14 +86,17 @@ import IconButton from "../../Inputs/IconButton";
import { RadioOption } from "../../Inputs/RadioInput";
import { TbFlask, TbLetterA, TbLetterASmall, TbTextResize } from "react-icons/tb";
import { GrDocument } from "react-icons/gr";
-import { getSelectedNode } from "../getSelectedNode";
+import { getSelectedNode } from "../utils/getSelectedNode";
import { FaCircle, FaRegCircle, FaRegSquareFull, FaSquareFull } from "react-icons/fa6";
import { TOOLBAR_ICON_SIZE } from "../../../../constants/sizing";
import { INSERT_PAGE_BREAK } from "../plugins/PageBreakPlugin";
import { PARSE_REFERENCES_COMMAND, TOGGLE_REFERENCES_COMMAND } from "../plugins/ReferencePlugin";
+import { Dispatch } from "../../../utils/record";
+import { sanitizeUrl } from "../../../utils/url";
interface ToolbarProps {
toolbarRef: React.RefObject<HTMLDivElement>;
+ setIsLinkEditMode: Dispatch<boolean>;
}
class InvalidTagError extends Error {
(2/6) Stage this hunk [y,n,q,a,d,K,j,J,g,/,s,e,?]? s
Split into 3 hunks.
@@ -85,8 +86,8 @@ import IconButton from "../../Inputs/IconButton";
import { RadioOption } from "../../Inputs/RadioInput";
import { TbFlask, TbLetterA, TbLetterASmall, TbTextResize } from "react-icons/tb";
import { GrDocument } from "react-icons/gr";
-import { getSelectedNode } from "../getSelectedNode";
+import { getSelectedNode } from "../utils/getSelectedNode";
import { FaCircle, FaRegCircle, FaRegSquareFull, FaSquareFull } from "react-icons/fa6";
import { TOOLBAR_ICON_SIZE } from "../../../../constants/sizing";
import { INSERT_PAGE_BREAK } from "../plugins/PageBreakPlugin";
import { PARSE_REFERENCES_COMMAND, TOGGLE_REFERENCES_COMMAND } from "../plugins/ReferencePlugin";
(2/8) Stage this hunk [y,n,q,a,d,K,j,J,g,/,e,?]? y
@@ -89,7 +90,9 @@
import { FaCircle, FaRegCircle, FaRegSquareFull, FaSquareFull } from "react-icons/fa6";
import { TOOLBAR_ICON_SIZE } from "../../../../constants/sizing";
import { INSERT_PAGE_BREAK } from "../plugins/PageBreakPlugin";
import { PARSE_REFERENCES_COMMAND, TOGGLE_REFERENCES_COMMAND } from "../plugins/ReferencePlugin";
+import { Dispatch } from "../../../utils/record";
+import { sanitizeUrl } from "../../../utils/url";
interface ToolbarProps {
toolbarRef: React.RefObject<HTMLDivElement>;
(3/8) Stage this hunk [y,n,q,a,d,K,j,J,g,/,e,?]? d
D:\Redacted\Documents\Redacted\Redacted>git st
On branch 5-custom-email-templates
Your branch is up to date with 'origin/5-custom-email-templates'.
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
modified: client/src/components/LetterWriter/toolbar/WriterToolbar.tsx
renamed: client/src/components/LetterWriter/getSelectedNode.tsx -> client/src/components/LetterWriter/utils/getSelectedNode.tsx
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: client/src/components/LetterWriter/LetterWriter.tsx
modified: client/src/components/LetterWriter/toolbar/WriterToolbar.tsx
Untracked files:
(use "git add <file>..." to include in what will be committed)
client/src/components/LetterWriter/plugins/AutoLinkPlugin.tsx
client/src/components/LetterWriter/plugins/FloatingLinkEditorPlugin/
client/src/components/LetterWriter/plugins/LinkPlugin.tsx
client/src/components/LetterWriter/utils/canUseDOM.ts
client/src/components/LetterWriter/utils/setFloatingElemPositionForLinkEditor.ts
client/src/utils/url.ts
lszomoru
Matesaktesak
vs-code-engineering[bot]
Does this issue occur when all extensions are disabled?: Yes/No
VS Code Version:
OS Version: Edition Windows 11 Pro Version 23H2 Installed on 22/09/2022 OS build 22631.3810 Experience Windows Feature Experience Pack 1000.22700.1020.0
Steps to Reproduce:
Hey team. Think I've uncovered a bug with the stage selected / stage selected range feature in the latest VSCode Update. E.g. I've got a file
/client/src/LetterWriter/toolbar/WriterToolbar.tsxwhere I want to stage just this change on line 88. See image belowWhen I click this + here, the following happens. For some reason VSCode thinks the capitalisation of the direct parent folder (actually
toolbarwith a lowercase "t") has changed to an uppercase. As seen below it duplicates the file in the working tree and the staged changes show the uppercase "T".Is this a git bug somehow (Edit: I don't think so given my first comment)? On Github, the path is definitely lowercase and the same on my local disk. See below:
I've tried clearing git cache but this issue is persistent and I've encountered the same issue with other folders too :(. I haven't ever changed the capitalisation of this
toolbarfolder.The change (line 88) does move from the working tree but only on the file with the incorrect path. Before a recent update this feature worked perfectly. Has something changed? I really like this feature and it would be good if it could be fixed.
A
git statusdoes also show the same as VSCode's src control tab so I'm wondering if the issue might be there instead.