Link to the currently-selected channel's error index

Fixes #207
rust-lang · Apr 26, 2018 · 94f90b3 · 94f90b3
1 parent 6b9bbb4
commit 94f90b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/ui/frontend/highlighting.ts b/ui/frontend/highlighting.ts
@@ -1,6 +1,6 @@
 import Prism from 'prismjs';
 
-export function configureRustErrors(gotoPosition) {
+export function configureRustErrors({ gotoPosition, getChannel }) {
   Prism.languages.rust_errors = { // eslint-disable-line camelcase
     'warning': /warning:.*\n/,
     'error': {
@@ -19,7 +19,7 @@ export function configureRustErrors(gotoPosition) {
       const errorMatch = /E\d+/.exec(env.content);
       const [errorCode] = errorMatch;
       env.tag = 'a';
-      env.attributes.href = `https://doc.rust-lang.org/error-index.html#${errorCode}`;
+      env.attributes.href = `https://doc.rust-lang.org/${getChannel()}/error-index.html#${errorCode}`;
     }
     if (env.type === 'see-issue') {
       const errorMatch = /\d+/.exec(env.content);

diff --git a/ui/frontend/index.tsx b/ui/frontend/index.tsx
@@ -20,7 +20,10 @@ const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
 const enhancers = composeEnhancers(middlewares, persistState(undefined, { serialize, deserialize }));
 const store = createStore(playgroundApp, enhancers);
 
-configureRustErrors((line, col) => store.dispatch(gotoPosition(line, col)));
+configureRustErrors({
+  gotoPosition: (line, col) => store.dispatch(gotoPosition(line, col)),
+  getChannel: () => store.getState().configuration.channel,
+});
 
 store.dispatch(performCratesLoad());
 store.dispatch(performVersionsLoad());