Skip to content

Commit 5f8ff01

Browse files
committed
Reorganize Transport.Stdio files
This change reorganizes the files in the Transport.Stdio library to prepare for a split in message structure between language server and debug adapter messages. The following commits will change class hierarchy and namespaces for all affected files.
1 parent d392fce commit 5f8ff01

File tree

89 files changed

+144
-271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+144
-271
lines changed

src/PowerShellEditorServices.Host/StdioConsoleHost.cs

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,30 @@ Task<int> IConsoleHost.PromptForChoice(
4343
IEnumerable<ChoiceDetails> choices,
4444
int defaultChoice)
4545
{
46-
// Create and store a TaskCompletionSource that will be
47-
// used to send the user's response back to the caller
48-
this.currentPromptChoiceTask = new TaskCompletionSource<int>();
49-
this.currentReplEventSequence++;
50-
51-
this.messageWriter.WriteMessage(
52-
new ReplPromptChoiceEvent
53-
{
54-
Body = new ReplPromptChoiceEventBody
55-
{
56-
Seq = this.currentReplEventSequence,
57-
Caption = caption,
58-
Message = message,
59-
DefaultChoice = defaultChoice,
60-
Choices =
61-
choices
62-
.Select(ReplPromptChoiceDetails.FromChoiceDescription)
63-
.ToArray()
64-
}
65-
});
66-
67-
return this.currentPromptChoiceTask.Task;
46+
//// Create and store a TaskCompletionSource that will be
47+
//// used to send the user's response back to the caller
48+
//this.currentPromptChoiceTask = new TaskCompletionSource<int>();
49+
//this.currentReplEventSequence++;
50+
51+
//this.messageWriter.WriteMessage(
52+
// new ReplPromptChoiceEvent
53+
// {
54+
// Body = new ReplPromptChoiceEventBody
55+
// {
56+
// Seq = this.currentReplEventSequence,
57+
// Caption = caption,
58+
// Message = message,
59+
// DefaultChoice = defaultChoice,
60+
// Choices =
61+
// choices
62+
// .Select(ReplPromptChoiceDetails.FromChoiceDescription)
63+
// .ToArray()
64+
// }
65+
// });
66+
67+
//return this.currentPromptChoiceTask.Task;
68+
69+
throw new NotImplementedException("This method is currently being refactored and is not available.");
6870
}
6971

