Skip to content

Commit 98f9b7e

Browse files
author
mmews
committed
Merge remote-tracking branch 'origin/master' into GH-2571 
2 parents fc2eca1 + 3d420f1 commit 98f9b7e

File tree

103 files changed

+16797
-8076
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+16797
-8076
lines changed

‎plugins/org.eclipse.n4js.ide/src/org/eclipse/n4js/ide/server/N4JSStatefulIncrementalBuilder.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import org.eclipse.xtext.util.IFileSystemScanner;
4444
import org.eclipse.xtext.validation.Issue;
4545

46+
import com.google.common.base.Strings;
4647
import com.google.common.collect.LinkedHashMultimap;
4748
import com.google.common.collect.Lists;
4849
import com.google.common.collect.Multimap;
@@ -296,7 +297,7 @@ private String getAdjustedModuleSpecifierOrNull(String moduleSpecifier, N4JSProj
296297
Multimap<String, URI> moduleName2Uri) {
297298

298299
ProjectDescription pd = projectConfig.getProjectDescription();
299-
String prjName = projectConfig.getPackageName();
300+
String prjName = Strings.nullToEmpty(projectConfig.getPackageName());
300301
if (moduleName2Uri.containsKey(moduleSpecifier)) {
301302
return moduleSpecifier;
302303
} else if (moduleSpecifier.startsWith("./")) {

‎plugins/org.eclipse.n4js.ide/src/org/eclipse/n4js/ide/server/build/N4JSConfigSnapshotFactory.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
import org.eclipse.emf.common.util.URI;
1616
import org.eclipse.n4js.packagejson.projectDescription.ProjectDependency;
17-
import org.eclipse.n4js.workspace.IN4JSSourceFolder;
1817
import org.eclipse.n4js.workspace.N4JSProjectConfig;
1918
import org.eclipse.n4js.workspace.N4JSProjectConfigSnapshot;
19+
import org.eclipse.n4js.workspace.N4JSSourceFolder;
2020
import org.eclipse.n4js.workspace.N4JSSourceFolderForPackageJson;
2121
import org.eclipse.n4js.workspace.N4JSSourceFolderSnapshot;
2222
import org.eclipse.n4js.workspace.N4JSSourceFolderSnapshotForPackageJson;
@@ -65,8 +65,8 @@ public N4JSSourceFolderSnapshot createSourceFolderSnapshot(ISourceFolder sourceF
6565
if (sourceFolder instanceof N4JSSourceFolderForPackageJson) {
6666
return new N4JSSourceFolderSnapshotForPackageJson((N4JSSourceFolderForPackageJson) sourceFolder);
6767
}
68-
IN4JSSourceFolder sourceFolderCasted = (IN4JSSourceFolder) sourceFolder;
68+
N4JSSourceFolder sourceFolderCasted = (N4JSSourceFolder) sourceFolder;
6969
return new N4JSSourceFolderSnapshot(sourceFolder.getName(), sourceFolder.getPath(),
70-
sourceFolderCasted.getType(), sourceFolderCasted.getRelativePath());
70+
sourceFolderCasted.getType(), sourceFolderCasted.getRelativePath(), sourceFolderCasted.getWorkspaces());
7171
}
7272
}

