New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix for incorrect highlighting in verbatim strings #13664
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
// evaluates to '\'abc\'' | ||
var multilineExtraQuotes = ''''abc'''' | ||
|
||
// evaluates to '\'\nabc\n\'' | ||
var multilineExtraQuotesNewlines = '''' | ||
abc | ||
'''' | ||
|
||
var multilineSingleLine = '''hello!''' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
|
||
<!-- | ||
Preview this file by prepending http://htmlpreview.github.io/? to its URL | ||
e.g. http://htmlpreview.github.io/?https://raw.githubusercontent.com/Azure/bicep/main/src/highlightjs/test/baselines/strings.html | ||
--> | ||
<html> | ||
<head> | ||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/styles/default.min.css"> | ||
</head> | ||
<body> | ||
<pre class="hljs"> | ||
<span class="hljs-comment">// evaluates to '\'abc\''</span> | ||
<span class="hljs-variable"><span class="hljs-keyword">var</span></span> <span class="hljs-variable">multilineExtraQuotes</span> = <span class="hljs-string">''''abc''''</span> | ||
|
||
<span class="hljs-comment">// evaluates to '\'\nabc\n\''</span> | ||
<span class="hljs-variable"><span class="hljs-keyword">var</span></span> <span class="hljs-variable">multilineExtraQuotesNewlines</span> = <span class="hljs-string">'''' | ||
abc | ||
''''</span> | ||
|
||
<span class="hljs-variable"><span class="hljs-keyword">var</span></span> <span class="hljs-variable">multilineSingleLine</span> = <span class="hljs-string">'''hello!'''</span> | ||
|
||
</pre> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
import { existsSync } from "fs"; | ||
import { writeFile, mkdir, readFile } from "fs/promises"; | ||
import path from "path"; | ||
|
||
export const baselineRecordEnabled = (process.env['BASELINE_RECORD']?.toLowerCase() === 'true'); | ||
|
||
export async function expectFileContents(filePath: string, contents: string) { | ||
if (baselineRecordEnabled) { | ||
await mkdir(path.dirname(filePath), { recursive: true }); | ||
await writeFile(filePath, contents, 'utf-8'); | ||
} else { | ||
// If these assertions fail, use 'npm run test:fix' to replace the baseline files | ||
expect(existsSync(filePath)).toBeTruthy(); | ||
|
||
const readContents = await readFile(filePath, { encoding: 'utf8' }); | ||
expect(contents).toBe(readContents); | ||
} | ||
} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
// evaluates to '\'abc\'' | ||
var multilineExtraQuotes = ''''abc'''' | ||
|
||
// evaluates to '\'\nabc\n\'' | ||
var multilineExtraQuotesNewlines = '''' | ||
abc | ||
'''' | ||
|
||
var multilineSingleLine = '''hello!''' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
|
||
<!-- | ||
Preview this file by prepending http://htmlpreview.github.io/? to its URL | ||
e.g. http://htmlpreview.github.io/?https://raw.githubusercontent.com/Azure/bicep/main/src/monarch/test/baselines/strings.html | ||
--> | ||
<html> | ||
<head> | ||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/styles/default.min.css"> | ||
</head> | ||
<body> | ||
<pre class="hljs"> | ||
<span class="hljs-comment">// evaluates to '\'abc\''</span> | ||
<span class="hljs-keyword">var</span> <span class="hljs-variable">multilineExtraQuotes</span> = <span class="hljs-string">'''</span><span class="hljs-string">'abc</span>'<span class="hljs-string">'''</span> | ||
|
||
<span class="hljs-comment">// evaluates to '\'\nabc\n\''</span> | ||
<span class="hljs-keyword">var</span> <span class="hljs-variable">multilineExtraQuotesNewlines</span> = <span class="hljs-string">'''</span>' | ||
<span class="hljs-string">abc</span> | ||
'<span class="hljs-string">'''</span> | ||
|
||
<span class="hljs-keyword">var</span> <span class="hljs-variable">multilineSingleLine</span> = <span class="hljs-string">'''</span><span class="hljs-string">hello!</span><span class="hljs-string">'''</span> | ||
|
||
|
||
</pre> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
import { existsSync } from "fs"; | ||
import { writeFile, mkdir, readFile } from "fs/promises"; | ||
import path from "path"; | ||
|
||
export const baselineRecordEnabled = (process.env['BASELINE_RECORD']?.toLowerCase() === 'true'); | ||
|
||
export async function expectFileContents(filePath: string, contents: string) { | ||
if (baselineRecordEnabled) { | ||
await mkdir(path.dirname(filePath), { recursive: true }); | ||
await writeFile(filePath, contents, 'utf-8'); | ||
} else { | ||
// If these assertions fail, use 'npm run test:fix' to replace the baseline files | ||
expect(existsSync(filePath)).toBeTruthy(); | ||
|
||
const readContents = await readFile(filePath, { encoding: 'utf8' }); | ||
expect(contents).toBe(readContents); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This logic copied from the bicep-types repo, just to simplify updating of baselines.