Merge pull request #772 from aml-org/r/v5.1.5

r/v5.1.5

Jenkinsfile

@@ -5,6 +5,7 @@ def color = '#FF8C00'
 def headerFlavour = "WARNING"
 def publish_version
 def projectName = "ALS"
+def BRANCH_SUPPORT = "support"
 
 node {
     // Login to dockerhub to prevent rate-limiting. See https://salesforce.quip.com/aqcaAObOcXpF
@@ -230,7 +231,7 @@ pipeline {
             when {
                 anyOf {
                     branch 'master'
-                    branch 'support/*'
+                    branch BRANCH_SUPPORT + '/*'
                     branch 'rc/*'
                     branch 'develop'
                 }
@@ -250,8 +251,10 @@ pipeline {
                         slackSend color: '#00FF00', channel: "${slackChannel}", message: "${projectName} Published RC ${publish_version}"
                     } else if (env.BRANCH_NAME == 'master') {
                         slackSend color: '#00FF00', channel: "${slackChannel}", message: ":ok_hand: ${projectName} Master Publish ${publish_version} OK! :ok_hand:"
-                    } else if (currentBuild.getPreviousBuild().result != null && currentBuild.getPreviousBuild().result.toString() != 'SUCCESS') {
+                    } else if (currentBuild.getPreviousBuild() != null && currentBuild.getPreviousBuild().result != null && currentBuild.getPreviousBuild().result.toString() != 'SUCCESS') {
                         slackSend color: '#00FF00', channel: "${slackChannel}", message: ":ok_hand: ${projectName} Back to Green!! :ok_hand:\n\tBranch: ${env.BRANCH_NAME}\n(See ${env.BUILD_URL})\n"
+                    } else {
+                        slackSend color: '#00FF00', channel: "${slackChannel}", message: ":ok_hand: ${projectName} build ${currentBuild.currentResult} !!! :ok_hand:\n\tBranch: ${env.BRANCH_NAME}\n(See ${env.BUILD_URL})\n"
                     }
                 }
             }

als-actions/shared/src/test/scala/org/mulesoft/als/actions/selection/SelectionRangeFinderTest.scala

@@ -5,11 +5,7 @@ import amf.core.client.scala.resource.ResourceLoader
 import amf.core.internal.unsafe.PlatformSecrets
 import org.mulesoft.als.common.dtoTypes.Position
 import org.mulesoft.amfintegration.AmfImplicits.{AmfAnnotationsImp, BaseUnitImp}
-import org.mulesoft.amfintegration.amfconfiguration.{
-  ALSConfigurationState,
-  EditorConfiguration,
-  EmptyProjectConfigurationState
-}
+import org.mulesoft.amfintegration.amfconfiguration.{ALSConfigurationState, EditorConfiguration, EmptyProjectConfigurationState}
 import org.mulesoft.lsp.feature.common.{Range, Position => LspPosition}
 import org.mulesoft.lsp.feature.selectionRange.SelectionRange
 import org.scalatest.{AsyncFlatSpec, Matchers}
@@ -288,7 +284,7 @@ class SelectionRangeFinderTest extends AsyncFlatSpec with Matchers with Platform
           |  displayName: driver ID download
           |  get:
           |    is: [client-id-required]
-          |    description: get mobile ordering master by driver ID
+          |    description: get mobile ordering main by driver ID
           |    responses:
           |      200:
           |        body:

als-common/shared/src/main/scala/org/mulesoft/als/configuration/ProjectConfiguration.scala

@@ -23,7 +23,8 @@ case class ProjectConfiguration(
   /** @return
     *   main file computed uri. Folder plus main file.
     */
-  def rootUri: Option[String] = mainFile.map(m => m.substring(0, m.lastIndexOf(Fs.separatorChar)))
+  def rootUri: Option[String] =
+    mainFile.map(m => m.substring(0, m.lastIndexOf(Fs.separatorChar))) // todo: not sure what this is supposed to do
 
   def containsInDependencies(uri: String): Boolean =
     (validationDependency ++ extensionDependency ++ metadataDependency).contains(uri)

als-node-client/node-package/typescript/als-node-client.d.ts

@@ -6580,6 +6580,11 @@ declare module '@aml-org/als-node-client' {
     configuration?: AlsConfiguration
     hotReload?: boolean
   }
+
+  export type DidFocusParams = {
+    uri: String
+    version: number
+  }
 
   export interface AlsClientCapabilities {
     workspace?: WorkspaceClientCapabilities
@@ -6604,6 +6609,10 @@ declare module '@aml-org/als-node-client' {
   export type AlsCapabilitiesNotification = {
     type: NotificationType<AlsClientCapabilities>
   }
+
+  export type DidFocusNotification = {
+    type: NotificationType<DidFocusParams>
+  }
 
   export interface CleanDiagnosticTreeParams {
     textDocument: TextDocumentIdentifier