‎plugins/org.eclipse.n4js.semver.ide/src-gen/org/eclipse/n4js/semver/ide/contentassist/antlr/SemverParser.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
4141
builder.put(grammarAccess.getNPMVersionRequirementAccess().getAlternatives(), "rule__NPMVersionRequirement__Alternatives");
4242
builder.put(grammarAccess.getNPMVersionRequirementAccess().getAlternatives_1_0(), "rule__NPMVersionRequirement__Alternatives_1_0");
4343
builder.put(grammarAccess.getNPMVersionRequirementAccess().getAlternatives_1_0_1(), "rule__NPMVersionRequirement__Alternatives_1_0_1");
44+
builder.put(grammarAccess.getNPMVersionRequirementAccess().getAlternatives_1_0_1_1(), "rule__NPMVersionRequirement__Alternatives_1_0_1_1");
4445
builder.put(grammarAccess.getURLVersionSpecifierAccess().getAlternatives(), "rule__URLVersionSpecifier__Alternatives");
46+
builder.put(grammarAccess.getWorkspaceVersionRequirementAccess().getAlternatives_1(), "rule__WorkspaceVersionRequirement__Alternatives_1");
4547
builder.put(grammarAccess.getVersionRangeAccess().getAlternatives(), "rule__VersionRange__Alternatives");
4648
builder.put(grammarAccess.getVersionPartAccess().getAlternatives(), "rule__VersionPart__Alternatives");
4749
builder.put(grammarAccess.getQualifierAccess().getAlternatives(), "rule__Qualifier__Alternatives");
@@ -54,9 +56,8 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
5456
builder.put(grammarAccess.getURL_NO_VXAccess().getAlternatives_1(), "rule__URL_NO_VX__Alternatives_1");
5557
builder.put(grammarAccess.getURL_NO_VXAccess().getAlternatives_2(), "rule__URL_NO_VX__Alternatives_2");
5658
builder.put(grammarAccess.getURL_NO_VXAccess().getAlternatives_3(), "rule__URL_NO_VX__Alternatives_3");
57-
builder.put(grammarAccess.getTAGAccess().getAlternatives_1(), "rule__TAG__Alternatives_1");
58-
builder.put(grammarAccess.getALPHA_NUMERIC_CHARSAccess().getAlternatives(), "rule__ALPHA_NUMERIC_CHARS__Alternatives");
59-
builder.put(grammarAccess.getALPHA_NUMERIC_CHARS_START_WITH_DIGITSAccess().getAlternatives_1(), "rule__ALPHA_NUMERIC_CHARS_START_WITH_DIGITS__Alternatives_1");
59+
builder.put(grammarAccess.getWORKSPACE_VERSIONAccess().getAlternatives(), "rule__WORKSPACE_VERSION__Alternatives");
60+
builder.put(grammarAccess.getALPHA_NUMERIC_CHARAccess().getAlternatives(), "rule__ALPHA_NUMERIC_CHAR__Alternatives");
6061
builder.put(grammarAccess.getWILDCARDAccess().getAlternatives(), "rule__WILDCARD__Alternatives");
6162
builder.put(grammarAccess.getLETTERAccess().getAlternatives(), "rule__LETTER__Alternatives");
6263
builder.put(grammarAccess.getLETTER_NO_VXAccess().getAlternatives(), "rule__LETTER_NO_VX__Alternatives");
@@ -71,6 +72,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
7172
builder.put(grammarAccess.getURLVersionSpecifierAccess().getGroup_1(), "rule__URLVersionSpecifier__Group_1__0");
7273
builder.put(grammarAccess.getURLVersionSpecifierAccess().getGroup_2(), "rule__URLVersionSpecifier__Group_2__0");
7374
builder.put(grammarAccess.getURLSemverAccess().getGroup(), "rule__URLSemver__Group__0");
75+
builder.put(grammarAccess.getWorkspaceVersionRequirementAccess().getGroup(), "rule__WorkspaceVersionRequirement__Group__0");
7476
builder.put(grammarAccess.getGitHubVersionRequirementAccess().getGroup(), "rule__GitHubVersionRequirement__Group__0");
7577
builder.put(grammarAccess.getGitHubVersionRequirementAccess().getGroup_1(), "rule__GitHubVersionRequirement__Group_1__0");
7678
builder.put(grammarAccess.getVersionRangeSetRequirementAccess().getGroup(), "rule__VersionRangeSetRequirement__Group__0");
@@ -92,6 +94,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
9294
builder.put(grammarAccess.getQualifierTagAccess().getGroup_1(), "rule__QualifierTag__Group_1__0");
9395
builder.put(grammarAccess.getFILE_TAGAccess().getGroup(), "rule__FILE_TAG__Group__0");
9496
builder.put(grammarAccess.getSEMVER_TAGAccess().getGroup(), "rule__SEMVER_TAG__Group__0");
97+
builder.put(grammarAccess.getWORKSPACE_TAGAccess().getGroup(), "rule__WORKSPACE_TAG__Group__0");
9598
builder.put(grammarAccess.getURL_PROTOCOLAccess().getGroup(), "rule__URL_PROTOCOL__Group__0");
9699
builder.put(grammarAccess.getURLAccess().getGroup(), "rule__URL__Group__0");
97100
builder.put(grammarAccess.getURL_NO_VXAccess().getGroup(), "rule__URL_NO_VX__Group__0");
@@ -105,9 +108,11 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
105108
builder.put(grammarAccess.getURLVersionSpecifierAccess().getCommitISHAssignment_2_1(), "rule__URLVersionSpecifier__CommitISHAssignment_2_1");
106109
builder.put(grammarAccess.getURLSemverAccess().getWithSemverTagAssignment_1(), "rule__URLSemver__WithSemverTagAssignment_1");
107110
builder.put(grammarAccess.getURLSemverAccess().getSimpleVersionAssignment_2(), "rule__URLSemver__SimpleVersionAssignment_2");
108-
builder.put(grammarAccess.getTagVersionRequirementAccess().getTagNameAssignment(), "rule__TagVersionRequirement__TagNameAssignment");
111+
builder.put(grammarAccess.getWorkspaceVersionRequirementAccess().getVersionAssignment_1_0(), "rule__WorkspaceVersionRequirement__VersionAssignment_1_0");
112+
builder.put(grammarAccess.getWorkspaceVersionRequirementAccess().getOtherVersionAssignment_1_1(), "rule__WorkspaceVersionRequirement__OtherVersionAssignment_1_1");
109113
builder.put(grammarAccess.getGitHubVersionRequirementAccess().getGithubUrlAssignment_0(), "rule__GitHubVersionRequirement__GithubUrlAssignment_0");
110114
builder.put(grammarAccess.getGitHubVersionRequirementAccess().getCommitISHAssignment_1_1(), "rule__GitHubVersionRequirement__CommitISHAssignment_1_1");
115+
builder.put(grammarAccess.getTagVersionRequirementAccess().getTagNameAssignment(), "rule__TagVersionRequirement__TagNameAssignment");
111116
builder.put(grammarAccess.getVersionRangeSetRequirementAccess().getRangesAssignment_1_0(), "rule__VersionRangeSetRequirement__RangesAssignment_1_0");
112117
builder.put(grammarAccess.getVersionRangeSetRequirementAccess().getRangesAssignment_1_1_3(), "rule__VersionRangeSetRequirement__RangesAssignment_1_1_3");
113118
builder.put(grammarAccess.getHyphenVersionRangeAccess().getFromAssignment_1(), "rule__HyphenVersionRange__FromAssignment_1");

0 commit comments

Comments
 (0)