Skip to content
This repository was archived by the owner on Jun 13, 2024. It is now read-only.

Improved code style #40

Open
CraxyTM wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improved code style #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions eclipseplugin/com.microsoft.javapkgsrv/src/com/microsoft/javapkgsrv/ClientProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,27 @@
import com.microsoft.javapkgsrv.Protocol.TypeRootIdentifier;

public class ClientProxy {
private PipeChannel Pipe = null;
private JavaParser Parser = new JavaParser();
private PipeChannel pipe = null;
private JavaParser parser = new JavaParser();
public ClientProxy()
{
Pipe = new PipeChannel();
pipe = new PipeChannel();
}
public ClientProxy(String pipeName)
{
Pipe = new PipeChannel(pipeName);
pipe = new PipeChannel(pipeName);
}
public void Run() throws IOException, JavaModelException
{
Pipe.Init();
Parser.Init();
pipe.Init();
parser.Init();
while (true)
{
try
{
Protocol.Request request = Pipe.ReadMessage();
Protocol.Request request = pipe.ReadMessage();
Protocol.Response response = ProcessRequest(request);
Pipe.WriteMessage(response);
pipe.WriteMessage(response);

if (request.getRequestType().equals(RequestType.Bye))
break; // return to allow the process to exit
Expand All @@ -69,7 +69,7 @@ private Protocol.Response ProcessRequest(Protocol.Request request)
try
{
System.out.print("Parsing " + request.getFileParseRequest().getFileName());
Integer result = Parser.ProcessParseRequest(
Integer result = parser.ProcessParseRequest(
request.getFileParseRequest().getFileParseContents(),
request.getFileParseRequest().getFileName());
System.out.println(" id = " + result.toString());
Expand Down Expand Up @@ -100,7 +100,7 @@ else if (request.getRequestType().equals(RequestType.DisposeFile))
{
Integer fileId = request.getDisposeFileRequest().getFileIdentifier().getId();
System.out.println("Remove AST for id = " + fileId);
Parser.ProcessDisposeFileRequest(fileId);
parser.ProcessDisposeFileRequest(fileId);

return Protocol.Response.newBuilder()
.setResponseType(ResponseType.DisposeFile)
Expand All @@ -110,7 +110,7 @@ else if (request.getRequestType().equals(RequestType.OutlineFile))
{
Integer fileId = request.getOutlineFileRequest().getFileIdentifier().getId();
System.out.println("Creating outline for id = " + fileId);
List<Outline> outline = Parser.ProcessOutlineRequest(fileId);
List<Outline> outline = parser.ProcessOutlineRequest(fileId);

return Protocol.Response.newBuilder()
.setResponseType(ResponseType.OutlineResults)
Expand All @@ -123,7 +123,7 @@ else if (request.getRequestType().equals(RequestType.FileParseMessages))
{
Integer fileId = request.getFileParseMessagesRequest().getFileIdentifier().getId();
System.out.println("Sending squiggles for id = " + fileId);
List<Problem> problems = Parser.ProcessFileParseMessagesRequest(fileId);
List<Problem> problems = parser.ProcessFileParseMessagesRequest(fileId);

return Protocol.Response.newBuilder()
.setResponseType(ResponseType.FileParseMessages)
Expand All @@ -137,7 +137,7 @@ else if (request.getRequestType().equals(RequestType.Autocomplete))
try
{
System.out.println("Autocomplete request for " + request.getAutocompleteRequest().getTypeRootIdentifier().getHandle());
List<Completion> proposals = Parser.ProcessAutocompleteRequest(
List<Completion> proposals = parser.ProcessAutocompleteRequest(
request.getAutocompleteRequest().getFileParseContents(),
request.getAutocompleteRequest().getTypeRootIdentifier().getHandle(),
request.getAutocompleteRequest().getCursorPosition());
Expand Down Expand Up @@ -167,10 +167,10 @@ else if (request.getRequestType().equals(RequestType.ParamHelp))
try
{
System.out.println("ParamHelp request for " + request.getParamHelpRequest().getTypeRootIdentifier().getHandle());
JavaParamHelpMatcher.ParamRegion region = Parser.getScope(
JavaParamHelpMatcher.ParamRegion region = parser.getScope(
request.getParamHelpRequest().getFileParseContents(),
request.getParamHelpRequest().getCursorPosition());
List<Signature> signatures = Parser.ProcessParamHelpRequest(
List<Signature> signatures = parser.ProcessParamHelpRequest(
request.getParamHelpRequest().getFileParseContents(),
request.getParamHelpRequest().getTypeRootIdentifier().getHandle(),
region.region.getOffset() + 1); // Request Autocomplete right after the open brace
Expand Down Expand Up @@ -203,7 +203,7 @@ else if (request.getRequestType().equals(RequestType.ParamHelpPositionUpdate))
try
{
System.out.println("ParamHelp PositionUpdate request for " + request.getParamHelpPositionUpdateRequest().getFileParseContents());
JavaParamHelpMatcher.ParamRegion region = Parser.updateScope(
JavaParamHelpMatcher.ParamRegion region = parser.updateScope(
request.getParamHelpPositionUpdateRequest().getFileParseContents(),
request.getParamHelpPositionUpdateRequest().getCursorPosition());
if (region == null)
Expand Down Expand Up @@ -233,7 +233,7 @@ else if (request.getRequestType().equals(RequestType.QuickInfo))
try
{
System.out.println("QuickInfo request for " + request.getQuickInfoRequest().getTypeRootIdentifier().getHandle());
List<JavaElement> elements = Parser.ProcessQuickInfoRequest(
List<JavaElement> elements = parser.ProcessQuickInfoRequest(
request.getQuickInfoRequest().getFileParseContents(),
request.getQuickInfoRequest().getTypeRootIdentifier().getHandle(),
request.getQuickInfoRequest().getCursorPosition());
Expand All @@ -260,7 +260,7 @@ else if (request.getRequestType().equals(RequestType.FindDefinition))
try
{
System.out.println("FindDefinition request for " + request.getFindDefinitionRequest().getTypeRootIdentifier().getHandle());
List<FindDefinitionResponse.JavaElement> elements = Parser.ProcessFindDefinintionRequest(
List<FindDefinitionResponse.JavaElement> elements = parser.ProcessFindDefinintionRequest(
request.getFindDefinitionRequest().getFileParseContents(),
request.getFindDefinitionRequest().getTypeRootIdentifier().getHandle(),
request.getFindDefinitionRequest().getCursorPosition());
Expand All @@ -269,7 +269,7 @@ else if (request.getRequestType().equals(RequestType.FindDefinition))
.setResponseType(ResponseType.FindDefinition)
.setFindDefinitionResponse(FindDefinitionResponse.newBuilder()
.setStatus(true)
.setWorkspaceRootPath(Parser.WorkspaceRoot.getLocation().toString())
.setWorkspaceRootPath(parser.WorkspaceRoot.getLocation().toString())
.addAllElements(elements)
.build())
.build();
Expand All @@ -281,7 +281,7 @@ else if (request.getRequestType().equals(RequestType.FindDefinition))
.setResponseType(ResponseType.FindDefinition)
.setFindDefinitionResponse(FindDefinitionResponse.newBuilder()
.setStatus(false)
.setWorkspaceRootPath(Parser.WorkspaceRoot.getLocation().toString())
.setWorkspaceRootPath(parser.WorkspaceRoot.getLocation().toString())
.setErrorMessage(e.getMessage() != null ? e.getMessage() : e.toString())
.build())
.build();
Expand All @@ -292,7 +292,7 @@ else if (request.getRequestType().equals(RequestType.OpenTypeRoot))
try
{
System.out.println("OpenTypeRoot request for " + request.getOpenTypeRootRequest().getFileName());
String typeRootHandle = Parser.ProcessOpenTypeRequest(request.getOpenTypeRootRequest().getFileName());
String typeRootHandle = parser.ProcessOpenTypeRequest(request.getOpenTypeRootRequest().getFileName());

return Protocol.Response.newBuilder()
.setResponseType(ResponseType.OpenTypeRoot)
Expand Down Expand Up @@ -320,7 +320,7 @@ else if (request.getRequestType().equals(RequestType.DisposeTypeRoot))
{
String handle = request.getDisposeTypeRootRequest().getTypeRootIdentifier().getHandle();
System.out.println("Remove typeroot for handle = " + handle);
Parser.ProcessDisposeTypeRoot(handle);
parser.ProcessDisposeTypeRoot(handle);

return Protocol.Response.newBuilder()
.setResponseType(ResponseType.DisposeTypeRoot)
Expand All @@ -331,7 +331,7 @@ else if (request.getRequestType().equals(RequestType.AddTypeRoot))
try
{
System.out.println("AddTypeRoot request for " + request.getAddTypeRootRequest().getTypeRootIdentifier().getHandle());
String typeRootHandle = Parser.ProcessAddTypeRequest(request.getAddTypeRootRequest().getTypeRootIdentifier().getHandle());
String typeRootHandle = parser.ProcessAddTypeRequest(request.getAddTypeRootRequest().getTypeRootIdentifier().getHandle());

return Protocol.Response.newBuilder()
.setResponseType(ResponseType.AddTypeRoot)
Expand Down
Loading