Skip to content

/ MagicPython

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

No difference between single and double quoted strings #172

Open
SylannBin opened this issue Jan 13, 2019 · 1 comment
Open

No difference between single and double quoted strings #172

SylannBin opened this issue Jan 13, 2019 · 1 comment
Assignees
@vpetrovykh

Comments

@SylannBin
Copy link

@SylannBin SylannBin commented Jan 13, 2019

Ok I'm sorry if I don't take the time to use your template and try to prepare a pull request and all that stuff. I'm just not used to it.

I already spent much time on solving the issue for myself. And I only post here to share my solution.

If somebody is experimented with pull requests and all those things, below is my diff.

Also, if anybody finds this issue from google they will have the option to just apply the diff.

SOLUTION

Put the fix-string-quoted-double.patch (file below) in the relevant location of the extension.
Should be something like ~/.vscode/extensions/magicstack.magicpython-1.1.0/grammars/src

Then go to this location and execute git apply fix-string-quoted-double.patch

fix-string-quoted-double.patch

diff --git a/MagicPython.syntax.yaml b/MagicPython.syntax.yaml
index f885059..c6f6ae4 100644
--- a/MagicPython.syntax.yaml
+++ b/MagicPython.syntax.yaml
@@ -86,7 +86,7 @@ repository:
 
     - file: 'regexp.wrapper.syntax.yaml'
       vars:
-        scopename: string.regexp.quoted.single.python
+        scopename: string.regexp.quoted.double.python
         prefix: 'double-one-'
         basename: 'regexp'
         nested: ''
@@ -160,7 +160,7 @@ repository:
 
     - file: 'regexp.wrapper.syntax.yaml'
       vars:
-        scopename: string.regexp.quoted.single.python
+        scopename: string.regexp.quoted.double.python
                    string.interpolated.python
         prefix: 'double-one-'
         basename: 'fregexp'
@@ -183,7 +183,13 @@ repository:
     - file: 'pystring.inc.syntax.yaml'
       vars:
         line: single
-        marker: (['"])
+        marker: "'"
+        guard: "|((?<!\\\\)\\n)"
+
+    - file: 'pystring.inc.syntax.yaml'
+      vars:
+        line: double
+        marker: '"'
         guard: "|((?<!\\\\)\\n)"
 
     - file: 'pystring.inc.syntax.yaml'
@@ -195,7 +201,14 @@ repository:
     - file: 'pyfstring.inc.syntax.yaml'
       vars:
         line: single
-        marker: (['"])
+        marker: "'"
+        fguard: "|(?=\\n)"
+        guard: "|((?<!\\\\)\\n)"
+
+    - file: 'pyfstring.inc.syntax.yaml'
+      vars:
+        line: double
+        marker: '"'
         fguard: "|(?=\\n)"
         guard: "|((?<!\\\\)\\n)"
 
@@ -666,18 +679,25 @@ repository:
   string:
     patterns:
       - include: '#string-quoted-multi-line'
+      - include: '#string-quoted-double-line'
       - include: '#string-quoted-single-line'
       - include: '#string-bin-quoted-multi-line'
+      - include: '#string-bin-quoted-double-line'
       - include: '#string-bin-quoted-single-line'
       - include: '#string-raw-quoted-multi-line'
+      - include: '#string-raw-quoted-double-line'
       - include: '#string-raw-quoted-single-line'
       - include: '#string-raw-bin-quoted-multi-line'
+      - include: '#string-raw-bin-quoted-double-line'
       - include: '#string-raw-bin-quoted-single-line'
       - include: '#fstring-fnorm-quoted-multi-line'
+      - include: '#fstring-fnorm-quoted-double-line'
       - include: '#fstring-fnorm-quoted-single-line'
       - include: '#fstring-normf-quoted-multi-line'
+      - include: '#fstring-normf-quoted-double-line'
       - include: '#fstring-normf-quoted-single-line'
       - include: '#fstring-raw-quoted-multi-line'
+      - include: '#fstring-raw-quoted-double-line'
       - include: '#fstring-raw-quoted-single-line'
 
   string-unicode-guts:
@alexr00 alexr00 mentioned this issue Jan 15, 2019
Closed
@alexr00 alexr00 mentioned this issue Jul 21, 2020
Closed
@sbland
Copy link

@sbland sbland commented Jul 28, 2020

Has this been implemented yet I still have this issue in VScode with Python
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@vpetrovykh vpetrovykh

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
3 participants
@vpetrovykh @sbland @SylannBin
You can’t perform that action at this time.