opendev/gerrit
Code Issues Proposed changes

Merge "Handle wchar_t escape sequences in syntax workaround"

Browse Source
This commit is contained in:
Wyatt Allen
2017-04-04 19:48:39 +00:00
committed by Gerrit Code Review
parent 01db2e524f 8bbb4bb80d
commit 91164f7cae
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
View File

@@ -78,7 +78,7 @@
}; };
var CPP_DIRECTIVE_WITH_LT_PATTERN = /^\s*#(if|define).*</; var CPP_DIRECTIVE_WITH_LT_PATTERN = /^\s*#(if|define).*</;
var CPP_WCHAR_PATTERN = /L\'.\'/g; var CPP_WCHAR_PATTERN = /L\'(\\)?.\'/g;
var JAVA_PARAM_ANNOT_PATTERN = /(@[^\s]+)\(([^)]+)\)/g; var JAVA_PARAM_ANNOT_PATTERN = /(@[^\s]+)\(([^)]+)\)/g;
var GO_BACKSLASH_LITERAL = '\'\\\\\''; var GO_BACKSLASH_LITERAL = '\'\\\\\'';
var GLOBAL_LT_PATTERN = /</g; var GLOBAL_LT_PATTERN = /</g;
@@ -360,7 +360,7 @@
* {#see https://github.com/isagalaev/highlight.js/issues/1412} * {#see https://github.com/isagalaev/highlight.js/issues/1412}
*/ */
if (CPP_WCHAR_PATTERN.test(line)) { if (CPP_WCHAR_PATTERN.test(line)) {
line = line.replace(CPP_WCHAR_PATTERN, 'L"."'); line = line.replace(CPP_WCHAR_PATTERN, 'L"$1."');
} }
return line; return line;

5
polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer_test.html
View File

@@ -456,6 +456,11 @@ limitations under the License.
line = 'wchar_t myChar = L\'#\''; line = 'wchar_t myChar = L\'#\'';
var expected = 'wchar_t myChar = L"."'; var expected = 'wchar_t myChar = L"."';
assert.equal(element._workaround('cpp', line), expected); assert.equal(element._workaround('cpp', line), expected);
// Converts wchar_t character literal with escape sequence to string.
line = 'wchar_t myChar = L\'\\"\'';
expected = 'wchar_t myChar = L"\\."';
assert.equal(element._workaround('cpp', line), expected);
}); });
test('workaround go backslash character literals', function() { test('workaround go backslash character literals', function() {