7072
void IConsoleHost.PromptForChoiceResult(

src/PowerShellEditorServices.Transport.Stdio/Event/ReplPromptChoiceEvent.cs

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/PowerShellEditorServices.Transport.Stdio/Event/ReplWriteOutputEvent.cs

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/PowerShellEditorServices.Transport.Stdio/PowerShellEditorServices.Transport.Stdio.csproj

Lines changed: 82 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -59,95 +59,89 @@
5959
<Reference Include="System.Xml" />
6060
</ItemGroup>
6161
<ItemGroup>
62-
<Compile Include="Constants.cs" />
63-
<Compile Include="Event\DiagnosticEvent.cs" />
64-
<Compile Include="Event\EventBase.cs" />
65-
<Compile Include="Event\ExitedEvent.cs" />
66-
<Compile Include="Event\InitializedEvent.cs" />
67-
<Compile Include="Event\OutputEvent.cs" />
68-
<Compile Include="Event\ReplPromptChoiceEvent.cs">
69-
<SubType>Code</SubType>
70-
</Compile>
71-
<Compile Include="Event\ReplWriteOutputEvent.cs" />
72-
<Compile Include="Event\StartedEvent.cs" />
73-
<Compile Include="Event\StoppedEvent.cs" />
74-
<Compile Include="Event\TerminatedEvent.cs" />
75-
<Compile Include="Message\IMessageProcessor.cs" />
76-
<Compile Include="Message\MessageBase.cs" />
77-
<Compile Include="Message\MessageParseException.cs" />
78-
<Compile Include="Message\MessageParser.cs" />
79-
<Compile Include="Message\MessageReader.cs" />
80-
<Compile Include="Message\MessageType.cs" />
81-
<Compile Include="Message\MessageTypeNameAttribute.cs" />
82-
<Compile Include="Message\MessageTypeResolver.cs" />
83-
<Compile Include="Message\MessageWriter.cs" />
84-
<Compile Include="Model\Breakpoint.cs" />
85-
<Compile Include="Model\Message.cs" />
86-
<Compile Include="Model\Scope.cs" />
87-
<Compile Include="Model\Source.cs" />
88-
<Compile Include="Model\StackFrame.cs" />
89-
<Compile Include="Model\Thread.cs" />
90-
<Compile Include="Model\Variable.cs" />
62+
<Compile Include="MessageProtocol\Constants.cs" />
63+
<Compile Include="DebugAdapter\MessageBase.cs" />
64+
<Compile Include="DebugAdapter\MessageType.cs" />
65+
<Compile Include="LanguageServer\DiagnosticEvent.cs" />
66+
<Compile Include="DebugAdapter\EventBase.cs" />
67+
<Compile Include="DebugAdapter\ExitedEvent.cs" />
68+
<Compile Include="DebugAdapter\InitializedEvent.cs" />
69+
<Compile Include="DebugAdapter\OutputEvent.cs" />
70+
<Compile Include="DebugAdapter\StartedEvent.cs" />
71+
<Compile Include="DebugAdapter\StoppedEvent.cs" />
72+
<Compile Include="DebugAdapter\TerminatedEvent.cs" />
73+
<Compile Include="MessageProtocol\MessageParseException.cs" />
74+
<Compile Include="MessageProtocol\MessageReader.cs" />
75+
<Compile Include="MessageProtocol\MessageTypeNameAttribute.cs" />
76+
<Compile Include="MessageProtocol\MessageTypeResolver.cs" />
77+
<Compile Include="MessageProtocol\MessageWriter.cs" />
78+
<Compile Include="MessageProtocol\IMessageProcessor.cs" />
79+
<Compile Include="DebugAdapter\MessageParser.cs" />
80+
<Compile Include="DebugAdapter\Breakpoint.cs" />
81+
<Compile Include="DebugAdapter\Message.cs" />
82+
<Compile Include="DebugAdapter\Scope.cs" />
83+
<Compile Include="DebugAdapter\Source.cs" />
84+
<Compile Include="DebugAdapter\StackFrame.cs" />
85+
<Compile Include="DebugAdapter\Thread.cs" />
86+
<Compile Include="DebugAdapter\Variable.cs" />
9187
<Compile Include="Properties\AssemblyInfo.cs" />
92-
<Compile Include="Request\AttachRequest.cs" />
93-
<Compile Include="Request\ChangeFileRequest.cs" />
94-
<Compile Include="Request\CloseFileRequest.cs" />
95-
<Compile Include="Request\CompletionDetailsRequest.cs" />
96-
<Compile Include="Request\CompletionsRequest.cs" />
97-
<Compile Include="Request\ContinueRequest.cs" />
98-
<Compile Include="Request\DeclarationRequest.cs" />
99-
<Compile Include="Request\DisconnectRequest.cs" />
100-
<Compile Include="Request\ErrorRequest.cs" />
101-
<Compile Include="Request\EvaluateRequest.cs" />
102-
<Compile Include="Request\FileRequest.cs" />
103-
<Compile Include="Request\InitializeRequest.cs" />
104-
<Compile Include="Request\LaunchRequest.cs" />
105-
<Compile Include="Request\NextRequest.cs" />
106-
<Compile Include="Request\OccurrencesRequest.cs" />
107-
<Compile Include="Request\OpenFileRequest.cs" />
108-
<Compile Include="Request\PauseRequest.cs" />
109-
<Compile Include="Request\QuickInfoRequest.cs" />
110-
<Compile Include="Request\ReferencesRequest.cs" />
111-
<Compile Include="Request\ReplExecuteRequest.cs" />
112-
<Compile Include="Request\RequestBase.cs" />
113-
<Compile Include="Request\ScopesRequest.cs" />
114-
<Compile Include="Request\SetBreakpointsRequest.cs" />
115-
<Compile Include="Request\SetExceptionBreakpointsRequest.cs" />
116-
<Compile Include="Request\SourceRequest.cs" />
117-
<Compile Include="Request\StackTraceRequest.cs" />
118-
<Compile Include="Request\StepInRequest.cs" />
119-
<Compile Include="Request\StepOutRequest.cs" />
120-
<Compile Include="Request\ThreadsRequest.cs" />
121-
<Compile Include="Request\VariablesRequest.cs" />
122-
<Compile Include="Response\AttachResponse.cs" />
123-
<Compile Include="Response\CompletionDetailsResponse.cs" />
124-
<Compile Include="Response\ContinueResponse.cs" />
125-
<Compile Include="Response\DefinitionResponse.cs" />
126-
<Compile Include="Response\DisconnectResponse.cs" />
127-
<Compile Include="Response\ErrorResponse.cs" />
128-
<Compile Include="Response\EvaluateResponse.cs" />
129-
<Compile Include="Response\InitializeResponse.cs" />
130-
<Compile Include="Response\LaunchResponse.cs" />
131-
<Compile Include="Response\LocationResponseElements.cs" />
132-
<Compile Include="Response\NextResponse.cs" />
133-
<Compile Include="Response\OccurrencesResponse.cs" />
134-
<Compile Include="Response\QuickInfoResponse.cs" />
135-
<Compile Include="Response\ReferencesResponse.cs" />
136-
<Compile Include="Response\ScopesResponse.cs" />
137-
<Compile Include="Response\SetBreakpointsResponse.cs" />
138-
<Compile Include="Response\SetExceptionBreakpointsResponse.cs" />
139-
<Compile Include="Response\SignatureHelpResponse.cs" />
140-
<Compile Include="Request\SignatureHelpRequest.cs" />
141-
<Compile Include="Response\CompletionsResponse.cs" />
142-
<Compile Include="Response\MessageErrorResponse.cs" />
143-
<Compile Include="Response\ReplPromptChoiceResponse.cs" />
144-
<Compile Include="Response\ResponseBase.cs" />
145-
<Compile Include="Response\SourceResponse.cs" />
146-
<Compile Include="Response\StackTraceResponse.cs" />
147-
<Compile Include="Response\StepInResponse.cs" />
148-
<Compile Include="Response\StepOutResponse.cs" />
149-
<Compile Include="Response\ThreadsResponse.cs" />
150-
<Compile Include="Response\VariablesResponse.cs" />
88+
<Compile Include="DebugAdapter\AttachRequest.cs" />
89+
<Compile Include="LanguageServer\ChangeFileRequest.cs" />
90+
<Compile Include="LanguageServer\CloseFileRequest.cs" />
91+
<Compile Include="LanguageServer\CompletionDetailsRequest.cs" />
92+
<Compile Include="LanguageServer\CompletionsRequest.cs" />
93+
<Compile Include="DebugAdapter\ContinueRequest.cs" />
94+
<Compile Include="LanguageServer\DeclarationRequest.cs" />
95+
<Compile Include="DebugAdapter\DisconnectRequest.cs" />
96+
<Compile Include="LanguageServer\ErrorRequest.cs" />
97+
<Compile Include="DebugAdapter\EvaluateRequest.cs" />
98+
<Compile Include="LanguageServer\FileRequest.cs" />
99+
<Compile Include="LanguageServer\InitializeRequest.cs" />
100+
<Compile Include="DebugAdapter\LaunchRequest.cs" />
101+
<Compile Include="DebugAdapter\NextRequest.cs" />
102+
<Compile Include="LanguageServer\OccurrencesRequest.cs" />
103+
<Compile Include="LanguageServer\OpenFileRequest.cs" />
104+
<Compile Include="DebugAdapter\PauseRequest.cs" />
105+
<Compile Include="LanguageServer\QuickInfoRequest.cs" />
106+
<Compile Include="LanguageServer\ReferencesRequest.cs" />
107+
<Compile Include="LanguageServer\ReplExecuteRequest.cs" />
108+
<Compile Include="DebugAdapter\RequestBase.cs" />
109+
<Compile Include="DebugAdapter\ScopesRequest.cs" />
110+
<Compile Include="DebugAdapter\SetBreakpointsRequest.cs" />
111+
<Compile Include="DebugAdapter\SetExceptionBreakpointsRequest.cs" />
112+
<Compile Include="DebugAdapter\SourceRequest.cs" />
113+
<Compile Include="DebugAdapter\StackTraceRequest.cs" />
114+
<Compile Include="DebugAdapter\StepInRequest.cs" />
115+
<Compile Include="DebugAdapter\StepOutRequest.cs" />
116+
<Compile Include="DebugAdapter\ThreadsRequest.cs" />
117+
<Compile Include="DebugAdapter\VariablesRequest.cs" />
118+
<Compile Include="DebugAdapter\AttachResponse.cs" />
119+
<Compile Include="LanguageServer\CompletionDetailsResponse.cs" />
120+
<Compile Include="DebugAdapter\ContinueResponse.cs" />
121+
<Compile Include="LanguageServer\DefinitionResponse.cs" />
122+
<Compile Include="DebugAdapter\DisconnectResponse.cs" />
123+
<Compile Include="DebugAdapter\EvaluateResponse.cs" />
124+
<Compile Include="DebugAdapter\InitializeResponse.cs" />
125+
<Compile Include="DebugAdapter\LaunchResponse.cs" />
126+
<Compile Include="LanguageServer\LocationResponseElements.cs" />
127+
<Compile Include="DebugAdapter\NextResponse.cs" />
128+
<Compile Include="LanguageServer\OccurrencesResponse.cs" />
129+
<Compile Include="LanguageServer\QuickInfoResponse.cs" />
130+
<Compile Include="LanguageServer\ReferencesResponse.cs" />
131+
<Compile Include="DebugAdapter\ScopesResponse.cs" />
132+
<Compile Include="DebugAdapter\SetBreakpointsResponse.cs" />
133+
<Compile Include="DebugAdapter\SetExceptionBreakpointsResponse.cs" />
134+
<Compile Include="LanguageServer\SignatureHelpResponse.cs" />
135+
<Compile Include="LanguageServer\SignatureHelpRequest.cs" />
136+
<Compile Include="LanguageServer\CompletionsResponse.cs" />
137+
<Compile Include="LanguageServer\MessageErrorResponse.cs" />
138+
<Compile Include="DebugAdapter\ResponseBase.cs" />
139+
<Compile Include="DebugAdapter\SourceResponse.cs" />
140+
<Compile Include="DebugAdapter\StackTraceResponse.cs" />
141+
<Compile Include="DebugAdapter\StepInResponse.cs" />
142+
<Compile Include="DebugAdapter\StepOutResponse.cs" />
143+
<Compile Include="DebugAdapter\ThreadsResponse.cs" />
144+
<Compile Include="DebugAdapter\VariablesResponse.cs" />
151145
</ItemGroup>
152146
<ItemGroup>
153147
<None Include="packages.config" />

src/PowerShellEditorServices.Transport.Stdio/Response/ErrorResponse.cs

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/PowerShellEditorServices.Transport.Stdio/Response/ReplPromptChoiceResponse.cs

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)