Skip to content

WI #1975 Add cpyCopies field #1979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 10, 2021
Merged

WI #1975 Add cpyCopies field #1979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0594de6
WI #1975 Add cpyCopies field
mayanje Jun 7, 2021
1cf225e
WI #1975 Implementing Lookup
mayanje Jun 10, 2021
c054c1f
Merge branch 'develop' into 1975_LSP_Add_missingCopiesparams_CPY_Copies
fm-117 Aug 9, 2021
1607283
WI #1975 Rename field
fm-117 Aug 9, 2021
e6d2675
Merge branch 'develop' into 1975_LSP_Add_missingCopiesparams_CPY_Copies
fm-117 Aug 9, 2021
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
4 changes: 2 additions & 2 deletions TypeCobol.LanguageServer.Test/LSRTests/RefreshCopiesNotif/input/RefreshCopyNotif.tlsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
},
{
"category": 1,
"message": "{\"jsonrpc\":\"2.0\",\"method\":\"typecobol/missingCopies\",\"params\":{\"textDocument\":{\"uri\":\"file:///C:/Users/BALLMA/AppData/Local/Temp/1/tcbl/DVZZBCO04742822857809968410.cee\"},\"Copies\":[\"YDVZERL\",\"YSTIEM1\"]}}"
"message": "{\"jsonrpc\":\"2.0\",\"method\":\"typecobol/missingCopies\",\"params\":{\"textDocument\":{\"uri\":\"file:///C:/Users/BALLMA/AppData/Local/Temp/1/tcbl/DVZZBCO04742822857809968410.cee\"},\"Copies\":[\"YDVZERL\",\"YSTIEM1\"],\"CpyCopies\":[]}}"
},
{
"category": 0,
"message": "{\"jsonrpc\":\"2.0\",\"method\":\"typecobol/extractusecopy\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/BALLMA/AppData/Local/Temp/1/tcbl/DVZZBCO04742822857809968410.cee\"}}}"
},
{
"category": 1,
"message": "{\"jsonrpc\":\"2.0\",\"method\":\"typecobol/missingCopies\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/BALLMA/AppData/Local/Temp/1/tcbl/DVZZBCO04742822857809968410.cee\"},\"Copies\":[\"YDVZERL\",\"YSTIEM1\"]}}"
"message": "{\"jsonrpc\":\"2.0\",\"method\":\"typecobol/missingCopies\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/BALLMA/AppData/Local/Temp/1/tcbl/DVZZBCO04742822857809968410.cee\"},\"Copies\":[\"YDVZERL\",\"YSTIEM1\"],\"CpyCopies\":[]}}"
}
],
"didClose": "{\"jsonrpc\":\"2.0\",\"method\":\"textDocument/didClose\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/BALLMA/AppData/Local/Temp/1/tcbl/DVZZBCO04742822857809968410.cee\"}}}",
Expand Down
4 changes: 4 additions & 0 deletions ...geServer/TypeCobolCustomLanguageServer/Missing Copies Notification/MissingCopiesParams.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,9 @@ class MissingCopiesParams
/// List of missing copies
/// </summary>
public List<string> Copies { get; set; }
/// <summary>
/// List of missing CPY copies
/// </summary>
public List<string> CpyCopies { get; set; }
}
}
8 changes: 1 addition & 7 deletions TypeCobol.LanguageServer/TypeCobolCustomLanguageServer/TypeCobolCustomLanguageServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,7 @@ protected virtual void OnDidReceiveExtractUseCopies(ExtractUseCopiesParams param

List<string> copiesName = docContext.FileCompiler.CompilationResultsForProgram.CopyTextNamesVariations.Select(cp => cp.TextNameWithSuffix).Distinct().ToList();
copiesName.AddRange(dependenciesMissingCopies);
if (copiesName.Count > 0)
{
var missingCopiesParam = new MissingCopiesParams();
missingCopiesParam.textDocument = parameter.textDocument;
missingCopiesParam.Copies = copiesName;
this.RpcServer.SendNotification(MissingCopiesNotification.Type, missingCopiesParam);
}
MissingCopiesDetected(parameter.textDocument, copiesName);
}
}

Expand Down
24 changes: 20 additions & 4 deletions TypeCobol.LanguageServer/TypeCobolServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,25 @@ private void WarningTrigger(object sender, string message)
this.NotifyWarning(message);
}

protected void MissingCopiesDetected(TextDocumentIdentifier textDocument, List<string> copiesName)
{
if (copiesName.Count > 0)
{
var missingCopiesParam = new MissingCopiesParams();
missingCopiesParam.textDocument = textDocument;

#if EUROINFO_RULES
ILookup<bool, string> lookup = copiesName.ToLookup(s => Workspace.CompilationProject.CompilationOptions.HasCpyCopy(s));
missingCopiesParam.Copies = lookup[false].ToList();
missingCopiesParam.CpyCopies = lookup[true].ToList();
#else
missingCopiesParam.Copies = copiesName;
missingCopiesParam.CpyCopies = new List<string>();
#endif
this.RpcServer.SendNotification(MissingCopiesNotification.Type, missingCopiesParam);
}
}

/// <summary>
/// Event Method triggered when missing copies are detected.
/// </summary>
Expand All @@ -175,10 +194,7 @@ private void MissingCopiesDetected(object fileUri, MissingCopiesEvent missingCop
//This event can be used when a dependency have not been loaded

//Send missing copies to client
var missingCopiesParam = new MissingCopiesParams();
missingCopiesParam.Copies = missingCopiesEvent.Copies;
missingCopiesParam.textDocument = new TextDocumentIdentifier(fileUri.ToString());
this.RpcServer.SendNotification(MissingCopiesNotification.Type, missingCopiesParam);
MissingCopiesDetected(new TextDocumentIdentifier(fileUri.ToString()), missingCopiesEvent.Copies);
}

/// <summary>
Expand Down