Skip to content

Commit

Permalink
Merge pull request #43627 from dulajdilshan/flow_model-update
Browse files Browse the repository at this point in the history 
Fix language server checkstyle error
  • Loading branch information
@HindujaB
HindujaB authored Nov 21, 2024
2 parents 12fa790 + 12e9abf commit 4cb88f2
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 109 deletions.
2 changes: 1 addition & 1 deletion ...r/modules/langserver-core/src/main/java/org/ballerinalang/langserver/LSPackageLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
package org.ballerinalang.langserver;

import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.google.gson.Gson;
import io.ballerina.compiler.api.ModuleID;
import io.ballerina.compiler.api.SemanticModel;
import io.ballerina.projects.Module;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/ballerinalang/langserver/extensions/ballerina/packages/ModuleObject.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ private void addListener(DataObject dataObject) {
}

private void addEnum(DataObject dataObject) {
this.listeners.add(dataObject);
this.enums.add(dataObject);
}

protected void addDataObject(MapperObject mapperObject) {
Expand Down
160 changes: 80 additions & 80 deletions ...es/langserver-core/src/test/resources/packages/components/multiple-packages_expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,6 @@
"name": "project",
"filePath": "file:///",
"modules": [
{
"functions": [
{
"name": "main",
"filePath": "main.bal",
"startLine": 3,
"startColumn": 0,
"endLine": 6,
"endColumn": 1
}
],
"services": [],
"records": [],
"objects": [],
"classes": [],
"types": [],
"constants": [],
"enums": [],
"listeners": [],
"moduleVariables": [],
"configurableVariables": [],
"automations": [
{
"name": "main",
"filePath": "main.bal",
"startLine": 3,
"startColumn": 0,
"endLine": 6,
"endColumn": 1
}
]
},
{
"functions": [],
"services": [
Expand Down Expand Up @@ -69,6 +37,38 @@
"configurableVariables": [],
"automations": [],
"name": "services"
},
{
"functions": [
{
"name": "main",
"filePath": "main.bal",
"startLine": 3,
"startColumn": 0,
"endLine": 6,
"endColumn": 1
}
],
"services": [],
"records": [],
"objects": [],
"classes": [],
"types": [],
"constants": [],
"enums": [],
"listeners": [],
"moduleVariables": [],
"configurableVariables": [],
"automations": [
{
"name": "main",
"filePath": "main.bal",
"startLine": 3,
"startColumn": 0,
"endLine": 6,
"endColumn": 1
}
]
}
]
},
Expand Down Expand Up @@ -103,8 +103,8 @@
{
"functions": [
{
"name": "runServices",
"filePath": "svc.bal",
"name": "main",
"filePath": "main.bal",
"startLine": 3,
"startColumn": 0,
"endLine": 6,
Expand All @@ -121,14 +121,22 @@
"listeners": [],
"moduleVariables": [],
"configurableVariables": [],
"automations": [],
"name": "services"
"automations": [
{
"name": "main",
"filePath": "main.bal",
"startLine": 3,
"startColumn": 0,
"endLine": 6,
"endColumn": 1
}
]
},
{
"functions": [
{
"name": "main",
"filePath": "main.bal",
"name": "runServices",
"filePath": "svc.bal",
"startLine": 3,
"startColumn": 0,
"endLine": 6,
Expand All @@ -145,16 +153,8 @@
"listeners": [],
"moduleVariables": [],
"configurableVariables": [],
"automations": [
{
"name": "main",
"filePath": "main.bal",
"startLine": 3,
"startColumn": 0,
"endLine": 6,
"endColumn": 1
}
]
"automations": [],
"name": "services"
}
]
},
Expand All @@ -166,19 +166,19 @@
"functions": [],
"services": [
{
"name": "/hello ",
"filePath": "hello.bal",
"startLine": 5,
"name": "/ ",
"filePath": "main.bal",
"startLine": 3,
"startColumn": 0,
"endLine": 13,
"endLine": 11,
"endColumn": 1,
"resources": [
{
"name": "get-satyHello",
"filePath": "hello.bal",
"startLine": 10,
"name": "get-welcome",
"filePath": "main.bal",
"startLine": 8,
"startColumn": 4,
"endLine": 12,
"endLine": 10,
"endColumn": 5
}
]
Expand All @@ -190,20 +190,10 @@
"types": [],
"constants": [],
"enums": [],
"listeners": [
{
"name": "helloEp",
"filePath": "hello.bal",
"startLine": 2,
"startColumn": 0,
"endLine": 2,
"endColumn": 44
}
],
"listeners": [],
"moduleVariables": [],
"configurableVariables": [],
"automations": [],
"name": "hello_service"
"automations": []
},
{
"functions": [],
Expand Down Expand Up @@ -243,19 +233,19 @@
"functions": [],
"services": [
{
"name": "/ ",
"filePath": "main.bal",
"startLine": 3,
"name": "/hello ",
"filePath": "hello.bal",
"startLine": 5,
"startColumn": 0,
"endLine": 11,
"endLine": 13,
"endColumn": 1,
"resources": [
{
"name": "get-welcome",
"filePath": "main.bal",
"startLine": 8,
"name": "get-satyHello",
"filePath": "hello.bal",
"startLine": 10,
"startColumn": 4,
"endLine": 10,
"endLine": 12,
"endColumn": 5
}
]
Expand All @@ -267,10 +257,20 @@
"types": [],
"constants": [],
"enums": [],
"listeners": [],
"listeners": [
{
"name": "helloEp",
"filePath": "hello.bal",
"startLine": 2,
"startColumn": 0,
"endLine": 2,
"endColumn": 44
}
],
"moduleVariables": [],
"configurableVariables": [],
"automations": []
"automations": [],
"name": "hello_service"
}
]
},
Expand Down Expand Up @@ -377,8 +377,7 @@
"endColumn": 30
}
],
"enums": [],
"listeners": [
"enums": [
{
"name": "Color",
"filePath": "main.bal",
Expand All @@ -388,6 +387,7 @@
"endColumn": 1
}
],
"listeners": [],
"moduleVariables": [
{
"name": "modLevelVariable ",
Expand Down
50 changes: 25 additions & 25 deletions ...odules/langserver-core/src/test/resources/packages/components/project-other_expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,6 @@
"name": "project_other",
"filePath": "file:///",
"modules": [
{
"functions": [
{
"name": "multiply",
"filePath": "main.bal",
"startLine": 0,
"startColumn": 0,
"endLine": 2,
"endColumn": 1
}
],
"services": [],
"records": [],
"objects": [],
"classes": [],
"types": [],
"constants": [],
"enums": [],
"listeners": [],
"moduleVariables": [],
"configurableVariables": [],
"automations": []
},
{
"functions": [],
"services": [],
Expand Down Expand Up @@ -162,8 +139,7 @@
"endColumn": 41
}
],
"enums": [],
"listeners": [
"enums": [
{
"name": "Language",
"filePath": "model.bal",
Expand All @@ -173,6 +149,7 @@
"endColumn": 1
}
],
"listeners": [],
"moduleVariables": [
{
"name": "ESCAPES ",
Expand All @@ -194,6 +171,29 @@
"configurableVariables": [],
"automations": [],
"name": "models"
},
{
"functions": [
{
"name": "multiply",
"filePath": "main.bal",
"startLine": 0,
"startColumn": 0,
"endLine": 2,
"endColumn": 1
}
],
"services": [],
"records": [],
"objects": [],
"classes": [],
"types": [],
"constants": [],
"enums": [],
"listeners": [],
"moduleVariables": [],
"configurableVariables": [],
"automations": []
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions .../langserver-core/src/test/resources/packages/components/single-file-package_expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,7 @@
"endColumn": 30
}
],
"enums": [],
"listeners": [
"enums": [
{
"name": "Color",
"filePath": "main.bal",
Expand All @@ -114,6 +113,7 @@
"endColumn": 1
}
],
"listeners": [],
"moduleVariables": [
{
"name": "modLevelVariable ",
Expand Down

0 comments on commit 4cb88f2

Please sign in to comment.