Movatterモバイル変換

Skip to content

coderoad/coderoad-vscodePublic

NotificationsYou must be signed in to change notification settings
Fork39
Star959

Commit820711f

ShMcK

authored

Merge pull request#527 from coderoad/feat/detect-failed-launch

Resolve failed launch on CodeAlly

2 parents060ad10 +055024e commit820711fCopy full SHA for 820711f

File tree

10 files changed

+29

-15

lines changed

src
- actions
  - onStartup.ts
  - onTutorialConfigContinue.ts
- channel.ts
- services
  - hooks/utils
    - openFiles.ts
    - runCommands.ts
  - reset
    - index.ts
  - testRunner
    - index.ts
  - webview
    - create.ts
typings
- index.d.ts
web-app/src/services/state
- useStateMachine.tsx

10 files changed

+29

-15

lines changed

`‎src/actions/onStartup.ts`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@ const onStartup = async (context: Context): Promise<void> => {`
`42`	`42`	`consttutorial=awaittutorialRes.json()`
`43`	`43`	`send({type:'START_TUTORIAL_FROM_URL',payload:{ tutorial}})`
`44`	`44`	`return`
`45`		`-}catch(e){`
	`45`	`+}catch(e:any){`
`46`	`46`	`// on failure to load a tutorial url fallback to NEW`
`47`		-console.log(`Failed to load tutorial from url${TUTORIAL_URL} with error "${e.message}"`)
	`47`	+thrownewError(`Failed to load tutorial from url${TUTORIAL_URL} with error "${e.message}"`)
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`// NEW from start click`
`@@ -56,7 +56,7 @@ const onStartup = async (context: Context): Promise<void> => {`
`56`	`56`	`const{ position}=awaitcontext.onContinue(tutorial)`
`57`	`57`	`// communicate to client the tutorial & stepProgress state`
`58`	`58`	`send({type:'LOAD_STORED_TUTORIAL',payload:{ env, tutorial, position}})`
`59`		`-}catch(e){`
	`59`	`+}catch(e:any){`
`60`	`60`	`consterror={`
`61`	`61`	`type:'UnknownError',`
`62`	`62`	message:`Location: Editor startup\n\n${e.message}`,

`‎src/actions/onTutorialConfigContinue.ts`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ const onTutorialConfigContinue = async (action: T.Action, context: Context): Pro`
`25`	`25`	`if(tutorialToContinue.config?.webhook){`
`26`	`26`	`setupWebhook(tutorialToContinue.config.webhook)`
`27`	`27`	`}`
`28`		`-}catch(e){`
	`28`	`+}catch(e:any){`
`29`	`29`	`consterror={`
`30`	`30`	`type:'UnknownError',`
`31`	`31`	message:`Location: Editor tutorial continue config.\n\n${e.message}`,

`‎src/channel.ts`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,11 @@ class Channel implements Channel {`
`20`	`20`
`21`	`21`	`// receive from webview`
`22`	`22`	`publicreceive=async(action:T.Action):Promise<void>=>{`
	`23`	`+if(action.source!=='coderoad'){`
	`24`	`+// filter out events from other extensions`
	`25`	`+return`
	`26`	`+}`
	`27`	`+`
`23`	`28`	`// action may be an object.type or plain string`
`24`	`29`	`constactionType:string=typeofaction==='string' ?action :action.type`
`25`	`30`

`‎src/services/hooks/utils/openFiles.ts`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ const openFiles = async (files: string[] = []): Promise<void> => {`
`15`	`15`	`constabsoluteFilePath=join(wr,filePath)`
`16`	`16`	`constdoc=awaitvscode.workspace.openTextDocument(absoluteFilePath)`
`17`	`17`	`awaitvscode.window.showTextDocument(doc,vscode.ViewColumn.One)`
`18`		`-}catch(error){`
	`18`	`+}catch(error:any){`
`19`	`19`	console.log(`Failed to open file${filePath}:${error.message}`)
`20`	`20`	`}`
`21`	`21`	`}`

`‎src/services/hooks/utils/runCommands.ts`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ const runCommands = async (commands: string[] = []): Promise<void> => {`
`15`	`15`	`try{`
`16`	`16`	`result=awaitexec({ command})`
`17`	`17`	`console.log(result)`
`18`		`-}catch(error){`
	`18`	`+}catch(error:any){`
`19`	`19`	console.error(`Command failed:${error.message}`)
`20`	`20`	`send({type:'COMMAND_FAIL',payload:{process:{ ...process,status:'FAIL'}}})`
`21`	`21`	`return`

`‎src/services/reset/index.ts`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ const reset = async ({ branch, hash }: Input): Promise<void> => {`
`63`	`63`	`awaitexec({`
`64`	`64`	command:`git reset --hard${hash}`,
`65`	`65`	`})`
`66`		`-}catch(error){`
	`66`	`+}catch(error:any){`
`67`	`67`	`console.error('Error resetting')`
`68`	`68`	`console.error(error.message)`
`69`	`69`	`}`

`‎src/services/testRunner/index.ts`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ const createTestRunner = (data: TT.Tutorial, callbacks: Callbacks): ((params: an`
`75`	`75`	`}`
`76`	`76`	`logger('COMMAND',command)`
`77`	`77`	`result=awaitexec({ command,dir:testRunnerConfig.directory})`
`78`		`-}catch(err){`
	`78`	`+}catch(err:any){`
`79`	`79`	`result={stdout:err.stdout,stderr:err.stack}`
`80`	`80`	`}`
`81`	`81`

`‎src/services/webview/create.ts`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,11 @@ const createReactWebView = ({ extensionPath, channel }: ReactWebViewProps): Outp`
`56`	`56`
`57`	`57`	`// Handle messages from the webview`
`58`	`58`	`constreceive=channel.receive`
`59`		`-constsend=(action:T.Action)=>panel.webview.postMessage(action)`
	`59`	`+constsend=(action:T.Action)=>`
	`60`	`+panel.webview.postMessage({`
	`61`	`+ ...action,`
	`62`	`+source:'coderoad',// filter events on client by source. origin is not reliable`
	`63`	`+})`
`60`	`64`
`61`	`65`	`panel.webview.onDidReceiveMessage(receive,null,disposables)`
`62`	`66`

`‎typings/index.d.ts`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ export interface Position {`
`49`	`49`	`// current tutorial state`
`50`	`50`
`51`	`51`	`exportinterfaceAction{`
	`52`	`+source?:'coderoad'// filter received actions by this`
`52`	`53`	`type:string`
`53`	`54`	`payload?:any`
`54`	`55`	`meta?:any`

`‎web-app/src/services/state/useStateMachine.tsx`

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,10 @@ declare let acquireVsCodeApi: any`
`16`	`16`	`consteditor=acquireVsCodeApi()`
`17`	`17`	`consteditorSend=(action:T.Action)=>{`
`18`	`18`	logger(`TO EXT: "${action.type}"`)
`19`		`-returneditor.postMessage(action)`
	`19`	`+returneditor.postMessage({`
	`20`	`+ ...action,`
	`21`	`+source:'coderoad',// filter events by source on editor side`
	`22`	`+})`
`20`	`23`	`}`
`21`	`24`
`22`	`25`	`// router finds first state match of <Route path='' />`
`@@ -31,14 +34,15 @@ const useStateMachine = (): Output => {`
`31`	`34`	`// event bus listener`
`32`	`35`	`React.useEffect(()=>{`
`33`	`36`	`constlistener='message'`
`34`		`-//propograte channel event to state machine`
	`37`	`+//propagate channel event to state machine`
`35`	`38`	`consthandler=(event:any)=>{`
`36`		`-// ensure events are coming from coderoad webview`
`37`		`-if(!event.origin.match(/^vscode-webview/)){`
`38`		`-return`
`39`		`-}`
`40`	`39`	`// NOTE: must call event.data, cannot destructure. VSCode acts odd`
`41`	`40`	`constaction=event.data`
	`41`	`+`
	`42`	`+if(action.source!=='coderoad'){`
	`43`	`+// filter out events from other extensions`
	`44`	`+return`
	`45`	`+}`
`42`	`46`	`sendWithLog(action)`
`43`	`47`	`}`
`44`	`48`	`window.addEventListener(listener,handler)`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp