Merge branch 'main' into 9878-switch-expr-test

.github/workflows/full-check.yml

@@ -20,7 +20,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- java-version: [ '11', '17', '21' ]
+ java-version: [ '11', '17', '21', '22' ]
  steps:
  - name: Checkout GWT itself into one directory
  uses: actions/checkout@v4

.github/workflows/quick-check.yml

@@ -8,7 +8,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- java-version: ['11', '17', '21']
+ java-version: ['11', '17', '21', '22']
  steps:
  - name: Checkout GWT itself into one directory
  uses: actions/checkout@v4
@@ -42,12 +42,13 @@ jobs:
  TZ=America/Los_Angeles \
  ANT_OPTS=-Dfile.encoding=UTF8 \
  ANT_OPTS=-Xmx2g
- ant clean dist doc checkstyle apicheck
+ ant clean compile.tests dist doc checkstyle apicheck
 
  - name: Create pull request comments/annotations for checkstyle from the java 21 build, even on failure
  if: ${{ always() && github.event_name == 'pull_request' && matrix.java-version == '21' }}
  env:
  REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ REVIEWDOG_SKIP_DOGHOUSE: true
  run: |
  set -eux
  shopt -s globstar

build.xml

@@ -31,9 +31,9 @@
  </macrodef>
 
  <property name="gwt.apicheck.config"
- location="tools/api-checker/config/gwt210_211userapi.conf"/>
+ location="tools/api-checker/config/gwt211_212userapi.conf"/>
  <property name="gwt.apicheck.referencelibs"
- value="${gwt.tools}/api-checker-reference/2.10.0/gwt-dev-modified.jar:${gwt.tools}/api-checker-reference/2.10.0/gwt-user-modified.jar"/>
+ value="${gwt.tools}/api-checker-reference/2.11.0/gwt-dev-modified.jar:${gwt.tools}/api-checker-reference/2.11.0/gwt-user-modified.jar"/>
 
  <target name="buildonly"
  description="[action] Minimal one-platform devel build, without distro packaging">

build_tools/doctool/src/com/google/doctool/custom/JavaEmulSummaryDoclet.java

