Fix odd highlighting of strings and comments after '.'.

Author: vpetrovykh

grammars/MagicPython.cson

@@ -366,7 +366,17 @@ repository:
     ]
   "member-access":
     begin: "\\.\\s*(?!\\.)"
-    end: "(?<=\\S)(?=\\W)|$"
+    end: '''
+      (?x)
+        # stop when you've just read non-whitespace followed by non-word
+        # i.e. when finished reading an identifier or function call
+        (?<=\\S)(?=\\W) |
+        # stop when seeing the start of something that's not a word,
+        # i.e. when seeing a non-identifier
+        (^|(?<=\\s))(?=[^\\\\\\w\\s]) |
+        $
+      
+    '''
     patterns: [
       {
         include: "#function-call"

grammars/MagicPython.tmLanguage

@@ -563,7 +563,15 @@
         <key>begin</key>
         <string>\.\s*(?!\.)</string>
         <key>end</key>
-        <string>(?&lt;=\S)(?=\W)|$</string>
+        <string>(?x)
+  # stop when you've just read non-whitespace followed by non-word
+  # i.e. when finished reading an identifier or function call
+  (?&lt;=\S)(?=\W) |
+  # stop when seeing the start of something that's not a word,
+  # i.e. when seeing a non-identifier
+  (^|(?&lt;=\s))(?=[^\\\w\s]) |
+  $
+</string>
         <key>patterns</key>
         <array>
           <dict>

grammars/src/MagicPython.syntax.yaml

@@ -267,7 +267,15 @@ repository:
 
   member-access:
     begin: \.\s*(?!\.)
-    end: (?<=\S)(?=\W)|$
+    end: |
+      (?x)
+        # stop when you've just read non-whitespace followed by non-word
+        # i.e. when finished reading an identifier or function call
+        (?<=\S)(?=\W) |
+        # stop when seeing the start of something that's not a word,
+        # i.e. when seeing a non-identifier
+        (^|(?<=\s))(?=[^\\\w\s]) |
+        $
     patterns:
       - include: '#function-call'
       - include: '#member-access-base'

test/expressions/expr19.py

@@ -0,0 +1,44 @@
+a. #foo
+a.
+#foo
+a. \
+#foo
+a. 'bar'
+a.
+'bar'
+a. \
+'bar'
+
+
+
+a             : source.python
+.             : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+foo           : comment.line.number-sign.python, source.python
+a             : source.python
+.             : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+foo           : comment.line.number-sign.python, source.python
+a             : source.python
+.             : source.python
+\             : separator.continuation.line.python, source.python
+              : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+foo           : comment.line.number-sign.python, source.python
+a             : source.python
+.             : source.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+bar           : source.python, string.quoted.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
+a             : source.python
+.             : source.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.single.python
+bar           : source.python, string.quoted.docstring.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.single.python
+a             : source.python
+.             : source.python
+\             : separator.continuation.line.python, source.python
+              : source.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+bar           : source.python, string.quoted.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.single.python