kopia lustrzana https://github.com/c9/core
handle git conflict status in terminal hover_link
rodzic
6cd0202b41
commit
740ef7edf7
|
@ -309,7 +309,7 @@ var HoverLink = function(editor) {
|
||||||
else if (prompt.command === "git") { // git status
|
else if (prompt.command === "git") { // git status
|
||||||
var prefix = line.substr(0, match.start);
|
var prefix = line.substr(0, match.start);
|
||||||
if (match.start + value.length == line.length
|
if (match.start + value.length == line.length
|
||||||
&& /^(#|[ MDR?A]{2})\s+([\w\s]+:\s+)?$/.test(prefix)
|
&& /^(#|[ MDRU?A]{2})\s+([\w\s]+:\s+)?$/.test(prefix)
|
||||||
) {
|
) {
|
||||||
match.type = "path";
|
match.type = "path";
|
||||||
} else {
|
} else {
|
||||||
|
|
Ładowanie…
Reference in New Issue