fix: Keep virtual source reference consistent (#574)

* Keep virtual source reference consistent.

* Changelog.

Author: zobo

CHANGELOG.md

@@ -10,17 +10,21 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Option to start PHP built-in web server without router script.
 
+### Fixed
+
+- Internal Source Reference for virtual source files fixed - when stepping into eval()
+
 ## [1.15.1]
 
 ### Changed
 
-- Defined under packages.json this extension should be prefered for PHP debugging.
+- Defined under packages.json this extension should be preferred for PHP debugging.
 
 ## [1.15.0]
 
 ### Added
 
-- Support for terminateDebuggee option letting the user choose to keep the debugee running. Press Alt when hovering over stop action.
+- Support for terminateDebuggee option letting the user choose to keep the debuggee running. Press Alt when hovering over stop action.
 - Handle breakpoints in a async manner.
 
 ### Changed

src/phpDebug.ts

@@ -586,8 +586,16 @@ class PhpDebugSession extends vscode.DebugSession {
                 let source: VSCodeDebugProtocol.Source
                 const urlObject = url.parse(status.fileUri)
                 if (urlObject.protocol === 'dbgp:') {
-                    const sourceReference = this._sourceIdCounter++
-                    this._sources.set(sourceReference, { connection, url: status.fileUri })
+                    let sourceReference
+                    const src = Array.from(this._sources).find(
+                        ([, v]) => v.url === status.fileUri && v.connection === connection
+                    )
+                    if (src) {
+                        sourceReference = src[0]
+                    } else {
+                        sourceReference = this._sourceIdCounter++
+                        this._sources.set(sourceReference, { connection, url: status.fileUri })
+                    }
                     // for eval code, we need to include .php extension to get syntax highlighting
                     source = { name: status.exception.name + '.php', sourceReference, origin: status.exception.name }
                     // for eval code, we add a "<?php" line at the beginning to get syntax highlighting (see sourceRequest)
@@ -608,11 +616,22 @@ class PhpDebugSession extends vscode.DebugSession {
                             let line = stackFrame.line
                             const urlObject = url.parse(stackFrame.fileUri)
                             if (urlObject.protocol === 'dbgp:') {
-                                const sourceReference = this._sourceIdCounter++
-                                this._sources.set(sourceReference, { connection, url: stackFrame.fileUri })
+                                let sourceReference
+                                const src = Array.from(this._sources).find(
+                                    ([, v]) => v.url === stackFrame.fileUri && v.connection === connection
+                                )
+                                if (src) {
+                                    sourceReference = src[0]
+                                } else {
+                                    sourceReference = this._sourceIdCounter++
+                                    this._sources.set(sourceReference, { connection, url: stackFrame.fileUri })
+                                }
                                 // for eval code, we need to include .php extension to get syntax highlighting
                                 source = {
-                                    name: stackFrame.type === 'eval' ? 'eval.php' : stackFrame.name,
+                                    name:
+                                        stackFrame.type === 'eval'
+                                            ? `eval ${stackFrame.fileUri.substr(7)}.php`
+                                            : stackFrame.name,
                                     sourceReference,
                                     origin: stackFrame.type,
                                 }