Remove the deprecated MarkedString (#2302)

This commit is contained in:
Segev Finer 2019-02-07 03:26:48 +02:00 коммит произвёл Ramya Rao
Родитель 89484872a1
Коммит f0cc90bd19
2 изменённых файлов: 11 добавлений и 11 удалений

Просмотреть файл

@ -6,7 +6,7 @@
'use strict';
import vscode = require('vscode');
import { HoverProvider, Hover, MarkedString, TextDocument, Position, CancellationToken, WorkspaceConfiguration } from 'vscode';
import { HoverProvider, Hover, TextDocument, Position, CancellationToken, WorkspaceConfiguration } from 'vscode';
import { definitionLocation } from './goDeclaration';
export class GoHoverProvider implements HoverProvider {
@ -33,10 +33,10 @@ export class GoHoverProvider implements HoverProvider {
.map(line => line.replace(/\t/g, ' '));
let text;
text = lines.join('\n').replace(/\n+$/, '');
let hoverTexts: MarkedString[] = [];
hoverTexts.push({ language: 'go', value: text });
let hoverTexts = new vscode.MarkdownString();
hoverTexts.appendCodeblock(text, 'go');
if (definitionInfo.doc != null) {
hoverTexts.push(definitionInfo.doc);
hoverTexts.appendMarkdown(definitionInfo.doc);
}
let hover = new Hover(hoverTexts);
return hover;

Просмотреть файл

@ -132,12 +132,12 @@ suite('Go Extension Tests', () => {
assert.equal(res, null);
return;
}
assert.equal(expectedSignature, (<{ language: string; value: string }>res.contents[0]).value);
if (expectedDocumentation === null) {
return;
let expectedHover = '\n```go\n' + expectedSignature + '\n```\n';
if (expectedDocumentation != null) {
expectedHover += expectedDocumentation;
}
assert.equal(res.contents.length, 2);
assert.equal(expectedDocumentation, <string>(res.contents[1]));
assert.equal(res.contents.length, 1);
assert.equal((<vscode.MarkdownString>res.contents[0]).value, expectedHover);
})
);
return Promise.all(promises);
@ -228,10 +228,10 @@ encountered.
[new vscode.Position(23, 14), null, null], // inside a string
[new vscode.Position(20, 0), null, null], // just a }
[new vscode.Position(28, 16), null, null], // inside a number
[new vscode.Position(22, 5), 'main func()', null],
[new vscode.Position(22, 5), 'main func()', '\n'],
[new vscode.Position(40, 23), 'import (math "math")', null],
[new vscode.Position(19, 6), 'Println func(a ...interface{}) (n int, err error)', printlnDoc],
[new vscode.Position(23, 4), 'print func(txt string)', null]
[new vscode.Position(23, 4), 'print func(txt string)', 'This is an unexported function so couldn\'t get this comment on hover :( Not\nanymore!!\n']
];
let config = Object.create(vscode.workspace.getConfiguration('go'), {
'docsTool': { value: 'godoc' }