Fixed error if two assemblies define a bound type with the same name
This commit is contained in:
parent
f8fe056b73
commit
2660422d75
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -24,23 +24,13 @@
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="b677bed2-8935-49bf-995f-b1e4d6bb4ad3" name="Default Changelist" comment="">
|
<list default="true" id="b677bed2-8935-49bf-995f-b1e4d6bb4ad3" name="Default Changelist" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/../Client/server/Upsilon.dll" beforeDir="false" afterPath="$PROJECT_DIR$/../Client/server/Upsilon.dll" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../Client/server/Upsilon.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/../Client/server/Upsilon.pdb" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../Client/server/UpsilonLanguageServer.dll" beforeDir="false" afterPath="$PROJECT_DIR$/../Client/server/UpsilonLanguageServer.dll" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/../Client/server/UpsilonLanguageServer.dll" beforeDir="false" afterPath="$PROJECT_DIR$/../Client/server/UpsilonLanguageServer.dll" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/../Client/server/UpsilonLanguageServer.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/../Client/server/UpsilonLanguageServer.pdb" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/../Client/server/UpsilonLanguageServer.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/../Client/server/UpsilonLanguageServer.pdb" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/../Client/upsilon-language-extension-1.0.0.vsix" beforeDir="false" afterPath="$PROJECT_DIR$/../Client/upsilon-language-extension-1.0.0.vsix" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/../Client/upsilon-language-extension-1.0.0.vsix" beforeDir="false" afterPath="$PROJECT_DIR$/../Client/upsilon-language-extension-1.0.0.vsix" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.UpsilonLanguageServer/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.UpsilonLanguageServer/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/.idea.UpsilonLanguageServer/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.UpsilonLanguageServer/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Lib/Upsilon.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/Upsilon.dll" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Lib/Upsilon.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/Upsilon.pdb" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/ReferenceHandler/LoadReferenceLibraries.cs" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/ReferenceHandler/LoadReferenceLibraries.cs" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/ReferenceHandler/LoadReferenceLibraries.cs" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/ReferenceHandler/LoadReferenceLibraries.cs" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/Services/InitializationService.cs" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/Services/InitializationService.cs" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/Services/WorkspaceService.cs" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/Services/WorkspaceService.cs" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/Upsilon.dll" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/Upsilon.dll" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/Upsilon.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/Upsilon.pdb" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/UpsilonLanguageServer.dll" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/UpsilonLanguageServer.dll" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/UpsilonLanguageServer.dll" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/UpsilonLanguageServer.dll" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/UpsilonLanguageServer.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/UpsilonLanguageServer.pdb" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/UpsilonLanguageServer.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/UpsilonLanguageServer.pdb" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/publish/Upsilon.dll" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/publish/Upsilon.dll" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/publish/Upsilon.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/publish/Upsilon.pdb" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/publish/UpsilonLanguageServer.dll" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/publish/UpsilonLanguageServer.dll" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/publish/UpsilonLanguageServer.dll" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/publish/UpsilonLanguageServer.dll" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/publish/UpsilonLanguageServer.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/publish/UpsilonLanguageServer.pdb" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/publish/UpsilonLanguageServer.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/bin/Debug/netcoreapp2.1/publish/UpsilonLanguageServer.pdb" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/obj/Debug/netcoreapp2.1/UpsilonLanguageServer.csprojAssemblyReference.cache" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/obj/Debug/netcoreapp2.1/UpsilonLanguageServer.csprojAssemblyReference.cache" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/UpsilonLanguageServer/obj/Debug/netcoreapp2.1/UpsilonLanguageServer.csprojAssemblyReference.cache" beforeDir="false" afterPath="$PROJECT_DIR$/UpsilonLanguageServer/obj/Debug/netcoreapp2.1/UpsilonLanguageServer.csprojAssemblyReference.cache" afterDir="false" />
|
||||||
|
|
@ -174,79 +164,80 @@
|
||||||
<file pinned="false" current-in-tab="true">
|
<file pinned="false" current-in-tab="true">
|
||||||
<entry file="file://$PROJECT_DIR$/UpsilonLanguageServer/ReferenceHandler/LoadReferenceLibraries.cs">
|
<entry file="file://$PROJECT_DIR$/UpsilonLanguageServer/ReferenceHandler/LoadReferenceLibraries.cs">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="467">
|
<state relative-caret-position="360">
|
||||||
<caret line="120" column="64" lean-forward="true" selection-start-line="120" selection-start-column="64" selection-end-line="120" selection-end-column="64" />
|
<caret line="69" column="13" lean-forward="true" selection-start-line="69" selection-start-column="13" selection-end-line="69" selection-end-column="13" />
|
||||||
<folding>
|
<folding>
|
||||||
<marker date="1550573203572" expanded="true" signature="6:272" ph="..." />
|
<marker date="1550574235329" expanded="true" signature="6:272" ph="..." />
|
||||||
<marker date="1550573203572" expanded="true" signature="392:15775" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="392:16015" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="441:15773" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="441:16013" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="612:1481" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="612:1481" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="996:1373" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="996:1373" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="1113:1236" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="1113:1236" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="1632:6074" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="1632:6314" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="1748:1892" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="1748:1892" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="2494:2602" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="2525:2679" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="2714:5516" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="2734:2842" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="2970:3127" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="2954:5756" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="3148:5502" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="3210:3367" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="3311:5375" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="3388:5742" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="3603:4865" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="3551:5615" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="3832:4713" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="3843:5105" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="4205:4655" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="4072:4953" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="4753:4837" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="4445:4895" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="4894:5353" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="4993:5077" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="5046:5325" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="5134:5593" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="5855:6064" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="5286:5565" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="6167:6591" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="6095:6304" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="6272:6524" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="6407:6831" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="6730:7598" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="6512:6764" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="6866:7100" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="6970:7838" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="7004:7086" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="7106:7340" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="7242:7564" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="7244:7326" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="7351:7417" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="7482:7804" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="7660:13008" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="7591:7657" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="7699:7964" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="7900:13248" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="7780:7912" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="7939:8204" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="8094:8699" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="8020:8152" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="8128:8598" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="8334:8939" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="8268:8580" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="8368:8838" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="8423:8558" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="8508:8820" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="8637:8685" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="8663:8798" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="8736:9452" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="8877:8925" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="8855:9438" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="8976:9692" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="8897:9316" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="9095:9678" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="9075:9294" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="9137:9556" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="9363:9420" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="9315:9534" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="9510:10212" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="9603:9660" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="9760:9967" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="9750:10452" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="9878:9948" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="10000:10207" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="9988:10198" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="10118:10188" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="10108:10178" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="10228:10438" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="10276:11006" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="10348:10418" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="10548:10758" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="10516:11246" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="10669:10739" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="10788:10998" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="10779:10992" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="10909:10979" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="10902:10972" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="11019:11232" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="11133:12814" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="11142:11212" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="11764:12169" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="11373:13054" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="12034:12149" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="12004:12409" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="12238:12346" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="12274:12389" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="12427:12509" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="12478:12586" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="12530:12800" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="12667:12749" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="12643:12780" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="12770:13040" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="12865:12968" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="12883:13020" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="13077:14729" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="13105:13208" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="13497:13638" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="13317:14969" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="13695:14564" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="13737:13878" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="13796:14164" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="13935:14804" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="14245:14550" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="14036:14404" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="14635:14689" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="14485:14790" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="14756:14849" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="14875:14929" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="14887:15041" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="14996:15089" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="15072:15185" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="15127:15281" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="15229:15313" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="15312:15425" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="15352:15766" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="15469:15553" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="15563:15756" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="15592:16006" ph="{...}" />
|
||||||
|
<marker date="1550574235329" expanded="true" signature="15803:15996" ph="{...}" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
|
|
@ -1761,7 +1752,7 @@
|
||||||
<workItem from="1548502951850" duration="1915000" />
|
<workItem from="1548502951850" duration="1915000" />
|
||||||
<workItem from="1550144997295" duration="751000" />
|
<workItem from="1550144997295" duration="751000" />
|
||||||
<workItem from="1550423344529" duration="188000" />
|
<workItem from="1550423344529" duration="188000" />
|
||||||
<workItem from="1550507873666" duration="11230000" />
|
<workItem from="1550507873666" duration="12363000" />
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00001" summary="Initial commit">
|
<task id="LOCAL-00001" summary="Initial commit">
|
||||||
<created>1543180742884</created>
|
<created>1543180742884</created>
|
||||||
|
|
@ -2015,11 +2006,18 @@
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1550513532454</updated>
|
<updated>1550513532454</updated>
|
||||||
</task>
|
</task>
|
||||||
<option name="localTasksCounter" value="37" />
|
<task id="LOCAL-00037" summary="More support for loading from reference files, now also registers UpsilonCreateStatic types">
|
||||||
|
<created>1550573722990</created>
|
||||||
|
<option name="number" value="00037" />
|
||||||
|
<option name="presentableId" value="LOCAL-00037" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1550573722990</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="38" />
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TimeTrackingManager">
|
<component name="TimeTrackingManager">
|
||||||
<option name="totallyTimeSpent" value="178472000" />
|
<option name="totallyTimeSpent" value="179605000" />
|
||||||
</component>
|
</component>
|
||||||
<component name="TodoView">
|
<component name="TodoView">
|
||||||
<todo-panel id="selected-file">
|
<todo-panel id="selected-file">
|
||||||
|
|
@ -2032,6 +2030,7 @@
|
||||||
</component>
|
</component>
|
||||||
<component name="ToolWindowManager">
|
<component name="ToolWindowManager">
|
||||||
<frame x="1920" y="30" width="1920" height="1050" extended-state="6" />
|
<frame x="1920" y="30" width="1920" height="1050" extended-state="6" />
|
||||||
|
<editor active="true" />
|
||||||
<layout>
|
<layout>
|
||||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.36305732" />
|
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.36305732" />
|
||||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||||
|
|
@ -2098,7 +2097,6 @@
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<option name="LOCAL_CHANGES_DETAILS_PREVIEW_SHOWN" value="true" />
|
<option name="LOCAL_CHANGES_DETAILS_PREVIEW_SHOWN" value="true" />
|
||||||
<MESSAGE value="Support for setting userdata types, validating them and autocompleting them" />
|
|
||||||
<MESSAGE value="I actually already did this todo" />
|
<MESSAGE value="I actually already did this todo" />
|
||||||
<MESSAGE value="Support for text completion when requesting complete in the middle of indexer" />
|
<MESSAGE value="Support for text completion when requesting complete in the middle of indexer" />
|
||||||
<MESSAGE value="Changes, fixes and features for autocompletion" />
|
<MESSAGE value="Changes, fixes and features for autocompletion" />
|
||||||
|
|
@ -2123,7 +2121,8 @@
|
||||||
<MESSAGE value="Fix tables not properly parsing their key, value types when working with nested tables" />
|
<MESSAGE value="Fix tables not properly parsing their key, value types when working with nested tables" />
|
||||||
<MESSAGE value="Update Upsilon to newer version" />
|
<MESSAGE value="Update Upsilon to newer version" />
|
||||||
<MESSAGE value="Initial support for reading references from .dll libraries instead of pre-extracted .json files" />
|
<MESSAGE value="Initial support for reading references from .dll libraries instead of pre-extracted .json files" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="Initial support for reading references from .dll libraries instead of pre-extracted .json files" />
|
<MESSAGE value="More support for loading from reference files, now also registers UpsilonCreateStatic types" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value="More support for loading from reference files, now also registers UpsilonCreateStatic types" />
|
||||||
</component>
|
</component>
|
||||||
<component name="XDebuggerManager">
|
<component name="XDebuggerManager">
|
||||||
<breakpoint-manager>
|
<breakpoint-manager>
|
||||||
|
|
@ -2179,13 +2178,13 @@
|
||||||
</line-breakpoint>
|
</line-breakpoint>
|
||||||
<line-breakpoint enabled="true" type="DotNet Breakpoints">
|
<line-breakpoint enabled="true" type="DotNet Breakpoints">
|
||||||
<url>file://$PROJECT_DIR$/UpsilonLanguageServer/ReferenceHandler/LoadReferenceLibraries.cs</url>
|
<url>file://$PROJECT_DIR$/UpsilonLanguageServer/ReferenceHandler/LoadReferenceLibraries.cs</url>
|
||||||
<line>126</line>
|
<line>132</line>
|
||||||
<properties documentPath="$PROJECT_DIR$/UpsilonLanguageServer/ReferenceHandler/LoadReferenceLibraries.cs" initialLine="115">
|
<properties documentPath="$PROJECT_DIR$/UpsilonLanguageServer/ReferenceHandler/LoadReferenceLibraries.cs" initialLine="115">
|
||||||
<startOffsets>
|
<startOffsets>
|
||||||
<option value="5396" />
|
<option value="5636" />
|
||||||
</startOffsets>
|
</startOffsets>
|
||||||
<endOffsets>
|
<endOffsets>
|
||||||
<option value="5484" />
|
<option value="5724" />
|
||||||
</endOffsets>
|
</endOffsets>
|
||||||
</properties>
|
</properties>
|
||||||
<option name="timeStamp" value="78" />
|
<option name="timeStamp" value="78" />
|
||||||
|
|
@ -3958,79 +3957,80 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/UpsilonLanguageServer/ReferenceHandler/LoadReferenceLibraries.cs">
|
<entry file="file://$PROJECT_DIR$/UpsilonLanguageServer/ReferenceHandler/LoadReferenceLibraries.cs">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="467">
|
<state relative-caret-position="360">
|
||||||
<caret line="120" column="64" lean-forward="true" selection-start-line="120" selection-start-column="64" selection-end-line="120" selection-end-column="64" />
|
<caret line="69" column="13" lean-forward="true" selection-start-line="69" selection-start-column="13" selection-end-line="69" selection-end-column="13" />
|
||||||
<folding>
|
<folding>
|
||||||
<marker date="1550573203572" expanded="true" signature="6:272" ph="..." />
|
<marker date="1550574235329" expanded="true" signature="6:272" ph="..." />
|
||||||
<marker date="1550573203572" expanded="true" signature="392:15775" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="392:16015" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="441:15773" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="441:16013" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="612:1481" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="612:1481" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="996:1373" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="996:1373" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="1113:1236" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="1113:1236" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="1632:6074" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="1632:6314" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="1748:1892" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="1748:1892" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="2494:2602" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="2525:2679" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="2714:5516" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="2734:2842" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="2970:3127" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="2954:5756" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="3148:5502" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="3210:3367" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="3311:5375" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="3388:5742" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="3603:4865" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="3551:5615" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="3832:4713" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="3843:5105" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="4205:4655" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="4072:4953" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="4753:4837" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="4445:4895" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="4894:5353" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="4993:5077" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="5046:5325" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="5134:5593" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="5855:6064" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="5286:5565" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="6167:6591" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="6095:6304" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="6272:6524" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="6407:6831" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="6730:7598" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="6512:6764" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="6866:7100" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="6970:7838" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="7004:7086" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="7106:7340" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="7242:7564" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="7244:7326" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="7351:7417" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="7482:7804" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="7660:13008" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="7591:7657" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="7699:7964" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="7900:13248" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="7780:7912" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="7939:8204" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="8094:8699" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="8020:8152" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="8128:8598" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="8334:8939" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="8268:8580" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="8368:8838" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="8423:8558" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="8508:8820" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="8637:8685" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="8663:8798" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="8736:9452" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="8877:8925" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="8855:9438" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="8976:9692" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="8897:9316" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="9095:9678" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="9075:9294" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="9137:9556" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="9363:9420" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="9315:9534" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="9510:10212" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="9603:9660" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="9760:9967" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="9750:10452" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="9878:9948" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="10000:10207" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="9988:10198" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="10118:10188" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="10108:10178" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="10228:10438" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="10276:11006" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="10348:10418" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="10548:10758" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="10516:11246" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="10669:10739" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="10788:10998" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="10779:10992" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="10909:10979" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="10902:10972" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="11019:11232" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="11133:12814" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="11142:11212" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="11764:12169" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="11373:13054" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="12034:12149" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="12004:12409" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="12238:12346" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="12274:12389" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="12427:12509" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="12478:12586" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="12530:12800" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="12667:12749" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="12643:12780" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="12770:13040" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="12865:12968" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="12883:13020" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="13077:14729" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="13105:13208" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="13497:13638" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="13317:14969" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="13695:14564" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="13737:13878" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="13796:14164" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="13935:14804" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="14245:14550" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="14036:14404" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="14635:14689" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="14485:14790" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="14756:14849" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="14875:14929" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="14887:15041" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="14996:15089" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="15072:15185" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="15127:15281" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="15229:15313" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="15312:15425" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="15352:15766" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="15469:15553" ph="{...}" />
|
||||||
<marker date="1550573203572" expanded="true" signature="15563:15756" ph="{...}" />
|
<marker date="1550574235329" expanded="true" signature="15592:16006" ph="{...}" />
|
||||||
|
<marker date="1550574235329" expanded="true" signature="15803:15996" ph="{...}" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
|
|
|
||||||
|
|
@ -62,9 +62,15 @@ namespace UpsilonLanguageServer.ReferenceHandler
|
||||||
.ToArray();
|
.ToArray();
|
||||||
|
|
||||||
var requiredUserDataAttribute = typeof(UpsilonUserDataAttribute).FullName;
|
var requiredUserDataAttribute = typeof(UpsilonUserDataAttribute).FullName;
|
||||||
var userDataTypes = types
|
var userDataTypesEnumerable = types
|
||||||
.SelectMany(x => GetDefinitions(x, requiredUserDataAttribute))
|
.SelectMany(x => GetDefinitions(x, requiredUserDataAttribute));
|
||||||
.ToDictionary(x => x.Item1, x => x.Item2);
|
|
||||||
|
var userDataTypes = new Dictionary<string, TypeDefinition>();
|
||||||
|
foreach (var tuple in userDataTypesEnumerable)
|
||||||
|
{
|
||||||
|
if (!userDataTypes.ContainsKey(tuple.Item1))
|
||||||
|
userDataTypes.Add(tuple.Item1, tuple.Item2);
|
||||||
|
}
|
||||||
|
|
||||||
foreach (var definition in userDataTypes)
|
foreach (var definition in userDataTypes)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue