meta value starts after a name on the same line

This commit is contained in:
tophf 2018-01-04 10:58:43 +03:00
parent d94b9a0ab7
commit e6d04fad6d

View File

@ -359,7 +359,6 @@ var usercss = (() => {
} }
function parseStringToEnd(state) { function parseStringToEnd(state) {
rewindToEOL(state);
const EOL = posOrEnd(state.text, '\n', state.re.lastIndex); const EOL = posOrEnd(state.text, '\n', state.re.lastIndex);
const match = state.text.slice(state.re.lastIndex, EOL); const match = state.text.slice(state.re.lastIndex, EOL);
state.value = unquote(match.trim()); state.value = unquote(match.trim());
@ -388,10 +387,6 @@ var usercss = (() => {
return pos < 0 ? haystack.length : pos; return pos < 0 ? haystack.length : pos;
} }
function rewindToEOL({re, text}) {
re.lastIndex -= text[re.lastIndex - 1] === '\n' ? 1 : 0;
}
function buildMeta(sourceCode) { function buildMeta(sourceCode) {
sourceCode = sourceCode.replace(/\r\n?/g, '\n'); sourceCode = sourceCode.replace(/\r\n?/g, '\n');
@ -408,7 +403,7 @@ var usercss = (() => {
}; };
const {text, index: metaIndex} = getMetaSource(sourceCode); const {text, index: metaIndex} = getMetaSource(sourceCode);
const re = /@(\w+)\s+/mg; const re = /@(\w+)[ \t\xA0]*/mg;
const state = {style, re, text, usercssData}; const state = {style, re, text, usercssData};
function doParse() { function doParse() {
@ -455,9 +450,7 @@ var usercss = (() => {
doParse(); doParse();
} catch (e) { } catch (e) {
// grab additional info // grab additional info
let pos = state.re.lastIndex; e.index = metaIndex;
while (pos && /[\s\n]/.test(state.text[--pos])) { /**/ }
e.index = metaIndex + pos;
throw e; throw e;
} }