-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #942 from JetBrains/feature/kotllin_java_stubs
- Loading branch information
Showing
19 changed files
with
729 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
348 changes: 348 additions & 0 deletions
348
.../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <solution name="MPS.Kotlin" uuid="47198eff-d292-4dcd-85af-227f983426b5" moduleVersion="0" compileInMPS="true"> | ||
| <models> | ||
| <modelRoot type="java_classes" contentPath="${mps_home}/plugins/mps-kotlin/lib"> | ||
| <sourceRoot location="kotlin-builtins.jar" /> | ||
| <sourceRoot location="kotlin-ide.jar" /> | ||
| <sourceRoot location="kotlin-stdlib-1.7.0.jar" /> | ||
| <sourceRoot location="kotlin-stdlib-common-1.7.0.jar" /> | ||
| </modelRoot> | ||
| </models> | ||
| <facets> | ||
| <facet compile="ext" classes="provided" ext="no" type="java"> | ||
| <classes generated="true" /> | ||
| </facet> | ||
| </facets> | ||
| <stubModelEntries> | ||
| <stubModelEntry path="${mps_home}/plugins/mps-kotlin/lib/kotlin-builtins.jar" /> | ||
| <stubModelEntry path="${mps_home}/plugins/mps-kotlin/lib/kotlin-ide.jar" /> | ||
| <stubModelEntry path="${mps_home}/plugins/mps-kotlin/lib/kotlin-stdlib-1.7.0.jar" /> | ||
| <stubModelEntry path="${mps_home}/plugins/mps-kotlin/lib/kotlin-stdlib-common-1.7.0.jar" /> | ||
| </stubModelEntries> | ||
| <sourcePath /> | ||
| <dependencies> | ||
| <dependency reexport="true">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency> | ||
| </dependencies> | ||
| <languageVersions> | ||
| <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" /> | ||
| <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" /> | ||
| <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" /> | ||
| <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" /> | ||
| </languageVersions> | ||
| <dependencyVersions> | ||
| <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" /> | ||
| <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" /> | ||
| <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" /> | ||
| <module reference="47198eff-d292-4dcd-85af-227f983426b5(MPS.Kotlin)" version="0" /> | ||
| <module reference="39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)" version="0" /> | ||
| </dependencyVersions> | ||
| </solution> | ||
|
|
32 changes: 32 additions & 0 deletions
32
code/kotlin/solutions/kotlin.usage.test/kotlin.usage.test.msd
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <solution name="kotlin.usage.test" uuid="4105d28f-d96e-442e-9491-3eaac1128b0c" moduleVersion="0" compileInMPS="true"> | ||
| <models> | ||
| <modelRoot type="default" contentPath="${module}"> | ||
| <sourceRoot location="models" /> | ||
| </modelRoot> | ||
| </models> | ||
| <facets> | ||
| <facet compile="mps" classes="mps" ext="no" type="java"> | ||
| <classes generated="true" path="${module}/classes_gen" /> | ||
| </facet> | ||
| </facets> | ||
| <sourcePath /> | ||
| <dependencies> | ||
| <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency> | ||
| <dependency reexport="false">47198eff-d292-4dcd-85af-227f983426b5(MPS.Kotlin)</dependency> | ||
| </dependencies> | ||
| <languageVersions> | ||
| <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" /> | ||
| <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" /> | ||
| <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" /> | ||
| </languageVersions> | ||
| <dependencyVersions> | ||
| <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" /> | ||
| <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" /> | ||
| <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" /> | ||
| <module reference="47198eff-d292-4dcd-85af-227f983426b5(MPS.Kotlin)" version="0" /> | ||
| <module reference="39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)" version="0" /> | ||
| <module reference="4105d28f-d96e-442e-9491-3eaac1128b0c(kotlin.usage.test)" version="0" /> | ||
| </dependencyVersions> | ||
| </solution> | ||
|
|
Oops, something went wrong.