|
|
@ -7,6 +7,7 @@
|
|
|
|
import { LanguageServiceDefaultsImpl } from './monaco.contribution';
|
|
|
|
import { LanguageServiceDefaultsImpl } from './monaco.contribution';
|
|
|
|
import * as ts from './lib/typescriptServices';
|
|
|
|
import * as ts from './lib/typescriptServices';
|
|
|
|
import { TypeScriptWorker } from './tsWorker';
|
|
|
|
import { TypeScriptWorker } from './tsWorker';
|
|
|
|
|
|
|
|
import {libFileMap} from "./lib/lib"
|
|
|
|
|
|
|
|
|
|
|
|
import Uri = monaco.Uri;
|
|
|
|
import Uri = monaco.Uri;
|
|
|
|
import Position = monaco.Position;
|
|
|
|
import Position = monaco.Position;
|
|
|
@ -22,6 +23,17 @@ enum IndentStyle {
|
|
|
|
Smart = 2
|
|
|
|
Smart = 2
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function getOrCreateLibFile(uri: Uri) {
|
|
|
|
|
|
|
|
let model = monaco.editor.getModel(uri)
|
|
|
|
|
|
|
|
if (!model) {
|
|
|
|
|
|
|
|
if (uri.path.indexOf("/lib.") === 0) {
|
|
|
|
|
|
|
|
return monaco.editor.createModel(libFileMap[uri.path.slice(1)], "javascript", uri)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return model
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
export function flattenDiagnosticMessageText(diag: string | ts.DiagnosticMessageChain | undefined, newLine: string, indent = 0): string {
|
|
|
|
export function flattenDiagnosticMessageText(diag: string | ts.DiagnosticMessageChain | undefined, newLine: string, indent = 0): string {
|
|
|
|
if (typeof diag === "string") {
|
|
|
|
if (typeof diag === "string") {
|
|
|
|
return diag;
|
|
|
|
return diag;
|
|
|
@ -224,7 +236,7 @@ export class DiagnosticsAdapter extends Adapter {
|
|
|
|
let relatedResource: monaco.editor.ITextModel | null = model;
|
|
|
|
let relatedResource: monaco.editor.ITextModel | null = model;
|
|
|
|
if (info.file) {
|
|
|
|
if (info.file) {
|
|
|
|
const relatedResourceUri = monaco.Uri.parse(info.file.fileName);
|
|
|
|
const relatedResourceUri = monaco.Uri.parse(info.file.fileName);
|
|
|
|
relatedResource = monaco.editor.getModel(relatedResourceUri);
|
|
|
|
relatedResource = getOrCreateLibFile(relatedResourceUri);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!relatedResource) {
|
|
|
|
if (!relatedResource) {
|
|
|
@ -492,7 +504,7 @@ export class DefinitionAdapter extends Adapter {
|
|
|
|
const result: monaco.languages.Location[] = [];
|
|
|
|
const result: monaco.languages.Location[] = [];
|
|
|
|
for (let entry of entries) {
|
|
|
|
for (let entry of entries) {
|
|
|
|
const uri = Uri.parse(entry.fileName);
|
|
|
|
const uri = Uri.parse(entry.fileName);
|
|
|
|
const refModel = monaco.editor.getModel(uri);
|
|
|
|
const refModel = getOrCreateLibFile(uri);
|
|
|
|
if (refModel) {
|
|
|
|
if (refModel) {
|
|
|
|
result.push({
|
|
|
|
result.push({
|
|
|
|
uri: uri,
|
|
|
|
uri: uri,
|
|
|
@ -521,7 +533,7 @@ export class ReferenceAdapter extends Adapter implements monaco.languages.Refere
|
|
|
|
const result: monaco.languages.Location[] = [];
|
|
|
|
const result: monaco.languages.Location[] = [];
|
|
|
|
for (let entry of entries) {
|
|
|
|
for (let entry of entries) {
|
|
|
|
const uri = Uri.parse(entry.fileName);
|
|
|
|
const uri = Uri.parse(entry.fileName);
|
|
|
|
const refModel = monaco.editor.getModel(uri);
|
|
|
|
const refModel = getOrCreateLibFile(uri);
|
|
|
|
if (refModel) {
|
|
|
|
if (refModel) {
|
|
|
|
result.push({
|
|
|
|
result.push({
|
|
|
|
uri: uri,
|
|
|
|
uri: uri,
|
|
|
|