Skip to content

Commit

Permalink
Merge pull request #14 from axiomhq/ov/bump-core-deps
Browse files Browse the repository at this point in the history 
chore: bump core deps
  • Loading branch information
@kevinehosford
kevinehosford authored Nov 15, 2023
2 parents c0e7596 + 59547bc commit b5eac13
Show file tree
Hide file tree
Showing 16 changed files with 3,362 additions and 5,214 deletions.
14 changes: 7 additions & 7 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,36 +31,36 @@
"main": "./release/min/monaco.contribution.js",
"types": "./release/min/monaco.contribution.d.ts",
"devDependencies": {
"@types/jest": "^21.1.8",
"@types/jest": "^29.0.0",
"@types/lodash": "^4.14.109",
"@types/xregexp": "^3.0.29",
"concurrently": "^5.1.0",
"copy-dir-cli": "0.0.3",
"event-stream": "3.3.4",
"http-server": "^0.12.3",
"jest": "^26.1.0",
"jest": "^29.0.0",
"live-server": "^1.2.1",
"lodash": "^4.17.4",
"merge-stream": "1.0.0",
"minimatch": "^3.0.4",
"monaco-editor-core": "0.33.0",
"monaco-editor-core": "0.41.0",
"monaco-languages": "2.11.1",
"monaco-plugin-helpers": "^1.0.3",
"object-assign": "4.1.0",
"requirejs": "^2.3.6",
"terser": "^4.6.7",
"ts-jest": "^26.1.1",
"typescript": "3.9.7",
"vscode-languageserver-types": "3.16.0",
"ts-jest": "^29.0.0",
"typescript": "^5.1.6",
"vscode-languageserver-textdocument": "1.0.4",
"vscode-languageserver-types": "3.16.0",
"xregexp": "^3.2.0"
},
"dependencies": {
"@kusto/language-service": "2.0.0-beta.0",
"@kusto/language-service-next": "0.0.54"
},
"peerDependencies": {
"monaco-editor": "0.31.0"
"monaco-editor": "0.41.0"
},
"jest": {
"rootDir": "src",
Expand Down
8,345 changes: 3,242 additions & 5,103 deletions package/package-lock.json
View file

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,36 +31,36 @@
"main": "./release/min/monaco.contribution.js",
"types": "./release/min/monaco.contribution.d.ts",
"devDependencies": {
"@types/jest": "^21.1.8",
"@types/jest": "^29.0.0",
"@types/lodash": "^4.14.109",
"@types/xregexp": "^3.0.29",
"concurrently": "^5.1.0",
"copy-dir-cli": "0.0.3",
"event-stream": "3.3.4",
"http-server": "^0.12.3",
"jest": "^26.1.0",
"jest": "^29.0.0",
"live-server": "^1.2.1",
"lodash": "^4.17.4",
"merge-stream": "1.0.0",
"minimatch": "^3.0.4",
"monaco-editor-core": "0.33.0",
"monaco-editor-core": "0.41.0",
"monaco-languages": "2.11.1",
"monaco-plugin-helpers": "^1.0.3",
"object-assign": "4.1.0",
"requirejs": "^2.3.6",
"terser": "^4.6.7",
"ts-jest": "^26.1.1",
"typescript": "3.9.7",
"vscode-languageserver-types": "3.16.0",
"ts-jest": "^29.0.0",
"typescript": "^5.1.6",
"vscode-languageserver-textdocument": "1.0.4",
"vscode-languageserver-types": "3.16.0",
"xregexp": "^3.2.0"
},
"dependencies": {
"@kusto/language-service": "2.0.0-beta.0",
"@kusto/language-service-next": "0.0.54"
},
"peerDependencies": {
"monaco-editor": "0.31.0"
"monaco-editor": "0.41.0"
},
"jest": {
"rootDir": "src",
Expand Down
7 changes: 4 additions & 3 deletions package/src/commandHighlighter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default class KustoCommandHighlighter implements monaco.editor.IEditorCon
};

private disposables: monaco.IDisposable[] = [];
private decorations: string[] = [];
private decorations: monaco.editor.IEditorDecorationsCollection;

/**
* Register to cursor movement and seleciton events.
Expand Down Expand Up @@ -37,7 +37,8 @@ export default class KustoCommandHighlighter implements monaco.editor.IEditorCon
// Looks like the user selected a bunch of text. we don't want to highlight the entire command in this case - since highlighting
// the text is more helpful.
if (!changeEvent.selection.isEmpty()) {
this.decorations = this.editor.deltaDecorations(this.decorations, []);
this.decorations = this.editor.createDecorationsCollection([]);
// this.decorations = this.editor.deltaDecorations(this.decorations, []);
return;
}

Expand All @@ -49,6 +50,6 @@ export default class KustoCommandHighlighter implements monaco.editor.IEditorCon
},
];

this.decorations = this.editor.deltaDecorations(this.decorations, decorations);
this.decorations = this.editor.createDecorationsCollection(decorations);
}
}
5 changes: 3 additions & 2 deletions package/src/languageFeatures.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -810,16 +810,17 @@ function toWorkspaceEdit(edit: ls.WorkspaceEdit | undefined): monaco.languages.W
if (!edit || !edit.changes) {
return void 0;
}
let resourceEdits: monaco.languages.WorkspaceTextEdit[] = [];
let resourceEdits: monaco.languages.IWorkspaceTextEdit[] = [];
for (let uri in edit.changes) {
const _uri = Uri.parse(uri);
for (let e of edit.changes[uri]) {
resourceEdits.push({
resource: _uri,
edit: {
textEdit: {
range: toRange(e.range),
text: e.newText,
},
versionId: undefined,
});
}
}
Expand Down
11 changes: 6 additions & 5 deletions release/dev/kustoMode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2359,9 +2359,9 @@ define('vs/language/kusto/languageFeatures',["require", "exports", "vscode-langu
}
else {
// Add custom popup for syntax error: icon, header and message as markdown
var header = syntaxErrorAsMarkDown.header ? "**" + syntaxErrorAsMarkDown.header + "** \n\n" : '';
var icon = syntaxErrorAsMarkDown.icon ? "![](" + syntaxErrorAsMarkDown.icon + ")" : '';
var popupErrorHoverHeaderMessage_1 = icon + " " + header;
var header = syntaxErrorAsMarkDown.header ? "**".concat(syntaxErrorAsMarkDown.header, "** \n\n") : '';
var icon = syntaxErrorAsMarkDown.icon ? "![](".concat(syntaxErrorAsMarkDown.icon, ")") : '';
var popupErrorHoverHeaderMessage_1 = "".concat(icon, " ").concat(header);
var newDecorations = markers.map(function (marker) {
return {
range: {
Expand Down Expand Up @@ -2696,7 +2696,7 @@ define('vs/language/kusto/languageFeatures',["require", "exports", "vscode-langu
var classificationColorTriplets = getClassificationColorTriplets();
var cssInnerHtml = classificationColorTriplets
.map(function (pair) {
return ".vs ." + pair.classification + " {color: #" + pair.colorLight + ";} .vs-dark ." + pair.classification + " {color: #" + pair.colorDark + ";}";
return ".vs .".concat(pair.classification, " {color: #").concat(pair.colorLight, ";} .vs-dark .").concat(pair.classification, " {color: #").concat(pair.colorDark, ";}");
})
.join('\n');
return cssInnerHtml;
Expand Down Expand Up @@ -2942,10 +2942,11 @@ define('vs/language/kusto/languageFeatures',["require", "exports", "vscode-langu
var e = _a[_i];
resourceEdits.push({
resource: _uri,
edit: {
textEdit: {
range: toRange(e.range),
text: e.newText,
},
versionId: undefined,
});
}
}
Expand Down
Loading

0 comments on commit b5eac13

Please sign in to comment.