This commit is contained in:
Martin Aeschlimann 2016-06-23 11:49:17 +02:00
parent ad61b15585
commit ef359fa044
8 changed files with 60 additions and 62 deletions

View file

@ -5,5 +5,4 @@
/test/ /test/
/release/dev/ /release/dev/
/gulpfile.js /gulpfile.js
/tsconfig.json
/.npmignore /.npmignore

View file

@ -1,5 +1,7 @@
# monaco-css # Monaco CSS
CSS language support for the Monaco Editor.
CSS language plugin for the Monaco Editor.
## Installing ## Installing

View file

@ -1,11 +1,11 @@
{ {
"name": "monaco-css", "name": "monaco-css",
"version": "0.0.1", "version": "1.0.0",
"description": "CSS, LESS and SCSS support for Monaco Editor", "description": "CSS, LESS and SCSS plugin for the Monaco Editor",
"scripts": { "scripts": {
"test": "node_modules/.bin/mocha", "compile": "gulp compile",
"watch": "node_modules/.bin/gulp watch", "watch": "gulp watch",
"prepublish": "node_modules/.bin/gulp release" "prepublish": "gulp release"
}, },
"author": "Microsoft Corporation", "author": "Microsoft Corporation",
"license": "MIT", "license": "MIT",
@ -17,8 +17,8 @@
"url": "https://github.com/Microsoft/monaco-css/issues" "url": "https://github.com/Microsoft/monaco-css/issues"
}, },
"dependencies": { "dependencies": {
"vscode-css-languageservice": "file:../vscode-css-languageservice", "vscode-css-languageservice": "^1.0.1",
"vscode-languageserver-types": "1.0.0" "vscode-languageserver-types": "^1.0.1"
}, },
"devDependencies": { "devDependencies": {
"event-stream": "^3.3.2", "event-stream": "^3.3.2",
@ -27,7 +27,6 @@
"gulp-tsb": "^1.10.4", "gulp-tsb": "^1.10.4",
"gulp-uglify": "^1.5.3", "gulp-uglify": "^1.5.3",
"merge-stream": "^1.0.0", "merge-stream": "^1.0.0",
"mocha": "^2.5.3",
"monaco-editor-core": "^0.4.0", "monaco-editor-core": "^0.4.0",
"object-assign": "^4.1.0", "object-assign": "^4.1.0",
"rimraf": "^2.5.2", "rimraf": "^2.5.2",

View file

@ -135,28 +135,27 @@ function toRange(range: ls.Range): Range {
} }
function toCompletionItemKind(kind: number): monaco.languages.CompletionItemKind { function toCompletionItemKind(kind: number): monaco.languages.CompletionItemKind {
let lsItemKind = ls.CompletionItemKind;
let mItemKind = monaco.languages.CompletionItemKind; let mItemKind = monaco.languages.CompletionItemKind;
switch (kind) { switch (kind) {
case lsItemKind.Text: return mItemKind.Text; case ls.CompletionItemKind.Text: return mItemKind.Text;
case lsItemKind.Method: return mItemKind.Method; case ls.CompletionItemKind.Method: return mItemKind.Method;
case lsItemKind.Function: return mItemKind.Function; case ls.CompletionItemKind.Function: return mItemKind.Function;
case lsItemKind.Constructor: return mItemKind.Constructor; case ls.CompletionItemKind.Constructor: return mItemKind.Constructor;
case lsItemKind.Field: return mItemKind.Field; case ls.CompletionItemKind.Field: return mItemKind.Field;
case lsItemKind.Variable: return mItemKind.Variable; case ls.CompletionItemKind.Variable: return mItemKind.Variable;
case lsItemKind.Class: return mItemKind.Class; case ls.CompletionItemKind.Class: return mItemKind.Class;
case lsItemKind.Interface: return mItemKind.Interface; case ls.CompletionItemKind.Interface: return mItemKind.Interface;
case lsItemKind.Module: return mItemKind.Module; case ls.CompletionItemKind.Module: return mItemKind.Module;
case lsItemKind.Property: return mItemKind.Property; case ls.CompletionItemKind.Property: return mItemKind.Property;
case lsItemKind.Unit: return mItemKind.Unit; case ls.CompletionItemKind.Unit: return mItemKind.Unit;
case lsItemKind.Value: return mItemKind.Value; case ls.CompletionItemKind.Value: return mItemKind.Value;
case lsItemKind.Enum: return mItemKind.Enum; case ls.CompletionItemKind.Enum: return mItemKind.Enum;
case lsItemKind.Keyword: return mItemKind.Keyword; case ls.CompletionItemKind.Keyword: return mItemKind.Keyword;
case lsItemKind.Snippet: return mItemKind.Snippet; case ls.CompletionItemKind.Snippet: return mItemKind.Snippet;
case lsItemKind.Color: return mItemKind.Color; case ls.CompletionItemKind.Color: return mItemKind.Color;
case lsItemKind.File: return mItemKind.File; case ls.CompletionItemKind.File: return mItemKind.File;
case lsItemKind.Reference: return mItemKind.Reference; case ls.CompletionItemKind.Reference: return mItemKind.Reference;
} }
return mItemKind.Property; return mItemKind.Property;
} }
@ -382,28 +381,27 @@ export class RenameAdapter implements monaco.languages.RenameProvider {
// --- document symbols ------ // --- document symbols ------
function toSymbolKind(kind: ls.SymbolKind): monaco.languages.SymbolKind { function toSymbolKind(kind: ls.SymbolKind): monaco.languages.SymbolKind {
let lsKind = ls.SymbolKind;
let mKind = monaco.languages.SymbolKind; let mKind = monaco.languages.SymbolKind;
switch (kind) { switch (kind) {
case lsKind.File: return mKind.Array; case ls.SymbolKind.File: return mKind.Array;
case lsKind.Module: return mKind.Module; case ls.SymbolKind.Module: return mKind.Module;
case lsKind.Namespace: return mKind.Namespace; case ls.SymbolKind.Namespace: return mKind.Namespace;
case lsKind.Package: return mKind.Package; case ls.SymbolKind.Package: return mKind.Package;
case lsKind.Class: return mKind.Class; case ls.SymbolKind.Class: return mKind.Class;
case lsKind.Method: return mKind.Method; case ls.SymbolKind.Method: return mKind.Method;
case lsKind.Property: return mKind.Property; case ls.SymbolKind.Property: return mKind.Property;
case lsKind.Field: return mKind.Field; case ls.SymbolKind.Field: return mKind.Field;
case lsKind.Constructor: return mKind.Constructor; case ls.SymbolKind.Constructor: return mKind.Constructor;
case lsKind.Enum: return mKind.Enum; case ls.SymbolKind.Enum: return mKind.Enum;
case lsKind.Interface: return mKind.Interface; case ls.SymbolKind.Interface: return mKind.Interface;
case lsKind.Function: return mKind.Function; case ls.SymbolKind.Function: return mKind.Function;
case lsKind.Variable: return mKind.Variable; case ls.SymbolKind.Variable: return mKind.Variable;
case lsKind.Constant: return mKind.Constant; case ls.SymbolKind.Constant: return mKind.Constant;
case lsKind.String: return mKind.String; case ls.SymbolKind.String: return mKind.String;
case lsKind.Number: return mKind.Number; case ls.SymbolKind.Number: return mKind.Number;
case lsKind.Boolean: return mKind.Boolean; case ls.SymbolKind.Boolean: return mKind.Boolean;
case lsKind.Array: return mKind.Array; case ls.SymbolKind.Array: return mKind.Array;
} }
return mKind.Function; return mKind.Function;
} }