Show build errors

Author: jondy

src/App.vue

@@ -17,6 +17,7 @@
         @click="pageIndex=0"
         type="text">{{ $t( '代码' ) }}</el-button>
       <el-button
+        style="display: none"
         @click="pageIndex=1"
         type="text">{{ $t( '编译' ) }}</el-button>
       <el-button
@@ -108,6 +109,13 @@ export default {
                 this.logonName = data.username
         } )
 
+        connector.$on( 'api-build-coursework', (success, data) => {
+            if (success) {
+                this.pageIndex = 2
+                this.buildData = data
+            }
+        } )
+
         this.isAuthenticated = connector.isAuthenticated
         if (this.isAuthenticated)
             connector.getLogon()

src/components/BufferManager.vue

@@ -127,6 +127,9 @@ export default {
                             buf.coursework.state = 0
                         }
                     } )
+                    // if ( ! buf.session.getUndoManager().canUndo() )
+                    //     buf.coursework.state = 0;
+                    // else
                     connector.updateCourseworkContent( buf.coursework, buf.session.getValue() )
                 }
             } )

src/components/CodeManager.vue

@@ -402,6 +402,50 @@ export default {
                 this.$refs.editor.handleCourseworkClose( coursework )
             }
         },
+        resetBuildErrors: function ( buf, details ) {
+            if ( ! buf ) {
+                this.$message( {
+                    type: 'warning',
+                    message: details
+                } )
+                return
+            }
+            let ranges = []
+            let i = details.indexOf( '[{' )
+            let j = -1
+
+            while ( i !== -1 ) {
+                if ( ! i || details[ i - 1 ] === '\n' ) {
+                    j = details.indexOf( '\n', i )
+                    if ( j === -1 && details.slice( -2 ) === '}]' ) {
+                        ranges = JSON.parse( details.slice( i ) )
+                        break
+                    }
+                    else if ( j > 2 && details.slice( j - 2, j ) === '}]' ) {
+                        ranges = JSON.parse( details.slice( i, j ) )
+                        this.$message( {
+                            type: 'warning',
+                            message: details.slice( j + 1 )
+                        } )
+                        break
+                    }
+                }
+
+                i = details.indexOf( '[{', i + 2 )
+            }
+
+            buf.session.setAnnotations( ranges.map( function( r ) {
+                const loc = r.locations[0]
+                return {
+                    row: loc.caret.line,
+                    column: loc.caret.column,
+                    text: r.message,
+                    type: r.kind === 'note' ? 'info' : r.kind
+                }
+            }))
+
+            this.$refs.editor.execCommand( 'goToNextError' )
+        }
 
         //
         // onCourseworkXXX
