Better handling of property parsing

This commit is contained in:
2019-01-19 14:13:35 +01:00
parent 19c3efb6c2
commit fc6221453d
32 changed files with 4498 additions and 73 deletions

View File

@@ -8,8 +8,8 @@ const path = require("path");
const fs = require("fs");
// Defines the search path of your language server DLL. (.NET Core)
const languageServerPaths = [
"./server/UpsilonLanguageServer.dll",
"../UpsilonLanguageServer/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/UpsilonLanguageServer.dll"
"../UpsilonLanguageServer/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/UpsilonLanguageServer.dll",
"./server/UpsilonLanguageServer.dll"
];
function activateLanguageServer(context) {
// The server is implemented in an executable application.

View File

@@ -1 +1 @@
{"version":3,"file":"extension.js","sourceRoot":"","sources":["../src/extension.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AACb,6DAA6D;AAC7D,8EAA8E;AAE9E,iCAAiC;AACjC,wDAAwD;AACxD,6BAA6B;AAC7B,yBAAyB;AAEzB,mEAAmE;AACnE,MAAM,mBAAmB,GAAG;IAC1B,oCAAoC;IACpC,kGAAkG;CACnG,CAAC;AAEF,SAAS,sBAAsB,CAAC,OAAgC;IAC9D,0DAA0D;IAC1D,IAAI,YAAY,GAAW,IAAI,CAAC;IAChC,KAAK,IAAI,CAAC,IAAI,mBAAmB,EAAE;QACjC,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QAC9B,kBAAkB;QAClB,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;YACpB,YAAY,GAAG,CAAC,CAAC;YACjB,MAAM;SACP;KACF;IACD,IAAI,CAAC,YAAY;QACf,MAAM,IAAI,QAAQ,CAAC,yCAAyC,CAAC,CAAC;IAChE,IAAI,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1C,OAAO,CAAC,GAAG,CAAC,OAAO,YAAY,oBAAoB,CAAC,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,cAAc,QAAQ,GAAG,CAAC,CAAC;IAEvC,oFAAoF;IACpF,qCAAqC;IACrC,IAAI,aAAa,GAAiC;QAChD,GAAG,EAAE;YACH,OAAO,EAAE,QAAQ;YACjB,IAAI,EAAE,CAAC,YAAY,CAAC;YACpB,OAAO,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE;SAC3B;QACD,KAAK,EAAE;YACL,OAAO,EAAE,QAAQ;YACjB,IAAI,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC;YAC/B,OAAO,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE;SAC3B;KACF,CAAC;IACF,yCAAyC;IACzC,IAAI,aAAa,GAAyC;QACxD,4CAA4C;QAC5C,gBAAgB,EAAE;YAChB;gBACE,QAAQ,EAAE,SAAS;gBACnB,MAAM,EAAE,MAAM;aACf;SACF;QACD,WAAW,EAAE;YACX,oBAAoB,EAAE,uBAAuB;YAC7C,oFAAoF;YACpF,UAAU,EAAE;gBACV,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC,eAAe,CAAC;gBACzD,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC,UAAU,CAAC;gBACpD,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC,UAAU,CAAC;gBACpD,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC,oBAAoB,CAAC;aAC/D;SACF;KACF,CAAC;IAEF,mDAAmD;IACnD,IAAI,MAAM,GAAG,IAAI,cAAc,CAAC,cAAc,CAC5C,uBAAuB,EACvB,yBAAyB,EACzB,aAAa,EACb,aAAa,CACd,CAAC;IACF,IAAI,UAAU,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;IAEhC,iEAAiE;IACjE,sDAAsD;IACtD,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AACzC,CAAC;AAED,yDAAyD;AACzD,0EAA0E;AAC1E,SAAgB,QAAQ,CAAC,OAAgC;IACvD,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;IACnD,sBAAsB,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AAHD,4BAGC;AAED,2DAA2D;AAC3D,SAAgB,UAAU,KAAI,CAAC;AAA/B,gCAA+B"}
{"version":3,"file":"extension.js","sourceRoot":"","sources":["../src/extension.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AACb,6DAA6D;AAC7D,8EAA8E;AAE9E,iCAAiC;AACjC,wDAAwD;AACxD,6BAA6B;AAC7B,yBAAyB;AAEzB,mEAAmE;AACnE,MAAM,mBAAmB,GAAG;IAC1B,kGAAkG;IAClG,oCAAoC;CACrC,CAAC;AAEF,SAAS,sBAAsB,CAAC,OAAgC;IAC9D,0DAA0D;IAC1D,IAAI,YAAY,GAAW,IAAI,CAAC;IAChC,KAAK,IAAI,CAAC,IAAI,mBAAmB,EAAE;QACjC,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QAC9B,kBAAkB;QAClB,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;YACpB,YAAY,GAAG,CAAC,CAAC;YACjB,MAAM;SACP;KACF;IACD,IAAI,CAAC,YAAY;QACf,MAAM,IAAI,QAAQ,CAAC,yCAAyC,CAAC,CAAC;IAChE,IAAI,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1C,OAAO,CAAC,GAAG,CAAC,OAAO,YAAY,oBAAoB,CAAC,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,cAAc,QAAQ,GAAG,CAAC,CAAC;IAEvC,oFAAoF;IACpF,qCAAqC;IACrC,IAAI,aAAa,GAAiC;QAChD,GAAG,EAAE;YACH,OAAO,EAAE,QAAQ;YACjB,IAAI,EAAE,CAAC,YAAY,CAAC;YACpB,OAAO,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE;SAC3B;QACD,KAAK,EAAE;YACL,OAAO,EAAE,QAAQ;YACjB,IAAI,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC;YAC/B,OAAO,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE;SAC3B;KACF,CAAC;IACF,yCAAyC;IACzC,IAAI,aAAa,GAAyC;QACxD,4CAA4C;QAC5C,gBAAgB,EAAE;YAChB;gBACE,QAAQ,EAAE,SAAS;gBACnB,MAAM,EAAE,MAAM;aACf;SACF;QACD,WAAW,EAAE;YACX,oBAAoB,EAAE,uBAAuB;YAC7C,oFAAoF;YACpF,UAAU,EAAE;gBACV,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC,eAAe,CAAC;gBACzD,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC,UAAU,CAAC;gBACpD,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC,UAAU,CAAC;gBACpD,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC,oBAAoB,CAAC;aAC/D;SACF;KACF,CAAC;IAEF,mDAAmD;IACnD,IAAI,MAAM,GAAG,IAAI,cAAc,CAAC,cAAc,CAC5C,uBAAuB,EACvB,yBAAyB,EACzB,aAAa,EACb,aAAa,CACd,CAAC;IACF,IAAI,UAAU,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;IAEhC,iEAAiE;IACjE,sDAAsD;IACtD,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AACzC,CAAC;AAED,yDAAyD;AACzD,0EAA0E;AAC1E,SAAgB,QAAQ,CAAC,OAAgC;IACvD,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;IACnD,sBAAsB,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AAHD,4BAGC;AAED,2DAA2D;AAC3D,SAAgB,UAAU,KAAI,CAAC;AAA/B,gCAA+B"}

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

View File

@@ -1,7 +1,7 @@
{
"runtimeTarget": {
"name": ".NETCoreApp,Version=v2.1",
"signature": "119f10a736b694375d4fbb636ed1f26ff2dcca3d"
"signature": "581d4a2b95ddb38a06e4f4668085df59e24bb64d"
},
"compilationOptions": {},
"targets": {
@@ -9,30 +9,17 @@
"UpsilonLanguageServer/1.0.0": {
"dependencies": {
"CXuesong.JsonRpc.Streams": "0.4.2",
"CXuesong.LanguageServer.VsCode": "0.2.0",
"Microsoft.Extensions.Logging": "2.1.1",
"Microsoft.Extensions.Logging.Debug": "1.1.0",
"Microsoft.Extensions.Logging.TraceSource": "2.1.1",
"JsonRpc.DynamicProxy": "0.4.0.0",
"LanguageServer.VsCode": "0.2.0.0",
"Upsilon": "1.0.0.0"
},
"runtime": {
"UpsilonLanguageServer.dll": {}
}
},
"CXuesong.JsonRpc.DynamicProxy/0.4.0": {
"dependencies": {
"CXuesong.JsonRpc.Standard": "0.4.1",
"Microsoft.Extensions.Logging.Abstractions": "2.1.1",
"Newtonsoft.Json": "10.0.2",
"System.Reflection.Emit": "4.3.0"
},
"runtime": {
"lib/netstandard1.1/JsonRpc.DynamicProxy.dll": {
"assemblyVersion": "0.4.0.0",
"fileVersion": "0.4.0.0"
}
}
},
"CXuesong.JsonRpc.Standard/0.4.1": {
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "2.1.1",
@@ -56,19 +43,6 @@
}
}
},
"CXuesong.LanguageServer.VsCode/0.2.0": {
"dependencies": {
"CXuesong.JsonRpc.DynamicProxy": "0.4.0",
"CXuesong.JsonRpc.Standard": "0.4.1",
"Newtonsoft.Json": "10.0.2"
},
"runtime": {
"lib/netstandard1.1/LanguageServer.VsCode.dll": {
"assemblyVersion": "0.2.0.0",
"fileVersion": "0.2.0.0"
}
}
},
"Microsoft.CSharp/4.3.0": {
"dependencies": {
"System.Collections": "4.3.0",
@@ -543,6 +517,22 @@
"System.Xml.ReaderWriter": "4.3.0"
}
},
"JsonRpc.DynamicProxy/0.4.0.0": {
"runtime": {
"JsonRpc.DynamicProxy.dll": {
"assemblyVersion": "0.4.0.0",
"fileVersion": "0.4.0.0"
}
}
},
"LanguageServer.VsCode/0.2.0.0": {
"runtime": {
"LanguageServer.VsCode.dll": {
"assemblyVersion": "0.2.0.0",
"fileVersion": "0.2.0.0"
}
}
},
"Upsilon/1.0.0.0": {
"runtime": {
"Upsilon.dll": {
@@ -559,13 +549,6 @@
"serviceable": false,
"sha512": ""
},
"CXuesong.JsonRpc.DynamicProxy/0.4.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-HpChb9D5HPDCUdbgDOu2IN4VN+MCDe/OQBikFOR6CNxzQFg1TLpespKZsL84Y5kqHQ9WJpRgZRdxXpA5fs7N6A==",
"path": "cxuesong.jsonrpc.dynamicproxy/0.4.0",
"hashPath": "cxuesong.jsonrpc.dynamicproxy.0.4.0.nupkg.sha512"
},
"CXuesong.JsonRpc.Standard/0.4.1": {
"type": "package",
"serviceable": true,
@@ -580,13 +563,6 @@
"path": "cxuesong.jsonrpc.streams/0.4.2",
"hashPath": "cxuesong.jsonrpc.streams.0.4.2.nupkg.sha512"
},
"CXuesong.LanguageServer.VsCode/0.2.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-DZguhKtGgen10i8KmCEsPNxr5KSPgavyF6wyhEcFDnAnnNz0zV3r16ncomnv7cULy26HVWhwPjFBHd75wJcBEA==",
"path": "cxuesong.languageserver.vscode/0.2.0",
"hashPath": "cxuesong.languageserver.vscode.0.2.0.nupkg.sha512"
},
"Microsoft.CSharp/4.3.0": {
"type": "package",
"serviceable": true,
@@ -951,6 +927,16 @@
"path": "system.xml.xmldocument/4.3.0",
"hashPath": "system.xml.xmldocument.4.3.0.nupkg.sha512"
},
"JsonRpc.DynamicProxy/0.4.0.0": {
"type": "reference",
"serviceable": false,
"sha512": ""
},
"LanguageServer.VsCode/0.2.0.0": {
"type": "reference",
"serviceable": false,
"sha512": ""
},
"Upsilon/1.0.0.0": {
"type": "reference",
"serviceable": false,

View File

@@ -9,8 +9,8 @@ import * as fs from "fs";
// Defines the search path of your language server DLL. (.NET Core)
const languageServerPaths = [
"./server/UpsilonLanguageServer.dll",
"../UpsilonLanguageServer/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/UpsilonLanguageServer.dll"
"../UpsilonLanguageServer/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/UpsilonLanguageServer.dll",
"./server/UpsilonLanguageServer.dll"
];
function activateLanguageServer(context: vscode.ExtensionContext) {