This is an archive of the discontinued LLVM Phabricator instance.

Differential D115963

[mlir][vscode] Highlight inside c++ raw strings
ClosedPublic

Authored by jpienaar on Dec 17 2021, 11:58 AM.

Details

Reviewers
mehdi_amini
Commits
rG2d4f3ed5517a: [mlir][vscode] Highlight inside c++ raw strings
Summary

Within C++ raw strings with mlir delimitter use MLIR syntax.

Diff Detail

Event Timeline

jpienaar created this revision.Dec 17 2021, 11:58 AM
Herald added subscribers: sdasgup3, wenzhicui, wrengr and 20 others. · View Herald TranscriptDec 17 2021, 11:58 AM
jpienaar requested review of this revision.Dec 17 2021, 11:58 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 17 2021, 11:58 AM
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald Transcript
mehdi_amini accepted this revision.Dec 17 2021, 12:00 PM

Nice!

This revision is now accepted and ready to land.Dec 17 2021, 12:00 PM
Harbormaster completed remote builds in B139893: Diff 395191.Dec 17 2021, 12:37 PM
jpienaar updated this revision to Diff 395203.Dec 17 2021, 12:57 PM

Fixing clang-format warnings

This revision was landed with ongoing or failed builds.Dec 17 2021, 12:58 PM
Closed by commit rG2d4f3ed5517a: [mlir][vscode] Highlight inside c++ raw strings (authored by jpienaar). · Explain Why
This revision was automatically updated to reflect the committed changes.
jpienaar added a commit: rG2d4f3ed5517a: [mlir][vscode] Highlight inside c++ raw strings.
Harbormaster completed remote builds in B139902: Diff 395203.Dec 17 2021, 1:11 PM

Revision Contents

PathSize
mlir/
utils/
vscode/
44 lines
242 lines

Diff 395204

mlir/utils/vscode/cpp-grammar.json

  • This file was added.
{
"scopeName": "source.cpp.mlir",
"injectionSelector": "L:source.cpp",
"patterns": [
{
"include": "#mlir-raw-string"
}
],
"repository": {
"mlir-raw-string": {
"begin": "R\"(?i:mlir)(\\()",
"beginCaptures": {
"0": {
"name": "punctuation.definition.string.begin.cpp"
},
"1": {
"name": "mlir.delimeter.raw.string.cpp"
}
},
"end": "\\)(?i:mlir)\"",
"endCaptures": {
"0": {
"name": "punctuation.definition.string.end.cpp"
},
"1": {
"name": "mlir.delimeter.raw.string.cpp"
}
},
"name": "mlir.raw.string.cpp",
"patterns": [
{
"contentName": "source.mlir",
"begin": "(?!\\G)",
"end": "(?i)(?=\\)mlir\")",
"patterns": [
{
"include": "source.mlir"
}
]
}
]
}
}
}

mlir/utils/vscode/package.json

