Merge pull request #1 from luomoyuyi/UpdateMonacoEditorVersion

Update monaco editor version and update API.
This commit is contained in:
Yanzhe Du 2018-12-03 14:29:01 +08:00 committed by GitHub
commit fd617765c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 2503 additions and 271 deletions

View File

@ -1 +1 @@
{"version":3,"file":"CosmosDBSqlKeywords.js","sourceRoot":"","sources":["../../../src/cosmosdb-sql/grammar/CosmosDBSqlKeywords.ts"],"names":[],"mappings":"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"} {"version":3,"file":"CosmosDBSqlKeywords.js","sourceRoot":"","sources":["../../../src/cosmosdb-sql/grammar/CosmosDBSqlKeywords.ts"],"names":[],"mappings":"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"}

View File

@ -1,7 +1,7 @@
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
var Q = require("q"); var Q = require("q");
var monaco = require("monaco-editor"); var monaco_editor_1 = require("monaco-editor");
var ParseReason; var ParseReason;
(function (ParseReason) { (function (ParseReason) {
ParseReason[ParseReason["GetCompletionWords"] = 1] = "GetCompletionWords"; ParseReason[ParseReason["GetCompletionWords"] = 1] = "GetCompletionWords";
@ -13,7 +13,7 @@ var LanguageServiceFacade = /** @class */ (function () {
LanguageServiceFacade.GetLanguageServiceParseResult = function (str, parseReason) { LanguageServiceFacade.GetLanguageServiceParseResult = function (str, parseReason) {
var timeExceeded = Q.Promise(function (resolve, reject) { var timeExceeded = Q.Promise(function (resolve, reject) {
var wait = setTimeout(function () { var wait = setTimeout(function () {
var words = []; var words = {};
resolve(words); resolve(words);
}, LanguageServiceFacade.timeout); }, LanguageServiceFacade.timeout);
}); });
@ -30,8 +30,8 @@ var LanguageServiceFacade = /** @class */ (function () {
if (LanguageServiceFacade.workingWorker != null) { if (LanguageServiceFacade.workingWorker != null) {
LanguageServiceFacade.workingWorker.terminate(); LanguageServiceFacade.workingWorker.terminate();
} }
var currentUrlWithoutQueryParamsAndHashRoute = "http://" + window.location.host + window.location.pathname; var currentUrlWithoutQueryParamsAndHashRoute = window.location.protocol + "//" + window.location.host + window.location.pathname;
var url = currentUrlWithoutQueryParamsAndHashRoute.replace(/\/[^\/]*$/, '/node_modules/cosmosdb-language-service/dist/worker/dist/LanguageServiceWorker.js'); var url = currentUrlWithoutQueryParamsAndHashRoute.replace(/\/[^\/]*$/, '/node_modules/@azure/cosmos-language-service/dist/worker/dist/LanguageServiceWorker.js');
LanguageServiceFacade.workingWorker = new Worker(url); LanguageServiceFacade.workingWorker = new Worker(url);
LanguageServiceFacade.workingWorker.onmessage = function (ev) { LanguageServiceFacade.workingWorker.onmessage = function (ev) {
var processedResults = []; var processedResults = [];
@ -41,7 +41,7 @@ var LanguageServiceFacade = /** @class */ (function () {
if (!!label) { if (!!label) {
processedResults.push({ processedResults.push({
label: label, label: label,
kind: monaco.languages.CompletionItemKind.Keyword kind: monaco_editor_1.languages.CompletionItemKind.Keyword
}); });
} }
}); });
@ -49,7 +49,7 @@ var LanguageServiceFacade = /** @class */ (function () {
else if (parseReason === ParseReason.GetErrors) { else if (parseReason === ParseReason.GetErrors) {
results.forEach(function (err) { results.forEach(function (err) {
var mark = { var mark = {
severity: monaco.MarkerSeverity.Error, severity: monaco_editor_1.MarkerSeverity.Error,
message: err.Message, message: err.Message,
startLineNumber: err.line, startLineNumber: err.line,
startColumn: err.column, startColumn: err.column,
@ -59,7 +59,8 @@ var LanguageServiceFacade = /** @class */ (function () {
processedResults.push(mark); processedResults.push(mark);
}); });
} }
resolve(processedResults); var completionItemList = { suggestions: processedResults };
resolve(completionItemList);
}; };
var source = { var source = {
code: str, code: str,

View File

@ -1 +1 @@
{"version":3,"file":"LanguageServiceFacade.js","sourceRoot":"","sources":["../../src/facade/LanguageServiceFacade.ts"],"names":[],"mappings":"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"} {"version":3,"file":"LanguageServiceFacade.js","sourceRoot":"","sources":["../../src/facade/LanguageServiceFacade.ts"],"names":[],"mappings":"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"}

View File

@ -27,9 +27,9 @@ var LanguageService = /** @class */ (function () {
this._keywordsDict = null; this._keywordsDict = null;
this.StatesBeforeEof = {}; this.StatesBeforeEof = {};
this.SyntaxErrors = []; this.SyntaxErrors = [];
this._eofReached = false; this.EofReached = false;
this.EofReachedInPredict = false; this.EofReachedInPredict = false;
this._exThrownAfterEofReached = false; this.ExThrownAfterEofReached = false;
this.IsInPredict = false; this.IsInPredict = false;
this.GetExpectedTokenStrs = function () { this.GetExpectedTokenStrs = function () {
var intervalSets = new IntervalSet_1.IntervalSet(); var intervalSets = new IntervalSet_1.IntervalSet();
@ -91,8 +91,8 @@ var LanguageService = /** @class */ (function () {
Message: msg Message: msg
}; };
_this.SyntaxErrors.push(error); _this.SyntaxErrors.push(error);
if (_this._eofReached) { if (_this.EofReached) {
_this._exThrownAfterEofReached = true; _this.ExThrownAfterEofReached = true;
} }
}; };
this._lexerCtr = lexerCtr; this._lexerCtr = lexerCtr;
@ -116,9 +116,9 @@ var LanguageService = /** @class */ (function () {
this._parser.root(); this._parser.root();
}; };
LanguageService.prototype.PrepareParse = function () { LanguageService.prototype.PrepareParse = function () {
this._eofReached = false; this.EofReached = false;
this.EofReachedInPredict = false; this.EofReachedInPredict = false;
this._exThrownAfterEofReached = false; this.ExThrownAfterEofReached = false;
this.StatesBeforeEof = {}; this.StatesBeforeEof = {};
this.SyntaxErrors = []; this.SyntaxErrors = [];
}; };

View File

@ -1 +1 @@
{"version":3,"file":"LanguageService.js","sourceRoot":"","sources":["../../src/language-service/LanguageService.ts"],"names":[],"mappings":"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"} {"version":3,"file":"LanguageService.js","sourceRoot":"","sources":["../../src/language-service/LanguageService.ts"],"names":[],"mappings":"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"}

View File

@ -1 +1 @@
{"version":3,"file":"ErrorMarkProvider.js","sourceRoot":"","sources":["../../src/providers/ErrorMarkProvider.ts"],"names":[],"mappings":";;AAAA,yEAAsF;AAItF;IAAA;IAIA,CAAC;IAHiB,8BAAY,GAA1B,UAA2B,KAAa;QACpC,OAAO,6CAAqB,CAAC,6BAA6B,CAAC,KAAK,EAAE,mCAAW,CAAC,SAAS,CAAC,CAAC;IAC7F,CAAC;IACL,wBAAC;AAAD,CAAC,AAJD,IAIC;AAJY,8CAAiB"} {"version":3,"file":"ErrorMarkProvider.js","sourceRoot":"","sources":["../../src/providers/ErrorMarkProvider.ts"],"names":[],"mappings":";;AAEA,yEAAoF;AAEpF;IAAA;IAIA,CAAC;IAHiB,8BAAY,GAA1B,UAA2B,KAAa;QACpC,OAAO,6CAAqB,CAAC,6BAA6B,CAAC,KAAK,EAAE,mCAAW,CAAC,SAAS,CAAC,CAAC;IAC7F,CAAC;IACL,wBAAC;AAAD,CAAC,AAJD,IAIC;AAJY,8CAAiB"}

View File

@ -5,7 +5,7 @@ var SqlCompletionItemProvider = /** @class */ (function () {
function SqlCompletionItemProvider() { function SqlCompletionItemProvider() {
this.triggerCharacters = [" ", "."]; this.triggerCharacters = [" ", "."];
} }
SqlCompletionItemProvider.prototype.provideCompletionItems = function (model, position, token) { SqlCompletionItemProvider.prototype.provideCompletionItems = function (model, position, context, token) {
var range = { var range = {
startLineNumber: 1, startLineNumber: 1,
startColumn: 1, startColumn: 1,

View File

@ -1 +1 @@
{"version":3,"file":"SqlCompletionItemProvider.js","sourceRoot":"","sources":["../../src/providers/SqlCompletionItemProvider.ts"],"names":[],"mappings":";;AAAA,yEAAqF;AAGrF;IAAA;QACW,sBAAiB,GAAa,CAAC,GAAG,EAAC,GAAG,CAAC,CAAC;IAcnD,CAAC;IAZG,0DAAsB,GAAtB,UAAuB,KAAmC,EAAE,QAAyB,EAAE,KAA+B;QAClH,IAAM,KAAK,GAAG;YACV,eAAe,EAAE,CAAC;YAClB,WAAW,EAAE,CAAC;YACd,aAAa,EAAE,QAAQ,CAAC,UAAU;YAClC,SAAS,EAAE,QAAQ,CAAC,MAAM;SAC7B,CAAA;QAED,IAAI,IAAI,GAAG,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACpH,OAAO,6CAAqB,CAAC,6BAA6B,CAAC,IAAI,EAAE,mCAAW,CAAC,kBAAkB,CAAC,CAAC;IACrG,CAAC;IACL,gCAAC;AAAD,CAAC,AAfD,IAeC;AAfY,8DAAyB"} {"version":3,"file":"SqlCompletionItemProvider.js","sourceRoot":"","sources":["../../src/providers/SqlCompletionItemProvider.ts"],"names":[],"mappings":";;AAAA,yEAAmF;AAGnF;IAAA;QACW,sBAAiB,GAAa,CAAC,GAAG,EAAC,GAAG,CAAC,CAAC;IAcnD,CAAC;IAZG,0DAAsB,GAAtB,UAAuB,KAA4B,EAAE,QAAkB,EAAE,OAAoC,EAAE,KAAwB;QACnI,IAAM,KAAK,GAAG;YACV,eAAe,EAAE,CAAC;YAClB,WAAW,EAAE,CAAC;YACd,aAAa,EAAE,QAAQ,CAAC,UAAU;YAClC,SAAS,EAAE,QAAQ,CAAC,MAAM;SAC7B,CAAA;QAED,IAAI,IAAI,GAAG,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACpH,OAAO,6CAAqB,CAAC,6BAA6B,CAAC,IAAI,EAAE,mCAAW,CAAC,kBAAkB,CAAC,CAAC;IACrG,CAAC;IACL,gCAAC;AAAD,CAAC,AAfD,IAeC;AAfY,8DAAyB"}

2224
dist/worker/dist/LanguageServiceWorker.js vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

4
index.d.ts vendored
View File

@ -1,8 +1,8 @@
import {editor, Position, CancellationToken} from "monaco-editor"; import {editor, Position, CancellationToken, languages} from "monaco-editor";
declare class SqlCompletionItemProvider { declare class SqlCompletionItemProvider {
public triggerCharacters: string[]; public triggerCharacters: string[];
provideCompletionItems(model: editor.IReadOnlyModel, position: Position, token: CancellationToken); provideCompletionItems(model: editor.ITextModel, position: Position, context: languages.CompletionContext, token: CancellationToken);
} }
declare class ErrorMarkProvider { declare class ErrorMarkProvider {

482
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@
"description": "Cosmos DB SQL Language Service for the Monaco editor", "description": "Cosmos DB SQL Language Service for the Monaco editor",
"dependencies": { "dependencies": {
"antlr4": "4.7.1", "antlr4": "4.7.1",
"monaco-editor": "0.14.3", "monaco-editor": "0.15.6",
"q": "1.5.1", "q": "1.5.1",
"react": "16.5.2" "react": "16.5.2"
}, },

View File

@ -11,10 +11,10 @@ export class LanguageServiceFacade {
private static workingWorker : Worker = null; private static workingWorker : Worker = null;
public static GetLanguageServiceParseResult(str : string, parseReason : ParseReason) : Q.Promise<any[]> { public static GetLanguageServiceParseResult(str : string, parseReason : ParseReason) : Q.Promise<any> {
const timeExceeded = Q.Promise<any[]>((resolve : any, reject : any) => { const timeExceeded = Q.Promise<any>((resolve : any, reject : any) => {
const wait = setTimeout(() => { const wait = setTimeout(() => {
const words : any = []; const words : any = {};
resolve(words); resolve(words);
}, LanguageServiceFacade.timeout); }, LanguageServiceFacade.timeout);
}); });
@ -26,7 +26,7 @@ export class LanguageServiceFacade {
}); });
} }
private static GetParseResult = (str : string, parseReason : ParseReason) : Q.Promise<any[]> => { private static GetParseResult = (str : string, parseReason : ParseReason) : Q.Promise<any> => {
return Q.Promise((resolve : any) => { return Q.Promise((resolve : any) => {
if (LanguageServiceFacade.workingWorker != null) { if (LanguageServiceFacade.workingWorker != null) {
@ -34,7 +34,7 @@ export class LanguageServiceFacade {
} }
const currentUrlWithoutQueryParamsAndHashRoute: string = `${window.location.protocol}//${window.location.host}${window.location.pathname}`; const currentUrlWithoutQueryParamsAndHashRoute: string = `${window.location.protocol}//${window.location.host}${window.location.pathname}`;
let url = currentUrlWithoutQueryParamsAndHashRoute.replace(/\/[^\/]*$/, '/node_modules/cosmosdb-language-service/dist/worker/dist/LanguageServiceWorker.js'); let url = currentUrlWithoutQueryParamsAndHashRoute.replace(/\/[^\/]*$/, '/node_modules/@azure/cosmos-language-service/dist/worker/dist/LanguageServiceWorker.js');
LanguageServiceFacade.workingWorker = new Worker(url); LanguageServiceFacade.workingWorker = new Worker(url);
LanguageServiceFacade.workingWorker.onmessage = (ev : MessageEvent) => { LanguageServiceFacade.workingWorker.onmessage = (ev : MessageEvent) => {
@ -66,7 +66,8 @@ export class LanguageServiceFacade {
}); });
} }
resolve(processedResults); let completionItemList : languages.CompletionList = {suggestions : processedResults};
resolve(completionItemList);
} }
const source = { const source = {

View File

@ -1,10 +1,10 @@
import {LanguageServiceFacade, ParseReason} from "../facade/LanguageServiceFacade"; import {LanguageServiceFacade, ParseReason} from "../facade/LanguageServiceFacade";
import {editor, Position, CancellationToken} from "monaco-editor"; import {editor, Position, CancellationToken, languages} from "monaco-editor";
export class SqlCompletionItemProvider { export class SqlCompletionItemProvider {
public triggerCharacters: string[] = [" ","."]; public triggerCharacters: string[] = [" ","."];
provideCompletionItems(model: editor.IReadOnlyModel, position: Position, token: CancellationToken) { provideCompletionItems(model: editor.IReadOnlyModel, position: Position, context: languages.CompletionContext, token: CancellationToken) {
const range = { const range = {
startLineNumber: 1, startLineNumber: 1,
startColumn: 1, startColumn: 1,

File diff suppressed because one or more lines are too long