@@ -472,12 +516,18 @@ export default {
             }
         },
         handleCourseworkBuild: function ( coursework ) {
-            if ( coursework && coursework.state === COMPILED )
-                this.pageIndex = 2
-            else if ( coursework ) {
-                connector.$once( 'api-build-coursework', success => {
-                    if ( ! success )
-                        this.$message( _t( '编译出错了' ) )
+            if ( coursework && coursework.state !== COMPILED ) {
+                let buf = this.$refs.editor.getBuffer( coursework )
+                if ( buf )
+                    buf.session.clearAnnotations()
+                connector.$once( 'api-build-coursework', ( success, data ) => {
+                    if ( ! success ) {
+                        if ( ! data.detail )
+                            this.$message( _t( '编译出错了' ) )
+                        else {
+                            this.resetBuildErrors( buf, data.detail )
+                        }
+                    }
                 } )
                 connector.buildCoursework( coursework )
             }

src/connector.js

@@ -7,17 +7,17 @@ import { _t } from './plugins/gettext.js'
 const ACCESS_TOKEN_KEY = 'ACCESS_TOKEN'
 const REFRESH_TOKEN_KEY = 'REFRESH_TOKEN'
 
-// const serverUrl = 'http://localhost:9092'
-// const clientId = '0gvr1GFNpCy9fSpxsKHPdUPUu7ZSCQS76zc8kAgl'
-// const clientSecret = 'dazoA4IhCGrWrkh2rA02FE1qm3AVWdAz9qKqSZDLAD22xWiVYsEeMtq2BmqVY748U8Qw9jecBo9BHYYG3nZDgOUUwaEFjjDir1VX25ejnCvEcwdzV3Wt2Rxcnt45lxaN'
+const serverUrl = 'http://localhost:9092/api/v1'
+const clientId = '0gvr1GFNpCy9fSpxsKHPdUPUu7ZSCQS76zc8kAgl'
+const clientSecret = 'dazoA4IhCGrWrkh2rA02FE1qm3AVWdAz9qKqSZDLAD22xWiVYsEeMtq2BmqVY748U8Qw9jecBo9BHYYG3nZDgOUUwaEFjjDir1VX25ejnCvEcwdzV3Wt2Rxcnt45lxaN'
 
 // const serverUrl = 'https://codebang.dashingsoft.com'
 // const clientId = 'rgt9yKrM82ACFiKLW2aIwxYUCIUV8ggx2OH5hvu8'
 // const clientSecret = 'hiWi4Q8k4TR1aAF8PGtqjL7DiY15gBFXjYQ9UM5F3EV5mneJbo88LlXqst0PcfpYVhPQyKc1jjlICggI0otTjOv6zoP89Q0uBNoLsEqkRVmi2G4w5Snn9dBADHx7UxaT'
 
-const serverUrl = 'https://cb.dashingsoft.com/api/v1'
-const clientId = 'PetTAmGzfinaiKDcr8wAfuq2IGqYv2TfWBHuou2F'
-const clientSecret = 'SLc0LAGCyPQ291V2f3XSpK1xyBde01SHy9hZ5l2FQbrEbd17J9ZSlT8VXDWpsHMre4JqA7F8Olr6SDOQuR5Ul8D7U5PaFopiARASA8vIudRBsh2RAWqfO6Iu14Dtc5bq'
+// const serverUrl = 'https://cb.dashingsoft.com/api/v1'
+// const clientId = 'PetTAmGzfinaiKDcr8wAfuq2IGqYv2TfWBHuou2F'
+// const clientSecret = 'SLc0LAGCyPQ291V2f3XSpK1xyBde01SHy9hZ5l2FQbrEbd17J9ZSlT8VXDWpsHMre4JqA7F8Olr6SDOQuR5Ul8D7U5PaFopiARASA8vIudRBsh2RAWqfO6Iu14Dtc5bq'
 
 // Fix this issue:
 //   Do not access Object.prototype method ‘hasOwnProperty’ from target object no-prototype-builtins
@@ -336,25 +336,26 @@ export default new Vue({
             this.sendRequest(api, make_multipart_data(args, files), 'api-update-coursework-content')
         },
         buildCoursework: function (coursework) {
-            let timeout = 15000
+            let timeout = 5000
             const loading = this.$loading( {
                 lock: true,
                 text: _t( '正在编译 ' ) + coursework.name + ' ...',
                 spinner: 'el-icon-loading',
                 background: 'rgba(0, 0, 0, 0.7)'
             } )
 
-            const retry = function ( coursework ) {
-                this.$once( 'api-build', ( success, data ) => {
+            const retry = function ( ) {
+
+                this.$once( 'api-build-result', ( success, data ) => {
 
                     let result = false
                     if ( success ) {
-                        if ( data.state === 'SUCCESS' ) {
+                        if ( data.state === 2 ) {
                             loading.close()
                             coursework.state = COMPILED
                             result = true
                         }
-                        else if ( data.state === 'FAILURE' ) {
+                        else if ( data.state === -1 ) {
                             loading.close()
                             coursework.state = FAILURE
                         }
@@ -363,52 +364,38 @@ export default new Vue({
                             coursework.state = TIMEOUT
                         }
                         else {
-                            timeout -= 3000
-                            window.setTimeout( retry, 3000, coursework )
+                            timeout -= 1000
+                            window.setTimeout( retry, 1000 )
                             result = null
                         }
                     }
                     else
                         loading.close()
 
                     if ( result !== null )
-                        this.$emit( 'api-build-coursework', result )
+                        this.$emit( 'api-build-coursework', result, data )
                 } )
 
-                const api = '/courseworks/' + coursework.id + '/build/'
-                this.sendRequest(api, { data: coursework }, 'api-build')
+                const api = '/courseworks/' + coursework.id + '/result/'
+                this.sendRequest(api, { data: coursework }, 'api-build-result')
 
             }.bind( this )
 
-            this.$once( 'api-rebuild', ( success, data ) => {
+            this.$once( 'api-build', ( success ) => {
 
-                let result = false
                 if ( success ) {
-                    if ( data.state === 'SUCCESS' ) {
-                        loading.close()
-                        coursework.state = COMPILED
-                        result = true
-                    }
-                    else if ( data.state === 'FAILURE' ) {
-                        loading.close()
-                        coursework.state = FAILURE
-                    }
-                    else {
-                        retry( coursework )
-                        result = null
-                    }
+                    window.setTimeout( retry, 3000 )
                 }
-                else
+                else {
                     loading.close()
+                    this.$emit( 'api-build-coursework', false )
+                }
 
-                if ( result !== null )
-                    this.$emit( 'api-build-coursework', result )
-
-            } ).bind( this )
+            } )
 
             coursework.state = BUILDING
-            const api = '/courseworks/' + coursework.id + '/rebuild/'
-            this.sendRequest(api, { data: coursework }, 'api-rebuild')
+            const api = '/courseworks/' + coursework.id + '/build/'
+            this.sendRequest(api, { data: coursework }, 'api-build')
         },
         taskCoursework: function (coursework) {
             const api = '/courseworks/' + coursework.id + '/result/'