@@ -42,6 +42,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -79,13 +80,18 @@ public boolean run(DocletEnvironment env) {
  pw.println("</ol>\n");
 
  getSpecifiedPackages(env).forEach(pack -> {
+ Optional<Module> matchingModuleName = ModuleLayer.boot().modules().stream()
+ .filter(m -> m.getPackages().contains(pack.getQualifiedName().toString()))
+ .findFirst();
+
  pw.format("<h2 id=\"Package_%s\">Package %s</h2>\n",
  pack.getQualifiedName().toString().replace('.', '_'),
  pack.getQualifiedName().toString());
  pw.println("<dl>");
 
- String packURL = JAVADOC_URL + pack.getQualifiedName().toString()
- .replace(".", "/") + "/";
+ String packURL = JAVADOC_URL
+ + matchingModuleName.map(m -> m.getName() + "/").orElse("")
+ + pack.getQualifiedName().toString().replace(".", "/") + "/";
 
  Iterator<? extends Element> classesIterator = pack.getEnclosedElements()
  .stream()

dev/build.xml

@@ -68,11 +68,12 @@
  <include name="objectweb/asm-9.6/asm-9.6.jar"/>
  <include name="objectweb/asm-9.6/asm-commons-9.6.jar"/>
  <include name="objectweb/asm-9.6/asm-util-9.6.jar"/>
- <include name="guava/guava-19.0/guava-19.0-rebased.jar"/>
+ <include name="guava/guava-33.0/guava-33.0.0-jre-rebased.jar"/>
+ <include name="guava/guava-33.0/failureaccess-1.0.2-rebased.jar"/>
  <include name="icu4j/63.1/icu4j.jar"/>
  <include name="jetty/jetty-9.4.44.v20210927/jetty-all-9.4.44.v20210927.jar"/>
  <include name="gson/gson-2.6.2.jar"/>
- <include name="jscomp/20160315/sourcemap-rebased.jar"/>
+ <include name="jscomp/20231112/sourcemap-rebased.jar"/>
  <include name="jsr305/jsr305.jar"/>
  <include name="protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/>
  <!-- dependencies needed for JSP support in DevMode: BEGIN -->
@@ -129,7 +130,8 @@
  src="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.32.0.v20221108-1853.jar"/>
  <zipfileset
  src="${gwt.tools.lib}/eclipse/jdtCompilerAdapter_3.32.0.v20221108-1853.jar"/>
- <zipfileset src="${gwt.tools.lib}/guava/guava-19.0/guava-19.0-rebased.jar"/>
+ <zipfileset src="${gwt.tools.lib}/guava/guava-33.0/guava-33.0.0-jre-rebased.jar"/>
+ <zipfileset src="${gwt.tools.lib}/guava/guava-33.0/failureaccess-1.0.2-rebased.jar" />
  <zipfileset src="${gwt.tools.lib}/icu4j/63.1/icu4j.jar"/>
  <zipfileset
  src="${gwt.tools.lib}/jetty/jetty-9.4.44.v20210927/jetty-all-9.4.44.v20210927.jar">
@@ -140,7 +142,7 @@
  <exclude name="META-INF/services/org.eclipse.jetty.security.Authenticator$Factory"/>
  </zipfileset>
  <zipfileset src="${gwt.tools.lib}/gson/gson-2.6.2.jar"/>
- <zipfileset src="${gwt.tools.lib}/jscomp/20160315/sourcemap-rebased.jar"/>
+ <zipfileset src="${gwt.tools.lib}/jscomp/20231112/sourcemap-rebased.jar"/>
  <zipfileset src="${gwt.tools.lib}/jsr305/jsr305.jar"/>
  <zipfileset
  src="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/>
@@ -227,9 +229,11 @@
  <pathelement
  location="${gwt.tools.lib}/eclipse/jdtCompilerAdapter_3.32.0.v20221108-1853.jar"/>
  <pathelement
- location="${gwt.tools.lib}/guava/guava-19.0/guava-19.0-rebased.jar"/>
+ location="${gwt.tools.lib}/guava/guava-33.0/guava-33.0.0-jre-rebased.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/guava/guava-33.0/failureaccess-1.0.2-rebased.jar"/>
  <pathelement location="${gwt.tools.lib}/gson/gson-2.6.2.jar"/>
- <pathelement location="${gwt.tools.lib}/jscomp/20160315/sourcemap-rebased.jar"/>
+ <pathelement location="${gwt.tools.lib}/jscomp/20231112/sourcemap-rebased.jar"/>
  <pathelement location="${gwt.tools.lib}/json/android-sdk-19.1/json-android-rebased.jar"/>
  <pathelement location="${gwt.tools.lib}/jsr305/jsr305.jar"/>
  <pathelement

dev/core/src/com/google/gwt/core/ext/linker/impl/StandardLinkerContext.java

@@ -131,6 +131,7 @@ public int compare(SelectionProperty o1, SelectionProperty o2) {
  private ResourceOracle publicResourceOracle;
 
  private final SortedSet<SelectionProperty> selectionProperties;
+ private final ModuleDef module;
 
  public StandardLinkerContext(TreeLogger logger, ModuleDef module,
  ResourceOracle publicResourceOracle, JsOutputOption outputOption)
@@ -143,6 +144,7 @@ public StandardLinkerContext(TreeLogger logger, ModuleDef module,
  this.moduleLastModified = module.lastModified();
  this.publicResourceOracle = publicResourceOracle;
  this.outputOption = outputOption;
+ this.module = module;
 
  // Sort the linkers into the order they should actually run.
  linkerClasses = new ArrayList<Class<? extends Linker>>();
@@ -537,6 +539,10 @@ public void produceOutput(TreeLogger logger, ArtifactSet artifacts,
  }
  }
 
+ public ModuleDef getModule() {
+ return module;
+ }
+
  /**
  * (Re)instantiate all linkers.
  */

dev/core/src/com/google/gwt/core/linker/SymbolMapsLinker.java

@@ -15,6 +15,9 @@
  */
 package com.google.gwt.core.linker;
 
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+
 import com.google.gwt.core.ext.LinkerContext;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.UnableToCompleteException;
@@ -31,17 +34,27 @@
 import com.google.gwt.core.ext.linker.SoftPermutation;
 import com.google.gwt.core.ext.linker.SymbolData;
 import com.google.gwt.core.ext.linker.SyntheticArtifact;
+import com.google.gwt.core.ext.linker.impl.StandardLinkerContext;
+import com.google.gwt.dev.cfg.ResourceLoader;
+import com.google.gwt.dev.cfg.ResourceLoaders;
 import com.google.gwt.dev.util.Util;
 import com.google.gwt.dev.util.collect.HashMap;
 import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
 import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
 import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapConsumerV3;
 import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapGeneratorV3;
-import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapGeneratorV3.ExtensionMergeAction;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapParseException;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.util.tools.Utility;
 
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -162,7 +175,8 @@ public static class SourceMapArtifact extends SyntheticArtifact {
  private final String sourceRoot;
 
  public SourceMapArtifact(int permutationId, int fragment, byte[] js, String sourceRoot) {
- super(SymbolMapsLinker.class, permutationId + '/' + sourceMapFilenameForFragment(fragment), js);
+ super(SymbolMapsLinker.class, permutationId + '/' +
+ sourceMapFilenameForFragment(fragment), js);
  this.permutationId = permutationId;
  this.fragment = fragment;
  this.js = js;
@@ -277,6 +291,7 @@ public ArtifactSet link(TreeLogger logger, LinkerContext context,
 
  Event writeSourceMapsEvent =
  SpeedTracerLogger.start(CompilerEventType.WRITE_SOURCE_MAPS);
+ StandardLinkerContext stdContext = (StandardLinkerContext) context;
  for (SourceMapArtifact se : artifacts.find(SourceMapArtifact.class)) {
  // filename is permutation_id/sourceMap<fragmentNumber>.json
  String sourceMapString = Util.readStreamAsString(se.getContents(logger));
@@ -312,14 +327,16 @@ public ArtifactSet link(TreeLogger logger, LinkerContext context,
  totalPrefixLines += op.getNumLines();
  }
  }
+
  // TODO(cromwellian): apply insert and remove edits
- sourceMapGenerator.mergeMapSection(totalPrefixLines, 0, sourceMapString,
- new ExtensionMergeAction() {
- @Override
- public Object merge(String extKey, Object oldVal, Object newVal) {
- return newVal;
- }
- });
+ if (stdContext.getModule().shouldEmbedSourceMapContents()) {
+ embedSourcesInSourceMaps(logger, stdContext, artifacts, sourceMapGenerator,
+ totalPrefixLines, sourceMapString, partialPath);
+ } else {
+ sourceMapGenerator.mergeMapSection(totalPrefixLines, 0, sourceMapString,
+ (extKey, oldVal, newVal) -> newVal);
+ }
+
  StringWriter stringWriter = new StringWriter();
  sourceMapGenerator.appendTo(stringWriter, "sourceMap");
  emArt = emitSourceMapString(logger, stringWriter.toString(), partialPath);
@@ -335,6 +352,68 @@ public Object merge(String extKey, Object oldVal, Object newVal) {
  return artifacts;
  }
 
+ private static void embedSourcesInSourceMaps(TreeLogger logger, StandardLinkerContext context,
+ ArtifactSet artifacts,
+ SourceMapGeneratorV3 sourceMapGenerator,
+ int totalPrefixLines, String sourceMapString,
+ String partialPath)
+ throws SourceMapParseException {
+ sourceMapGenerator.setStartingPosition(totalPrefixLines, 0);
+ SourceMapConsumerV3 section = new SourceMapConsumerV3();
+ section.parse(sourceMapString);
+ section.visitMappings(sourceMapGenerator::addMapping);
+
+ for (Entry<String, Object> entry : section.getExtensions().entrySet()) {
+ String extensionKey = entry.getKey();
+ sourceMapGenerator.addExtension(extensionKey, entry.getValue());
+ }
+
+ ResourceLoader resourceLoader = ResourceLoaders.fromContextClassLoader();
+
+ Map<String, EmittedArtifact> generatedSources = Maps.newHashMap();
+ artifacts.find(EmittedArtifact.class)
+ .forEach(emittedArtifact -> {
+ if (Visibility.Source == emittedArtifact.getVisibility()) {
+ generatedSources.put(emittedArtifact.getPartialPath(), emittedArtifact);
+ }
+ });
+
+ for (String sourceFileName : section.getOriginalSources()) {
+ String content;
+ InputStream cis = null;
+ try {
+ cis = loadSource(logger, sourceFileName, generatedSources,
+ resourceLoader);
+ if (isNull(cis)) {
+ cis = context.getModule().findSourceFile(sourceFileName).openContents();
+ }
+ content = Util.readStreamAsString(cis);
+ sourceMapGenerator.addSourcesContent(sourceFileName, content);
+ } catch (UnableToCompleteException | URISyntaxException | IOException e) {
+ logger.log(TreeLogger.Type.WARN, "Can't write source map " +
+ partialPath, e);
+ } finally {
+ Utility.close(cis);
+ }
+ }
+ }
+
+ private static InputStream loadSource(TreeLogger logger, String sourceFileName,
+ Map<String, EmittedArtifact> generatedSources,
+ ResourceLoader resourceLoader)
+ throws UnableToCompleteException, URISyntaxException, IOException {
+ if (generatedSources.containsKey(sourceFileName)) {
+ return generatedSources.get(sourceFileName).getContents(logger);
+ } else {
+ // ask the resourceOracle for the file contents and add it
+ URL resource = resourceLoader.getResource(sourceFileName);
+ if (nonNull(resource)) {
+ return resource.openStream();
+ }
+ }
+ return null;
+ }
+
  /**
  * Override to change the manner in which the symbol map is emitted.
  */

dev/core/src/com/google/gwt/dev/CompilePerms.java

@@ -380,8 +380,12 @@ private boolean precompileAndCompile(TreeLogger logger, String moduleName,
  if (precompilation == null) {
  return false;
  }
+
+ boolean embedSourcesContent = compilerContext.getModule()
+ .shouldEmbedSourceMapContents();
+
  // TODO: move to precompile() after params are refactored
- if (!options.shouldSaveSource()) {
+ if (!options.shouldSaveSource() && !embedSourcesContent) {
  precompilation.removeSourceArtifacts(logger);
  }
 

dev/core/src/com/google/gwt/dev/Compiler.java

@@ -193,8 +193,11 @@ public static boolean compile(
  if (precompilation == null) {
  return false;
  }
+
+ boolean embedSourcesContent = compilerContext.getModule()
+ .shouldEmbedSourceMapContents();
  // TODO: move to precompile() after params are refactored
- if (!options.shouldSaveSource()) {
+ if (!options.shouldSaveSource() && !embedSourcesContent) {
  precompilation.removeSourceArtifacts(branch);
  }
 

dev/core/src/com/google/gwt/dev/Link.java

@@ -415,7 +415,10 @@ private static void doProduceOutput(TreeLogger logger, ArtifactSet artifacts,
  linkerContext.produceOutput(logger, artifacts, Visibility.Private,
  extraFileSet);
 
- if (saveSources) {
+ boolean embedSourcesContent = linkerContext.getModule()
+ .shouldEmbedSourceMapContents();
+
+ if (saveSources && !embedSourcesContent) {
  // Assume that all source code is available in the compiler's classpath.
  // (This will have to be adjusted to work with Super Dev Mode.)
  ResourceLoader loader = ResourceLoaders.fromContextClassLoader();

dev/core/src/com/google/gwt/dev/Precompile.java

@@ -443,7 +443,7 @@ public boolean run(TreeLogger logger) throws UnableToCompleteException {
  return false;
  }
  // TODO: move to precompile() after params are refactored
- if (!options.shouldSaveSource()) {
+ if (!options.shouldSaveSource() && !module.shouldEmbedSourceMapContents()) {
  precompilation.removeSourceArtifacts(logger);
  }
  Util.writeObjectAsFile(logger, precompilationFile, precompilation);

dev/core/src/com/google/gwt/dev/PrecompileOnePerm.java

@@ -233,8 +233,11 @@ private boolean precompilePermutation(TreeLogger logger,
  return false;
  }
 
+ boolean embedSourcesContent = compilerContext.getModule()
+ .shouldEmbedSourceMapContents();
+
  // TODO: precompile should do this after we get the parameter passing refactored.
- if (!options.shouldSaveSource()) {
+ if (!options.shouldSaveSource() && embedSourcesContent) {
  precompilation.removeSourceArtifacts(logger);
  }
 

dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java

@@ -67,6 +67,9 @@
  * XML for unit tests.
  */
 public class ModuleDef implements DepsInfoProvider {
+
+ public static final String EMBED_SOURCE_MAPS = "compiler.embedSourceMaps";
+
  private static final ResourceFilter NON_JAVA_RESOURCES = new ResourceFilter() {
  @Override
  public boolean allows(String path) {
@@ -628,6 +631,22 @@ public synchronized void setNameOverride(String nameOverride) {
  this.nameOverride = nameOverride;
  }
 
+ /**
+ * Checks if embedding sources content inside sourceMaps json is enabled or not.
+ * @return the boolean value true/false of <code>compiler.embedSourceMaps</code>
+ * configuration property
+ */
+ public boolean shouldEmbedSourceMapContents() {
+ return getProperties()
+ .getConfigurationProperties()
+ .stream()
+ .filter(configurationProperty -> EMBED_SOURCE_MAPS.equals(
+ configurationProperty.getName()))
+ .findFirst()
+ .map(configurationProperty -> Boolean.valueOf(configurationProperty.getValue()))
+ .orElse(false);
+ }
+
  void addBindingPropertyDefinedValue(BindingProperty bindingProperty, String token) {
  bindingProperty.addDefinedValue(bindingProperty.getRootCondition(), token);
  }