mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #118

Browse Source 
118: Remove error publishing through publishDecorations r=matklad a=aochagavia

The errors are already reported by `publishDiagnostics`

Closes #109 

Co-authored-by: Adolfo Ochagavía <aochagavia92@gmail.com>
This commit is contained in:
bors[bot] 2018-10-11 09:18:33 +00:00
commit 9b155c8976
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crates/ra_editor/src/lib.rs
View File

@ -88,7 +88,6 @@ pub fn highlight(file: &File) -> Vec<HighlightedRange> {
let mut res = Vec::new(); let mut res = Vec::new();
for node in file.syntax().descendants() { for node in file.syntax().descendants() {
let tag = match node.kind() { let tag = match node.kind() {
ERROR => "error",
COMMENT | DOC_COMMENT => "comment", COMMENT | DOC_COMMENT => "comment",
STRING | RAW_STRING | RAW_BYTE_STRING | BYTE_STRING => "string", STRING | RAW_STRING | RAW_BYTE_STRING | BYTE_STRING => "string",
ATTR => "attribute", ATTR => "attribute",
@ -108,21 +107,10 @@ pub fn highlight(file: &File) -> Vec<HighlightedRange> {
} }
pub fn diagnostics(file: &File) -> Vec<Diagnostic> { pub fn diagnostics(file: &File) -> Vec<Diagnostic> {
let mut res = Vec::new(); file.errors().into_iter().map(|err| Diagnostic {
for node in file.syntax().descendants() {
if node.kind() == ERROR {
res.push(Diagnostic {
range: node.range(),
msg: "Syntax Error".to_string(),
});
}
}
res.extend(file.errors().into_iter().map(|err| Diagnostic {
range: TextRange::offset_len(err.offset, 1.into()), range: TextRange::offset_len(err.offset, 1.into()),
msg: err.msg, msg: "Syntax Error: ".to_string() + &err.msg,
})); }).collect()
res
} }
pub fn syntax_tree(file: &File) -> String { pub fn syntax_tree(file: &File) -> String {

7
editors/code/src/highlighting.ts
View File

@ -20,13 +20,6 @@ export class Highlighter {
[string, vscode.TextEditorDecorationType] [string, vscode.TextEditorDecorationType]
> = [ > = [
['background', decor('#3F3F3F')], ['background', decor('#3F3F3F')],
[
'error',
vscode.window.createTextEditorDecorationType({
borderColor: 'red',
borderStyle: 'none none dashed none'
})
],
['comment', decor('#7F9F7F')], ['comment', decor('#7F9F7F')],
['string', decor('#CC9393')], ['string', decor('#CC9393')],
['keyword', decor('#F0DFAF')], ['keyword', decor('#F0DFAF')],