{ {
"name": "vscode-mlir", "name": "vscode-mlir",
"displayName": "MLIR", "displayName": "MLIR",
"description": "MLIR Language Extension", "description": "MLIR Language Extension",
"version": "0.0.2", "version": "0.0.3",
"publisher": "llvm-vs-code-extensions", "publisher": "llvm-vs-code-extensions",
"homepage": "https://mlir.llvm.org/", "homepage": "https://mlir.llvm.org/",
"icon": "icon.png", "icon": "icon.png",
"engines": { "engines": {
"vscode": "^1.52.0" "vscode": "^1.52.0"
}, },
"categories": [ "categories": [
"Programming Languages" "Programming Languages"
], ],
"keywords": [ "keywords": [
"LLVM", "LLVM",
"MLIR" "MLIR"
], ],
"activationEvents": [ "activationEvents": [
"onLanguage:mlir" "onLanguage:mlir"
], ],
"main": "./out/extension", "main": "./out/extension",
"scripts": { "scripts": {
"vscode:prepublish": "tsc -p ./", "vscode:prepublish": "tsc -p ./",
"compile": "tsc -watch -p ./", "compile": "tsc -watch -p ./",
"format": "clang-format -i --glob=\"{src,test}/*.ts\"", "format": "clang-format -i --glob=\"{src,test}/*.ts\"",
"package": "vsce package", "package": "vsce package",
"publish": "vsce publish", "publish": "vsce publish",
"git-clang-format": "git-clang-format" "git-clang-format": "git-clang-format"
}, },
"dependencies": { "dependencies": {
"chokidar": "3.5.2", "chokidar": "3.5.2",
"vscode-languageclient": "^5.2.1", "vscode-languageclient": "^5.2.1",
"vscode-languageserver-types": "3.16.0" "vscode-languageserver-types": "3.16.0"
}, },
"devDependencies": { "devDependencies": {
"@types/mocha": "^5.2.0", "@types/mocha": "^5.2.0",
"@types/node": "^8.0.0", "@types/node": "^8.0.0",
"@types/vscode": "1.52.*", "@types/vscode": "1.52.*",
"clang-format": "1.4.0", "clang-format": "1.4.0",
"tslint": "^5.16.0", "tslint": "^5.16.0",
"typescript": "^3.5.1", "typescript": "^3.5.1",
"vsce": "^1.75.0", "vsce": "^1.75.0",
"vscode-test": "^1.3.0" "vscode-test": "^1.3.0"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/llvm/vscode-mlir.git" "url": "https://github.com/llvm/vscode-mlir.git"
}, },
"contributes": { "contributes": {
"languages": [ "languages": [
{ {
"id": "mlir", "id": "mlir",
"aliases": [ "aliases": [
"MLIR", "MLIR",
"mlir" "mlir"
], ],
"extensions": [ "extensions": [
".mlir" ".mlir"
], ],
"configuration": "./language-configuration.json" "configuration": "./language-configuration.json"
}, },
{ {
"id": "mlir-injection" "id": "mlir-injection"
} }
], ],
"grammars": [ "grammars": [
{ {
"language": "mlir", "language": "mlir",
"scopeName": "source.mlir", "scopeName": "source.mlir",
"path": "./grammar.json" "path": "./grammar.json"
}, },
{ {
"language": "mlir-injection", "language": "mlir-injection",
"scopeName": "markdown.mlir.codeblock", "scopeName": "markdown.mlir.codeblock",
"path": "markdown-grammar.json", "path": "markdown-grammar.json",
"injectTo": [ "injectTo": [
"text.html.markdown" "text.html.markdown"
], ],
"embeddedLanguages": { "embeddedLanguages": {
"meta.embedded.block.mlir": "mlir" "meta.embedded.block.mlir": "mlir"
} }
},
{
"scopeName": "source.cpp.mlir",
"path": "./cpp-grammar.json",
"injectTo": [
"source.cpp"
],
"embeddedLanguages": {
"source.mlir": "mlir"
}
} }
], ],
"configuration": { "configuration": {
"type": "object", "type": "object",
"title": "MLIR", "title": "MLIR",
"properties": { "properties": {
"mlir.server_path": { "mlir.server_path": {
"scope": "resource", "scope": "resource",
"type": "string", "type": "string",
"description": "The file path of the mlir-lsp-server executable." "description": "The file path of the mlir-lsp-server executable."
}, },
"mlir.onSettingsChanged": { "mlir.onSettingsChanged": {
"type": "string", "type": "string",
"default": "prompt", "default": "prompt",
"description": "Action taken when a setting change requires a server restart to take effect.", "description": "Action taken when a setting change requires a server restart to take effect.",
"enum": [ "enum": [
"prompt", "prompt",
"restart", "restart",
"ignore" "ignore"
], ],
"enumDescriptions": [ "enumDescriptions": [
"Prompt the user for restarting the server", "Prompt the user for restarting the server",
"Automatically restart the server", "Automatically restart the server",
"Do nothing" "Do nothing"
] ]
} }
} }
}, },
"commands": [ "commands": [
{ {
"command": "mlir.restart", "command": "mlir.restart",
"title": "mlir: Restart language server" "title": "mlir: Restart language server"
} }
] ]
} }
} }