feat: remove feature flag for phabricator (#290)

Author: ijsnow

src/extension/scripts/inject.tsx

@@ -20,7 +20,6 @@ import { injectBitbucketServer } from '../../libs/bitbucket/inject'
 import { injectCodeIntelligence } from '../../libs/code_intelligence'
 import { injectGitHubApplication } from '../../libs/github/inject'
 import { checkIsGitlab } from '../../libs/gitlab/code_intelligence'
-import { injectPhabricatorApplication } from '../../libs/phabricator/app'
 import { injectSourcegraphApp } from '../../libs/sourcegraph/inject'
 import { assertEnv } from '../envAssertion'
 
@@ -94,7 +93,6 @@ function injectApplication(): void {
         } else if (isPhabricator) {
             window.SOURCEGRAPH_PHABRICATOR_EXTENSION = true
             setSourcegraphUrl(sourcegraphServerUrl)
-            injectPhabricatorApplication()
         } else if (
             document.querySelector('.bitbucket-header-logo') ||
             document.querySelector('.aui-header-logo.aui-header-logo-bitbucket')

src/libs/phabricator/app.tsx

@@ -1,11 +1,9 @@
 import '../../config/polyfill'
 
 import { setSourcegraphUrl } from '../../shared/util/context'
-import { featureFlags } from '../../shared/util/featureFlags'
 import { injectCodeIntelligence } from '../code_intelligence'
 import { getPhabricatorCSS, getSourcegraphURLFromConduit } from './backend'
-import { injectPhabricatorBlobAnnotators } from './inject_old'
-import { expanderListen, metaClickOverride, setupPageLoadListener } from './util'
+import { metaClickOverride } from './util'
 
 // NOTE: injectModules is idempotent, so safe to call multiple times on the same page.
 async function injectModules(): Promise<void> {
@@ -14,52 +12,43 @@ async function injectModules(): Promise<void> {
     extensionMarker.style.display = 'none'
     document.body.appendChild(extensionMarker)
 
-    if (await featureFlags.isEnabled('newInject')) {
-        await injectCodeIntelligence()
-    } else {
-        await injectPhabricatorBlobAnnotators()
-    }
+    await injectCodeIntelligence()
 }
 
 export function init(): void {
     /**
      * This is the main entry point for the phabricator in-page JavaScript plugin.
      */
     if (window.localStorage && window.localStorage.getItem('SOURCEGRAPH_DISABLED') !== 'true') {
-        document.addEventListener('phabPageLoaded', () => {
-            // Backwards compat: Support Legacy Phabricator extension. Check that the Phabricator integration
-            // passed the bundle url. Legacy Phabricator extensions inject CSS via the loader.js script
-            // so we do not need to do this here.
-            if (!window.SOURCEGRAPH_BUNDLE_URL && !window.localStorage.getItem('SOURCEGRAPH_BUNDLE_URL')) {
-                injectModules().catch(err => console.error('Unable to inject modules', err))
-                metaClickOverride()
-                expanderListen()
-                return
-            }
+        // Backwards compat: Support Legacy Phabricator extension. Check that the Phabricator integration
+        // passed the bundle url. Legacy Phabricator extensions inject CSS via the loader.js script
+        // so we do not need to do this here.
+        if (!window.SOURCEGRAPH_BUNDLE_URL && !window.localStorage.getItem('SOURCEGRAPH_BUNDLE_URL')) {
+            injectModules().catch(err => console.error('Unable to inject modules', err))
+            metaClickOverride()
+            return
+        }
 
-            getSourcegraphURLFromConduit()
-                .then(sourcegraphUrl => {
-                    getPhabricatorCSS()
-                        .then(css => {
-                            const style = document.createElement('style') as HTMLStyleElement
-                            style.setAttribute('type', 'text/css')
-                            style.id = 'sourcegraph-styles'
-                            style.textContent = css
-                            document.getElementsByTagName('head')[0].appendChild(style)
-                            window.localStorage.setItem('SOURCEGRAPH_URL', sourcegraphUrl)
-                            window.SOURCEGRAPH_URL = sourcegraphUrl
-                            setSourcegraphUrl(sourcegraphUrl)
-                            expanderListen()
-                            metaClickOverride()
-                            injectModules().catch(err => console.error('Unable to inject modules', err))
-                        })
-                        .catch(e => {
-                            console.error(e)
-                        })
-                })
-                .catch(e => console.error(e))
-        })
-        setupPageLoadListener()
+        getSourcegraphURLFromConduit()
+            .then(sourcegraphUrl => {
+                getPhabricatorCSS()
+                    .then(css => {
+                        const style = document.createElement('style') as HTMLStyleElement
+                        style.setAttribute('type', 'text/css')
+                        style.id = 'sourcegraph-styles'
+                        style.textContent = css
+                        document.getElementsByTagName('head')[0].appendChild(style)
+                        window.localStorage.setItem('SOURCEGRAPH_URL', sourcegraphUrl)
+                        window.SOURCEGRAPH_URL = sourcegraphUrl
+                        setSourcegraphUrl(sourcegraphUrl)
+                        metaClickOverride()
+                        injectModules().catch(err => console.error('Unable to inject modules', err))
+                    })
+                    .catch(e => {
+                        console.error(e)
+                    })
+            })
+            .catch(e => console.error(e))
     } else {
         // tslint:disable-next-line
         console.log(