Skip to content

Commit 46e6b7f

Browse files
committed
修复一些问题
1 parent 4552a09 commit 46e6b7f

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

EmmyLua-Common/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ sourceSets {
1414
}
1515

1616
dependencies {
17-
compile project(":IntelliJ-Core")
18-
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
17+
api project(":IntelliJ-Core")
18+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
1919
// compile fileTree(dir: "libs", include: "*.jar")
2020
}
2121
buildscript {

EmmyLua-LS/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ repositories {
2020
mavenCentral()
2121
}
2222
dependencies {
23-
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
24-
compile 'org.eclipse.lsp4j:org.eclipse.lsp4j:0.13.0'
25-
compile group: 'org.picocontainer', name: 'picocontainer', version: '2.15'
26-
compile project(":EmmyLua-Common")
27-
compile 'com.yevdo:jwildcard:1.4'
28-
// compile fileTree(dir: "libs", include: "*.jar")
23+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
24+
implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j:0.20.0'
25+
implementation group: 'org.picocontainer', name: 'picocontainer', version: '2.15'
26+
implementation project(":EmmyLua-Common")
27+
implementation 'com.yevdo:jwildcard:1.4'
28+
implementation fileTree(dir: "libs", include: "*.jar")
2929
}
3030

3131
sourceSets {

EmmyLua-LS/src/main/kotlin/com/tang/vscode/extendApi/ExtendApiService.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ object ExtendApiService {
1919
rootNamespaceName = api.root.ifEmpty {
2020
"_G"
2121
}
22-
rootNamespace = Namespace(api.root, null, mgr, false)
2322
namespaceMap.clear()
2423
classMap.clear()
2524

25+
rootNamespace = Namespace(api.root, null, mgr, false)
26+
2627
for (luaClass in api.classes) {
2728
val classNs = getNamespace(luaClass.namespace)
2829
if (classNs != null) {

EmmyLua-LS/src/main/kotlin/com/tang/vscode/extendApi/ExtendShortNameManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.tang.intellij.lua.ty.ITyClass
1111

1212
class ExtendShortNameManager : LuaShortNamesManager() {
1313
private fun findClass(name: String): NsMember? {
14-
return ExtendApiService.getExtendClasses()[name]
14+
return ExtendApiService.getNsMember(name)
1515
}
1616

1717
override fun findClass(name: String, context: SearchContext): LuaClass? {

IntelliJ-Core/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ repositories {
55
}
66

77
dependencies {
8-
compile fileTree(dir: "libs", include: "*.jar")
9-
compile group: 'org.eclipse.lsp4j', name: 'org.eclipse.lsp4j', version: '0.13.0'
8+
implementation fileTree(dir: "libs", include: "*.jar")
9+
implementation group: 'org.eclipse.lsp4j', name: 'org.eclipse.lsp4j', version: '0.20.0'
1010
}

0 commit comments

Comments
 (0)