Skip to content

Commit b5c5b54

Browse files
author
Kayla Davis
committed
fixing declaration request bug
1 parent 57392ba commit b5c5b54

File tree

3 files changed

+21
-11
lines changed

3 files changed

+21
-11
lines changed

src/PowerShellEditorServices.Transport.Stdio/Request/DeclarationRequest.cs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,17 @@ public override void ProcessMessage(
2323
scriptFile,
2424
this.Arguments.Line,
2525
this.Arguments.Offset);
26+
27+
GetDefinitionResult definition = null;
28+
if (foundSymbol != null)
29+
{
30+
definition =
31+
editorSession.LanguageService.GetDefinitionOfSymbol(
32+
scriptFile,
33+
foundSymbol,
34+
editorSession.Workspace);
2635

27-
GetDefinitionResult definition =
28-
editorSession.LanguageService.GetDefinitionOfSymbol(
29-
scriptFile,
30-
foundSymbol,
31-
editorSession.Workspace);
36+
}
3237

3338
if (definition != null)
3439
{
@@ -45,6 +50,9 @@ public override void ProcessMessage(
4550
messageWriter.WriteMessage(
4651
this.PrepareResponse(defResponse));
4752
}
53+
54+
messageWriter.WriteMessage(
55+
this.PrepareResponse(DefinitionResponse.Create()));
4856
}
4957
}
5058
}

src/PowerShellEditorServices/Language/FindDeclartionVisitor.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
44
//
55

6+
using System;
67
using System.Management.Automation.Language;
78

89
namespace Microsoft.PowerShell.EditorServices.Language
@@ -45,7 +46,7 @@ public override AstVisitAction VisitFunctionDefinition(FunctionDefinitionAst fun
4546
};
4647

4748
if (symbolRef.SymbolType.Equals(SymbolType.Function) &&
48-
nameExtent.Text.Equals(symbolRef.ScriptRegion.Text))
49+
nameExtent.Text.Equals(symbolRef.ScriptRegion.Text, StringComparison.InvariantCultureIgnoreCase))
4950
{
5051
this.FoundDeclartion =
5152
new SymbolReference(
@@ -69,7 +70,7 @@ public override AstVisitAction VisitFunctionDefinition(FunctionDefinitionAst fun
6970
public override AstVisitAction VisitVariableExpression(VariableExpressionAst variableExpressionAst)
7071
{
7172
if(symbolRef.SymbolType.Equals(SymbolType.Variable) &&
72-
variableExpressionAst.Extent.Text.Equals(symbolRef.SymbolName))
73+
variableExpressionAst.Extent.Text.Equals(symbolRef.SymbolName, StringComparison.InvariantCultureIgnoreCase))
7374
{
7475
this.FoundDeclartion =
7576
new SymbolReference(

src/PowerShellEditorServices/Language/FindReferencesVisitor.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
44
//
55

6+
using System;
67
using System.Collections.Generic;
78
using System.Management.Automation.Language;
89

@@ -34,7 +35,7 @@ public override AstVisitAction VisitCommand(CommandAst commandAst)
3435
{
3536
Ast commandNameAst = commandAst.CommandElements[0];
3637
if(symbolRef.SymbolType.Equals(SymbolType.Function) &&
37-
commandNameAst.Extent.Text.Equals(symbolRef.ScriptRegion.Text))
38+
commandNameAst.Extent.Text.Equals(symbolRef.ScriptRegion.Text, StringComparison.InvariantCultureIgnoreCase))
3839
{
3940
this.FoundReferences.Add(new SymbolReference(
4041
SymbolType.Function,
@@ -65,7 +66,7 @@ public override AstVisitAction VisitFunctionDefinition(FunctionDefinitionAst fun
6566
};
6667

6768
if (symbolRef.SymbolType.Equals(SymbolType.Function) &&
68-
nameExtent.Text.Equals(symbolRef.SymbolName))
69+
nameExtent.Text.Equals(symbolRef.SymbolName, StringComparison.InvariantCultureIgnoreCase))
6970
{
7071
this.FoundReferences.Add(new SymbolReference(
7172
SymbolType.Function,
@@ -83,7 +84,7 @@ public override AstVisitAction VisitFunctionDefinition(FunctionDefinitionAst fun
8384
public override AstVisitAction VisitCommandParameter(CommandParameterAst commandParameterAst)
8485
{
8586
if (symbolRef.SymbolType.Equals(SymbolType.Parameter) &&
86-
commandParameterAst.Extent.Text.Equals(symbolRef.SymbolName))
87+
commandParameterAst.Extent.Text.Equals(symbolRef.SymbolName, StringComparison.InvariantCultureIgnoreCase))
8788
{
8889
this.FoundReferences.Add(new SymbolReference(
8990
SymbolType.Parameter,
@@ -101,7 +102,7 @@ public override AstVisitAction VisitCommandParameter(CommandParameterAst command
101102
public override AstVisitAction VisitVariableExpression(VariableExpressionAst variableExpressionAst)
102103
{
103104
if(symbolRef.SymbolType.Equals(SymbolType.Variable) &&
104-
variableExpressionAst.Extent.Text.Equals(symbolRef.SymbolName))
105+
variableExpressionAst.Extent.Text.Equals(symbolRef.SymbolName, StringComparison.InvariantCultureIgnoreCase))
105106
{
106107
this.FoundReferences.Add(new SymbolReference(
107108
SymbolType.Variable,

0 commit comments

Comments
 (0)