Merge branch 'master' into update_kotlin_to_java_diff_utils_4_11

Author: nbransby

.github/workflows/pull_request.yml

@@ -12,45 +12,65 @@ jobs:
         with:
           java-version: 1.8
 
+      - name: Short SHA
+        env:
+          COMMIT_SHA: ${{github.event.pull_request.head.sha}}
+        run: echo "short_sha=${COMMIT_SHA::7}" >> $GITHUB_ENV
+        
       - name: Read version
         id: read_version
         uses: reedyuk/read-properties@v1.0.0
         with:
           path: 'gradle.properties'
           property: 'version'
+          
+      - name: Update version
+        uses: reedyuk/write-properties@v1.0.0
+        with:
+          path: 'gradle.properties'
+          property: 'version'
+          value: "${{ steps.read_version.outputs.value }}-${{ github.head_ref }}-${{ env.short_sha }}"
+          
       - name: Change package version
         uses: eskatos/gradle-command-action@v1
         with:
           arguments: updateVersion
+          
       - name: Build
         uses: eskatos/gradle-command-action@v1
         with:
           arguments: build
+          
       - name: Test
         uses: eskatos/gradle-command-action@v1
         with:
           arguments: jvmTest
+          
       - name: Test Report
         uses: scacap/action-surefire-report@v1
         if: always()
         with:
           report_paths: "build/test-results/jvmTest/*.xml"
           github_token: ${{ secrets.GITHUB_TOKEN }}
+          
       - name: Publish
         uses: eskatos/gradle-command-action@v1
         with:
           arguments: publishAllPublicationsToGitHubPackagesRepository
         env:
           TOKEN: ${{ secrets.AUTO_TOKEN }}
           USERNAME: ${{ secrets.AUTO_USERNAME }}
+          
       - name: Setup NPM
         run: npm config set //npm.pkg.github.com/:_authToken=$token
         env:
           token: ${{ secrets.GITHUB_TOKEN }}
+          
       - name: Setup package name
         uses: eskatos/gradle-command-action@v1
         with:
           arguments: prepareForGithubNpmPublish
+          
       - name: Publish npm
         uses: eskatos/gradle-command-action@v1
         with:

gradle.properties

@@ -1,5 +1,5 @@
-version=5.1.5-0fd38db
-kotlin_version = 1.5.32
+version=4.11.5-0fd38db
+kotlin_version=1.5.32
 kotlinx-coroutines.version=1.5.2
 
 kotlin.code.style=official

package.json

@@ -26,6 +26,6 @@
   },
   "homepage": "https://github.com/GitLiveApp/kotlin-diff-utils#readme",
   "dependencies": {
-    "kotlin": "1.5.30"
+    "kotlin": "1.5.32"
   }
 }

src/commonMain/kotlin/dev/gitlive/difflib/UnifiedDiffUtils.kt

@@ -176,9 +176,7 @@ object UnifiedDiffUtils {
                     // position.
                     // And if it is, add it to the current set
                     val nextDelta = patchDeltas[i]
-                    if (position + delta.source.size() + contextSize >= nextDelta
-                            .source.position - contextSize
-                    ) {
+                    if (position + delta.source.size() + contextSize >= nextDelta.source.position - contextSize) {
                         deltas.add(nextDelta)
                     } else {
                         // if it isn't, output the current set,
@@ -248,7 +246,6 @@ object UnifiedDiffUtils {
         // output the context before the first Delta
         line = contextStart
         while (line < curDelta.source.position) {
-            //
             buffer.add(" " + origLines[line])
             origTotal++
             revTotal++
@@ -262,13 +259,9 @@ object UnifiedDiffUtils {
         var deltaIndex = 1
         while (deltaIndex < deltas.size) { // for each of the other Deltas
             val nextDelta = deltas[deltaIndex]
-            val intermediateStart = (curDelta.source.position
-                    + curDelta.source.lines.size)
+            val intermediateStart = (curDelta.source.position + curDelta.source.lines.size)
             line = intermediateStart
-            while (line < nextDelta.source
-                    .position
-            ) {
-
+            while (line < nextDelta.source.position) {
                 // output the code between the last Delta and this one
                 buffer.add(" " + origLines[line])
                 origTotal++
@@ -283,8 +276,7 @@ object UnifiedDiffUtils {
         }
 
         // Now output the post-Delta context code, clamping the end of the file
-        contextStart = (curDelta.source.position
-                + curDelta.source.lines.size)
+        contextStart = (curDelta.source.position + curDelta.source.lines.size)
         line = contextStart
         while (line < contextStart + contextSize
             && line < origLines.size
@@ -295,19 +287,8 @@ object UnifiedDiffUtils {
             line++
         }
 
-        // Create and insert the block header, conforming to the Unified Diff
-        // standard
-        val header = StringBuilder()
-        header.append("@@ -")
-        header.append(origStart)
-        header.append(",")
-        header.append(origTotal)
-        header.append(" +")
-        header.append(revStart)
-        header.append(",")
-        header.append(revTotal)
-        header.append(" @@")
-        buffer.add(0, header.toString())
+        // Create and insert the block header, conforming to the Unified Diff standard
+        buffer.add(0, "@@ -$origStart,$origTotal +$revStart,$revTotal @@")
         return buffer
     }