Deukhoofd
/
Upsilon-VsCode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update Upsilon to newer version

This commit is contained in:
Deukhoofd 2019-02-14 12:51:49 +01:00
parent 6b2db3f169
commit c69ffb9752
No known key found for this signature in database
GPG Key ID: B4C087AC81641654
8 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Client/server/Upsilon.dll
View File

Binary file not shown.

BIN
Client/server/Upsilon.pdb
View File

Binary file not shown.

BIN
Client/upsilon-language-extension-1.0.0.vsix
View File

Binary file not shown.

BIN
UpsilonLanguageServer/Lib/Upsilon.dll
View File

Binary file not shown.

BIN
UpsilonLanguageServer/Lib/Upsilon.pdb
View File

Binary file not shown.

8
UpsilonLanguageServer/UpsilonLanguageServer.sln.DotSettings.user
View File

@ -1,3 +1,9 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Int64 x:Key="/Default/CodeStyle/Naming/CSharpAutoNaming/AutoNamingCompletedVersion/@EntryValue">2</s:Int64>
<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpAutoNaming/IsNamingAutoDetectionCompleted/@EntryValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpAutoNaming/IsNamingAutoDetectionCompleted/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpAutoNaming/IsNotificationDisabled/@EntryValue">True</s:Boolean></wpf:ResourceDictionary> <s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpAutoNaming/IsNotificationDisabled/@EntryValue">True</s:Boolean>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/AutoDetectedNamingRules/=Locals/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/AutoDetectedNamingRules/=Method/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/AutoDetectedNamingRules/=Parameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/AutoDetectedNamingRules/=Property/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/AutoDetectedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String></wpf:ResourceDictionary>

3
UpsilonLanguageServer/UpsilonLanguageServer/BoundTypeParser.cs
View File

@ -165,7 +165,8 @@ namespace UpsilonLanguageServer
var parsedReturnType = ParseType(returnType); var parsedReturnType = ParseType(returnType);
listOptions.Add(new InternalFunctionVariableOption(parsedReturnType, parameters.ToArray(), null)); listOptions.Add(new InternalFunctionVariableOption(parsedReturnType, parameters.ToArray(), null));
} }
StaticScope.BoundScope.AssignToNearest(new InternalFunctionVariableSymbol(name, false, Type.Function, listOptions) StaticScope.BoundScope.AssignToNearest(
new InternalFunctionVariableSymbol(name, false, listOptions, false)
{ {
CommentValue = comments CommentValue = comments
}); });

8
UpsilonLanguageServer/UpsilonLanguageServer/Services/TextDocumentServer.cs
View File

@ -33,7 +33,7 @@ namespace UpsilonLanguageServer.Services
var contents = new StringBuilder($"Kind: {findNode.Kind}"); var contents = new StringBuilder($"Kind: {findNode.Kind}");
if (findNode is BoundExpression expression) if (findNode is BoundExpression expression)
{ {
contents.Append($"\n\nType: {expression.Type}"); contents.Append($"\n\nType: {expression.ValueType}");
} }
if (findNode is BoundVariableSymbol varSymbol) if (findNode is BoundVariableSymbol varSymbol)
@ -50,7 +50,7 @@ namespace UpsilonLanguageServer.Services
} }
else if (findNode is BoundVariableAssignment variableAssignment) else if (findNode is BoundVariableAssignment variableAssignment)
{ {
contents.Append($"\n\nType: {variableAssignment.Variable.Type}"); contents.Append($"\n\nType: {variableAssignment.Variable.ValueType}");
} }
else if (findNode is BoundFunctionExpression fe) else if (findNode is BoundFunctionExpression fe)
{ {
@ -59,8 +59,8 @@ namespace UpsilonLanguageServer.Services
else if (findNode is BoundFunctionCallExpression functionCall) else if (findNode is BoundFunctionCallExpression functionCall)
{ {
contents.Append( contents.Append(
$"\n\nParameters: {string.Join(", ", functionCall.Parameters.Select(x => x.Type))}"); $"\n\nParameters: {string.Join(", ", functionCall.Parameters.Select(x => x.ValueType))}");
contents.Append($"\n\nReturns: {functionCall.Type}"); contents.Append($"\n\nReturns: {functionCall.ValueType}");
} }
return new Hover() return new Hover()