Fix highlighting of **foo***bar** sequences

Closes: #15

Author: Alhadis

grammars/muse.cson

@@ -141,23 +141,23 @@ repository:
 			# ***Bold italic***
 			name:  "markup.bold.italic.strong.emphasis.muse"
 			begin: "(?<=\\W|^)(\\*{3})(?=\\S)"
-			end:   "(?<=\\S)\\1(?=\\W|$)|(?=^[ \\t]*$)"
+			end:   "(?<=\\S)\\1(?!\\*+\\w)(?=\\W|$)|(?=^[ \\t]*$)"
 			beginCaptures: 1: name: "punctuation.definition.emphasis.begin.muse"
 			endCaptures:   0: name: "punctuation.definition.emphasis.end.muse"
 			patterns: [include: "#inlineInnards"]
 		},{
 			# **Bold**
 			name:  "markup.bold.strong.emphasis.muse"
 			begin: "(?<=\\W|^)(\\*{2})(?=\\S)"
-			end:   "(?<=\\S)\\1(?=\\W|$)|(?=^[ \\t]*$)"
+			end:   "(?<=\\S)\\1(?!\\*+\\w)(?=\\W|$)|(?=^[ \\t]*$)"
 			beginCaptures: 1: name: "punctuation.definition.emphasis.begin.muse"
 			endCaptures:   0: name: "punctuation.definition.emphasis.end.muse"
 			patterns: [include: "#inlineInnards"]
 		},{
 			# *Italic*
 			name:  "markup.italic.emphasis.muse"
 			begin: "(?<=\\W|^)\\*(?=\\S)"
-			end:   "(?<=\\S)\\*(?=\\W|$)|(?=^[ \\t]*$)"
+			end:   "(?<=\\S)\\*(?!\\*+\\w)(?=\\W|$)|(?=^[ \\t]*$)"
 			beginCaptures: 0: name: "punctuation.definition.emphasis.begin.muse"
 			endCaptures:   0: name: "punctuation.definition.emphasis.end.muse"
 			patterns: [include: "#inlineInnards"]
@@ -262,7 +262,7 @@ repository:
 		patterns: [{
 			# Swallow asterisks embedded between word characters.
 			# See: Alhadis/language-emacs-lisp#5, jgm/pandoc#5821
-			match: "(?<=\\w)\\*+(?=\\w)"
+			match: "(?:(?=\\G|^)|(?<=[\\w*]))\\*+(?=\\w)"
 
 		}, include: "#inline"]
 

spec/muse-spec.js

@@ -87,6 +87,16 @@ describe("Muse grammar", () => {
 			expect(lines[1][4]).to.eql({value: "",     scopes: [...baseScopes]});
 			expect(lines[2][0]).to.eql({value: "",     scopes: [...baseScopes]});
 		});
+		
+		it("tokenises `**foo***bar**` correctly", () => {
+			const {tokens} = muse.tokenizeLine("**foo***bar**");
+			const baseScopes = ["text.muse", "meta.document.muse", "markup.bold.strong.emphasis.muse"];
+			expect(tokens[0]).to.eql({value: "**",  scopes: [...baseScopes, "punctuation.definition.emphasis.begin.muse"]});
+			expect(tokens[1]).to.eql({value: "foo", scopes: [...baseScopes]});
+			expect(tokens[2]).to.eql({value: "***", scopes: [...baseScopes]});
+			expect(tokens[3]).to.eql({value: "bar", scopes: [...baseScopes]});
+			expect(tokens[4]).to.eql({value: "**",  scopes: [...baseScopes, "punctuation.definition.emphasis.end.muse"]});
+		});
 	});
 
 	describe("Fixture highlighting", function(){